[csw-devel] SF.net SVN: gar:[6191] csw/mgar/pkg/cups/branches/cups-1.4
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sat Sep 5 10:03:46 CEST 2009
Revision: 6191
http://gar.svn.sourceforge.net/gar/?rev=6191&view=rev
Author: wahwah
Date: 2009-09-05 08:03:46 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
cups: Branch 1.4 first iteration
Modified Paths:
--------------
csw/mgar/pkg/cups/branches/cups-1.4/Makefile
csw/mgar/pkg/cups/branches/cups-1.4/checksums
Added Paths:
-----------
csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch
Removed Paths:
-------------
csw/mgar/pkg/cups/branches/cups-1.4/files/Makefile-cups-1.3.11.patch
Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-05 00:41:38 UTC (rev 6190)
+++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-09-05 08:03:46 UTC (rev 6191)
@@ -1,5 +1,5 @@
GARNAME = cups
-GARVERSION = 1.3.11
+GARVERSION = 1.4.0
CATEGORIES = net
define BLURB
@@ -21,12 +21,13 @@
FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/)
MASTER_SITES += $(FULL_MIRRORS)
-PATCHFILES = Makefile-cups-$(GARVERSION).patch
+PATCHFILES = 0001-Makefile.patch
DISTFILES = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES)
DISTFILES += CSWcupsd.postremove
PREREQUISITE_PKGS = CSWggettext
PREREQUISITE_PKGS += CSWjpeg
+PREREQUISITE_PKGS += CSWkrb5libdev
PREREQUISITE_PKGS += CSWoldapdevel
PREREQUISITE_PKGS += CSWossldevel
PREREQUISITE_PKGS += CSWtiff
@@ -62,10 +63,13 @@
PKGFILES_CSWcupsdoc = $(datadir)/doc
PKGFILES_CSWcupsdoc += $(datadir)/doc/.*
+PKGFILES_CSWcupsdoc += $(datadir)/cups/examples.*
PKGFILES_CSWcupsdev = $(includedir)/cups/?.*
PKGFILES_CSWcupsdev += $(mandir)/man1/cups-config.1
PKGFILES_CSWcupsdev += $(bindir)/cups-config
+PKGFILES_CSWcupsdev += $(datadir)/cups/ppdc.*
+PKGFILES_CSWcupsdev += $(datadir)/cups/drv.*
PKGFILES_CSWcupsd = $(sysconfdir)/.*
PKGFILES_CSWcupsd += $(mandir)/man1m
@@ -79,22 +83,30 @@
PKGFILES_CSWcupsd += $(datadir)/cups/(banners|data|profiles|charsets).*
PKGFILES_CSWcupsd += $(datadir)/locale/.*
PKGFILES_CSWcupsd += $(datadir)/applications/.*
+PKGFILES_CSWcupsd += $(datadir)/cups/mime.*
+PKGFILES_CSWcupsd += $(datadir)/icons.*
PKGFILES_CSWcupsd += $(libdir)/cups/.*
PKGFILES_CSWcupsd += $(libdir)/svc/.*
+PKGFILES_CSWcupsd += $(bindir)/ppd(c|html|i|merge|po)
PKGFILES_CSWcupsd += $(sbindir)/(cupsfilter|cupsd)
PKGFILES_CSWcupsd += $(localstatedir)/.*
PKGFILES_CSWcupsclient = $(sbindir)/(accept|reject|cups(addsmb|ctl|(en|dis)able))
+PKGFILES_CSWcupsclient += $(sbindir)/cups(accept|reject)
PKGFILES_CSWcupsclient += $(sbindir)/(lp(admin|p|c|info|move))
PKGFILES_CSWcupsclient += $(bindir)/(cancel|cupstest(dsc|ppd))
PKGFILES_CSWcupsclient += $(bindir)/(lp(|options|passwd|q|r|rm|stat))
PKGFILES_CSWcupsclient += $(mandir)/man1/(cancel|cupstest(dsc|ppd)|lp).1
PKGFILES_CSWcupsclient += $(mandir)/man1/(lpoptions|lppasswd|lpq|lpr|lprm).1
PKGFILES_CSWcupsclient += $(mandir)/man1/lpstat.1
+PKGFILES_CSWcupsclient += $(mandir)/man1/ppd.*\.1
+PKGFILES_CSWcupsclient += $(mandir)/man1m/cups.*\.1m
PKGFILES_CSWcupsclient += $(mandir)/man1m/(accept|cupsaddsmb|cupsctl).1m
PKGFILES_CSWcupsclient += $(mandir)/man1m/(cups(en|dis)able).1m
PKGFILES_CSWcupsclient += $(mandir)/man1m/(lpadmin|lpc|lpinfo|lpmove|reject).1m
PKGFILES_CSWcupsclient += $(mandir)/man5/client.conf.5
+PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5
+PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7
Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-05 00:41:38 UTC (rev 6190)
+++ csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-09-05 08:03:46 UTC (rev 6191)
@@ -1,3 +1,3 @@
ca7718998e56c320c08a77cfefe046f6 download/CSWcupsd.postremove
-09203e5a1274f71b0d6730456aa80c99 download/Makefile-cups-1.3.11.patch
-17f3e2bcb3cae3dd9dceb65a2bfd295f download/cups-1.3.11-source.tar.bz2
+09203e5a1274f71b0d6730456aa80c99 download/Makefile-cups-1.4.0.patch
+bc5e777d4320cecdd1a64de8035171a8 download/cups-1.4.0-source.tar.bz2
Added: csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch (rev 0)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/0001-Makefile.patch 2009-09-05 08:03:46 UTC (rev 6191)
@@ -0,0 +1,72 @@
+From 77ba01db2d7f7b8585bb05bb8652aedf09860bd5 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sat, 5 Sep 2009 03:31:57 +0200
+Subject: [PATCH] Makefile
+
+---
+ Makefile | 12 ++++++------
+ locale/Makefile | 3 ++-
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 91be6e5..a1ff6f8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -178,18 +178,18 @@ install-data:
+ if test "x$(INITDIR)" != x; then \
+ echo Installing init scripts...; \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
+- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
++ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \
+ for level in $(RCLEVELS); do \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
+- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
+ if test `uname` = HP-UX; then \
+ level=`expr $$level - 1`; \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
+ fi; \
+- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
+ done; \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
+- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
++ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
+ fi
+ if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
+ $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
+@@ -227,7 +227,7 @@ install-data:
+ $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
+ fi
+ if test "x$(MENUDIR)" != x; then \
+- echo Installing desktop menu...; \
++ echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \
+ $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \
+ fi
+@@ -290,7 +290,7 @@ uninstall:
+ -$(RMDIR) $(BINDIR)
+ echo Uninstalling startup script...
+ if test "x$(INITDIR)" != x; then \
+- $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \
++ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \
+ $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \
+ $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
+ $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
+diff --git a/locale/Makefile b/locale/Makefile
+index 6241b66..f76b8bc 100644
+--- a/locale/Makefile
++++ b/locale/Makefile
+@@ -75,7 +75,8 @@ install-languages:
+ for loc in $(LANGUAGES) ; do \
+ if test -f cups_$$loc.po; then \
+ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \
+- $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \
++ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \
++ $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \
+ fi ; \
+ done
+
+--
+1.6.3.2
+
Deleted: csw/mgar/pkg/cups/branches/cups-1.4/files/Makefile-cups-1.3.11.patch
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/Makefile-cups-1.3.11.patch 2009-09-05 00:41:38 UTC (rev 6190)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/Makefile-cups-1.3.11.patch 2009-09-05 08:03:46 UTC (rev 6191)
@@ -1,57 +0,0 @@
-diff -ru cups-1.3.11.orig/locale/Makefile cups-1.3.11/locale/Makefile
---- cups-1.3.11.orig/locale/Makefile 2007-09-28 19:30:31.000000000 +0100
-+++ cups-1.3.11/locale/Makefile 2009-07-23 16:35:44.275047072 +0100
-@@ -54,7 +54,8 @@
- for loc in $(LANGUAGES) ; do \
- if test -f cups_$$loc.po; then \
- $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \
-- $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \
-+ $(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \
-+ $(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \
- fi ; \
- done
-
-diff -ru cups-1.3.11.orig/Makefile cups-1.3.11/Makefile
---- cups-1.3.11.orig/Makefile 2009-06-05 18:55:57.000000000 +0100
-+++ cups-1.3.11/Makefile 2009-07-24 13:05:36.723168569 +0100
-@@ -118,18 +118,18 @@
- if test "x$(INITDIR)" != x; then \
- echo Installing init scripts...; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
-- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-+ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \
- for level in $(RCLEVELS); do \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
-- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
-+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
- if test `uname` = HP-UX; then \
- level=`expr $$level - 1`; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
- fi; \
-- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
-+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
- done; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
-- $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
-+ $(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
- fi
- if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
-@@ -168,7 +168,7 @@
- $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
- fi
- if test "x$(MENUDIR)" != x; then \
-- echo Installing desktop menu...; \
-+ echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \
- $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \
- fi
-@@ -211,7 +211,7 @@
- -$(RMDIR) $(BINDIR)
- echo Uninstalling startup script...
- if test "x$(INITDIR)" != x; then \
-- $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \
-+ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \
- $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \
- $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
- $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list