[csw-devel] SF.net SVN: gar:[6874] csw/mgar/pkg/cups/branches/cups-1.4/Makefile

[wahwah at users.sourceforge.net]

Revision: 6874
          http://gar.svn.sourceforge.net/gar/?rev=6874&view=rev
Author:   wahwah
Date:     2009-10-15 15:35:18 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
cups-1.4: Cosmetic changes to the Makefile. It turns out that 1.3.11 and 1.4.0 use the same major library numbers, there's no need to include libs from 1.3.11 in 1.4.0.

Modified Paths:
--------------
    csw/mgar/pkg/cups/branches/cups-1.4/Makefile

Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/Makefile	2009-10-15 13:18:19 UTC (rev 6873)
+++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile	2009-10-15 15:35:18 UTC (rev 6874)
@@ -31,25 +31,27 @@
 GARFLAVOR = DBG
 
 # These are the source mirrors published on the CUPS home-page.
-CUPS_MIRRORS = http://ftp.easysw.com/pub
+CUPS_MIRRORS  = http://ftp.easysw.com/pub
 CUPS_MIRRORS += ftp://ftp2.easysw.com/pub
 CUPS_MIRRORS += ftp://ftp3.easysw.com/pub
 CUPS_MIRRORS += http://www.nu6.org/_/mirror/ftp.easysw.com/pub
 CUPS_MIRRORS += http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub
 CUPS_MIRRORS += ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub
 CUPS_MIRRORS += http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub
+
 # Complete the mirror paths by adding /cups/x.y.z/ at the end.
-FULL_MIRRORS = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/)
+FULL_MIRRORS  = $(foreach S,$(CUPS_MIRRORS),$(S)/$(GARNAME)/$(GARVERSION)/)
 MASTER_SITES += $(FULL_MIRRORS)
 
-PATCHFILES  = 0001-cswcups-for-service-name.patch
-PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch
-PATCHFILES += 0003-Reference-counting-for-printers-only.patch
-DISTFILES  = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES)
+DISTFILES  = $(GARNAME)-$(GARVERSION)-source.tar.bz2
 DISTFILES += CSWcupsclient.preinstall
 DISTFILES += CSWcupsd.preinstall
 DISTFILES += CSWcupsd.postremove
 
+PATCHFILES  = 0001-cswcups-for-service-name.patch
+PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch
+PATCHFILES += 0003-Reference-counting-for-printers-only.patch
+
 PREREQUISITE_PKGS  = CSWggettext
 PREREQUISITE_PKGS += CSWjpeg
 PREREQUISITE_PKGS += CSWkrb5libdev
@@ -183,6 +185,8 @@
 OPTIM = $(OPTIM_$(GARFLAVOR))
 export OPTIM
 
+include gar/category.mk
+
 post-install-modulated:
 	(cd $(DESTDIR)$(sysconfdir)/cups; \
 	echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \
@@ -194,5 +198,3 @@
 		fi \
 	done)
 	@$(MAKECOOKIE)
-
-include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.