[csw-devel] SF.net SVN: gar:[16148] csw/mgar/pkg/cups/trunk/Makefile

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Nov 9 14:52:09 CET 2011


Revision: 16148
          http://gar.svn.sourceforge.net/gar/?rev=16148&view=rev
Author:   dmichelsen
Date:     2011-11-09 13:52:09 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
cups: General rework in progress

Modified Paths:
--------------
    csw/mgar/pkg/cups/trunk/Makefile

Modified: csw/mgar/pkg/cups/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cups/trunk/Makefile	2011-11-09 12:00:07 UTC (rev 16147)
+++ csw/mgar/pkg/cups/trunk/Makefile	2011-11-09 13:52:09 UTC (rev 16148)
@@ -15,9 +15,6 @@
   http://www.cups.org/str.php?L3324
 endef
 
-sysconfdir = /etc/opt/csw
-localstatedir = /var/opt/csw
-
 # There's a problem with cups-polld going into a busy-wait loop when polling
 # print servers.
 #
@@ -63,6 +60,10 @@
 # PATCHFILES += 0009-Add-workaround-for-krb5-config-outputting-CFLAGS.patch
 # PATCHFILES += 0009-giving-precedence-to-statvfs-in-printers.c.patch
 
+VENDOR_URL = http://www.cups.org/
+
+LICENSE = LICENSE.txt
+
 BUILD_DEP_PKGS  = CSWggettext
 BUILD_DEP_PKGS += CSWjpeg
 BUILD_DEP_PKGS += CSWoldapdevel
@@ -76,29 +77,31 @@
 BUILD_DEP_PKGS += SUNWlibm
 BUILD_DEP_PKGS += SUNWslpu
 
-EXTRA_CXXFLAGS += -norunpath
-EXTRA_LINKER_FLAGS += -liconv
-
 # The main metapackage
-PACKAGES           += CSWcups
-SPKG_DESC_CSWcups   = Common Unix Printing System
-ARCHALL_CSWcups     = 1
+PACKAGES += CSWcups
+SPKG_DESC_CSWcups = Common Unix Printing System
+# PKFILES is catchall
+ARCHALL_CSWcups = 1
 RUNTIME_DEP_PKGS_CSWcups += CSWcupsd
 RUNTIME_DEP_PKGS_CSWcups += CSWcupsclient
 CHECKPKG_OVERRIDES_CSWcups += surplus-dependency|CSWcupsclient
 CHECKPKG_OVERRIDES_CSWcups += surplus-dependency|CSWcupsd
 
-# Empty transitional package
-OBSOLETED_BY_CSWlibcups2 += CSWlibcups
-OBSOLETED_BY_CSWlibcupscgi1 += CSWlibcups
-OBSOLETED_BY_CSWlibcupsdriver1 += CSWlibcups
-OBSOLETED_BY_CSWlibcupsimage2 += CSWlibcups
-OBSOLETED_BY_CSWlibcupsmime1 += CSWlibcups
-OBSOLETED_BY_CSWlibcupsppdc1 += CSWlibcups
+PACKAGES += CSWphp5-cups
+SPKG_DESC_CSWphp5-cups = PHP5 bindings for CUPS
+PKGFILES_CSWphp5-cups += $(prefix)/php5/.*
+RUNTIME_DEP_PKGS_CSWphp5-cups += CSWlibcups2
+RUNTIME_DEP_PKGS_CSWphp5-cups += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWphp5-cups += CSWlibz1
+RUNTIME_DEP_PKGS_CSWphp5-cups += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWphp5-cups += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWphp5-cups += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWphp5-cups += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWphp5-cups += CSWlibk5crypto3
 
 # The daemon
 PACKAGES += CSWcupsd
-SPKG_DESC_CSWcupsd      = CUPS daemon
+SPKG_DESC_CSWcupsd = CUPS daemon
 PKGFILES_CSWcupsd += $(bindir)/ppd(c|html|i|merge|po)
 PKGFILES_CSWcupsd += $(datadir)/applications/.*
 PKGFILES_CSWcupsd += $(datadir)/cups
@@ -140,11 +143,7 @@
 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibslp1
 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibz1
 RUNTIME_DEP_PKGS_CSWcupsd += CSWoldaprt
-EXTRA_MERGE_EXCLUDE_FILES +=  $(sysconfdir)/rc.*
 
-# http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html
-SAMPLECONF_CSWcupsd       = $(sysconfdir)/cups/cupsd\.conf\.CSW
-
 PACKAGES += CSWcupsclient
 SPKG_DESC_CSWcupsclient = CUPS client binaries
 PKGFILES_CSWcupsclient  = $(sbindir)/(accept|reject|cups(addsmb|ctl|(en|dis)able))
@@ -154,6 +153,7 @@
 PKGFILES_CSWcupsclient += $(bindir)/(lp(|options|passwd|q|r|rm|stat))
 PKGFILES_CSWcupsclient += $(bindir)/ipptool
 PKGFILES_CSWcupsclient += $(mandir)/man1/ipptool.1
+PKGFILES_CSWcupsclient += $(sharedstatedir)/cups/ipptool/.*
 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
@@ -178,24 +178,14 @@
 RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibgnutls26
 RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibk5crypto3
 
-PACKAGES += CSWcupsdoc
-CHECKPKG_OVERRIDES_CSWcupsdoc += file-with-bad-content
-
-# Devel package
 PACKAGES += CSWcups-dev
-SPKG_DESC_CSWcups-dev    = CUPS header files
+SPKG_DESC_CSWcups-dev = CUPS header files
 CATALOGNAME_CSWcups-dev = cups_dev
-PKGFILES_CSWcups-dev  = $(includedir)/cups/?.*
-PKGFILES_CSWcups-dev += $(mandir)/man1/cups-config.1
-PKGFILES_CSWcups-dev += $(bindir)/cups-config
+PKGFILES_CSWcups-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWcups-dev += $(datadir)/cups/ppdc.*
 PKGFILES_CSWcups-dev += $(datadir)/cups/drv.*
-PKGFILES_CSWcups-dev += $(libdir)/libcups.so
-PKGFILES_CSWcups-dev += $(libdir)/libcupscgi.so
-PKGFILES_CSWcups-dev += $(libdir)/libcupsdriver.so
-PKGFILES_CSWcups-dev += $(libdir)/libcupsimage.so
-PKGFILES_CSWcups-dev += $(libdir)/libcupsmime.so
-PKGFILES_CSWcups-dev += $(libdir)/libcupsppdc.so
+PKGFILES_CSWcups-dev += $(datadir)/doc/cups/.*
+PKGFILES_CSWcups-dev += $(datadir)/cups/examples.*
 # The development package needs all the libraries
 RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsppdc1
 RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsdriver1
@@ -203,37 +193,35 @@
 RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsmime1
 RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsimage2
 RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupscgi1
-
 OBSOLETED_BY_CSWcups-dev += CSWcups-devel
 OBSOLETED_BY_CSWcups-dev += CSWcupsdev
+OBSOLETED_BY_CSWcups-dev += CSWcupsdoc
 
-# Former devel package
-PACKAGES += CSWcupsdev
-SPKG_DESC_CSWcupsdev = Empty transitional package
-PKGFILES_CSWcupsdev = None
+# Just docs
+CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/spec-banner.html
+CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/api-cups.html
+CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/api-httpipp.html
+CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/ref-cupsd-conf.html
+CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/spec-ppd.html
+CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/translation.html
+CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/options.html
+CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/ref-cupsd-conf.html
+CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/network.html
 
 # The problematic cupslinks package
 # PACKAGES += CSWcupslinks
-# INCOMPATIBLE_PKGS_CSWcupslinks = SUNWpcr SUNWpcu
-# CATALOGNAME_CSWcupslinks = cups_links
-# ARCHALL_CSWcupslinks = 1
-# PKGFILES_CSWcupslinks  = /usr/sbin/.*
-# PKGFILES_CSWcupslinks += /usr/bin/.*
-# SPKG_DESC_CSWcupslinks  = Drop-in replacement for SUNWpcu and SUNWpcr
-# CUPSLINKS_TARGET = cupslinks
+CATALOGNAME_CSWcupslinks = cups_links
+SPKG_DESC_CSWcupslinks = Drop-in replacement for SUNWpcu and SUNWpcr
+ARCHALL_CSWcupslinks = 1
+PKGFILES_CSWcupslinks  = /usr/sbin/.*
+PKGFILES_CSWcupslinks += /usr/bin/.*
+INCOMPATIBLE_PKGS_CSWcupslinks = SUNWpcr SUNWpcu
+CUPSLINKS_TARGET = cupslinks
 
-ARCHALL_CSWcupsdoc   = 1
-
-PKGFILES_CSWcupsdoc += $(datadir)/doc/cups
-PKGFILES_CSWcupsdoc += $(datadir)/doc/cups/.*
-PKGFILES_CSWcupsdoc += $(datadir)/cups/examples.*
-SPKG_DESC_CSWcupsdoc    = CUPS documentation
-
 # Packages compliant with the shared library policy.
 PACKAGES += CSWlibcups2
-CATALOGNAME_CSWlibcups2 = libcups2
-PKGFILES_CSWlibcups2 += $(call baseisadirs,$(libdir),libcups\.so\.2(\.\d+)*)
-SPKG_DESC_CSWlibcups2 += CUPS libraries, libcups.so.2
+SPKG_DESC_CSWlibcups2 = CUPS libraries, libcups.so.2
+PKGFILES_CSWlibcups2 += $(call pkgfiles_lib,libcups.so.2)
 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgcrypt11
 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgnutls26
@@ -241,11 +229,11 @@
 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibz1
+OBSOLETED_BY_CSWlibcups2 += CSWlibcups
 
 PACKAGES += CSWlibcupscgi1
-CATALOGNAME_CSWlibcupscgi1 = libcupscgi1
-PKGFILES_CSWlibcupscgi1 += $(call baseisadirs,$(libdir),libcupscgi\.so\.1(\.\d+)*)
-SPKG_DESC_CSWlibcupscgi1 += CUPS libraries, libcupscgi.so.1
+SPKG_DESC_CSWlibcupscgi1 = CUPS libraries, libcupscgi.so.1
+PKGFILES_CSWlibcupscgi1 += $(call pkgfiles_lib,libcupscgi.so.1)
 RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibcups2
 RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibgcrypt11
@@ -254,11 +242,11 @@
 RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibz1
+OBSOLETED_BY_CSWlibcupscgi1 += CSWlibcups
 
 PACKAGES += CSWlibcupsdriver1
-CATALOGNAME_CSWlibcupsdriver1 = libcupsdriver1
-PKGFILES_CSWlibcupsdriver1 += $(call baseisadirs,$(libdir),libcupsdriver\.so\.1(\.\d+)*)
-SPKG_DESC_CSWlibcupsdriver1 += CUPS libraries, libcupsdriver.so.1
+SPKG_DESC_CSWlibcupsdriver1 = CUPS libraries, libcupsdriver.so.1
+PKGFILES_CSWlibcupsdriver1 += $(call pkgfiles_lib,libcupsdriver.so.1)
 RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibcups2
 RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibgcrypt11
 RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibz1
@@ -267,11 +255,11 @@
 RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibgnutls26
 RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibk5crypto3
+OBSOLETED_BY_CSWlibcupsdriver1 += CSWlibcups
 
 PACKAGES += CSWlibcupsimage2
-CATALOGNAME_CSWlibcupsimage2 = libcupsimage2
-PKGFILES_CSWlibcupsimage2 += $(call baseisadirs,$(libdir),libcupsimage\.so\.2(\.\d+)*)
-SPKG_DESC_CSWlibcupsimage2 += CUPS libraries, libcupsimage.so.2
+SPKG_DESC_CSWlibcupsimage2 = CUPS libraries, libcupsimage.so.2
+PKGFILES_CSWlibcupsimage2 += $(call pkgfiles_lib,libcupsimage.so.2)
 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWjpeg
 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibcups2
@@ -283,11 +271,11 @@
 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibpng12-0
 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibz1
 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWtiff
+OBSOLETED_BY_CSWlibcupsimage2 += CSWlibcups
 
 PACKAGES += CSWlibcupsmime1
-CATALOGNAME_CSWlibcupsmime1 = libcupsmime1
-PKGFILES_CSWlibcupsmime1 += $(call baseisadirs,$(libdir),libcupsmime\.so\.1(\.\d+)*)
-SPKG_DESC_CSWlibcupsmime1 += CUPS libraries, libcupsmime.so.1
+SPKG_DESC_CSWlibcupsmime1 = CUPS libraries, libcupsmime.so.1
+PKGFILES_CSWlibcupsmime1 += $(call pkgfiles_lib,libcupsmime.so.1)
 RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibcups2
 RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibgcrypt11
@@ -296,13 +284,12 @@
 RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibz1
+OBSOLETED_BY_CSWlibcupsmime1 += CSWlibcups
 
 PACKAGES += CSWlibcupsppdc1
-CATALOGNAME_CSWlibcupsppdc1 = libcupsppdc1
-PKGFILES_CSWlibcupsppdc1 += $(call baseisadirs,$(libdir),libcupsppdc\.so\.1(\.\d+)*)
-SPKG_DESC_CSWlibcupsppdc1 += CUPS libraries, libcupsppdc.so.1
+SPKG_DESC_CSWlibcupsppdc1 = CUPS libraries, libcupsppdc.so.1
+PKGFILES_CSWlibcupsppdc1 += $(call pkgfiles_lib,libcupsppdc.so.1)
 RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibcups2
-CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry
 RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgcrypt11
 RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibz1
 RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgpg-error0
@@ -310,14 +297,18 @@
 RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgnutls26
 RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibk5crypto3
+OBSOLETED_BY_CSWlibcupsppdc1 += CSWlibcups
 
-# http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html
-SAMPLECONF_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW
-INITSMF                   = $(sysconfdir)/init\.d/cswcups
+# For some reason -norunpath is not used here, investigate later
+CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry
 
-LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib
+BUILD64 = 1
 
-CONFIGURE_ARGS  = $(DIRPATHS) --enable-pdftops
+EXTRA_LINKER_FLAGS += -liconv
+EXTRA_LINKER_FLAGS += -norunpath
+
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --enable-pdftops
 CONFIGURE_ARGS += --with-menudir=$(datadir)/applications
 CONFIGURE_ARGS += --localedir=$(datadir)/locale
 CONFIGURE_ARGS += --with-rcdir=$(sysconfdir)
@@ -339,34 +330,24 @@
 # to find any of the image libraries.
 # Fortunately, configure honors values already in $DSOFLAGS, so we can use
 # that to make sure -L/opt/csw/lib is the first argument passed to ld.
-DSOFLAGS = -L/opt/csw/lib
-export DSOFLAGS
+CONFIGURE_ARGS += DSOFLAGS=-L$(libdir)
 
-# For some reason, the CUPS guys have decided to use DSTROOT for what
-# everybody else calls DESTDIR.
-DSTROOT = $(DESTDIR)
-export DSTROOT
+# PRIVATE_CUPS_INC = $(DESTDIR)$(includedir)/cups
 
-# Don't run tests (at least for now); there are some LD_LIBRARY_PATH issues
-TEST_TARGET =
-
-SPKG_SOURCEURL = http://www.cups.org/
-
-PRIVATE_CUPS_INC = $(DESTDIR)$(includedir)/cups
-
 # CUPS uses the 'OPTIM' variable to set the optimization flags.
-OPTIM_OPT = -xO0
-OPTIM_DBG = -g -xO0
-OPTIM = $(OPTIM_$(GARFLAVOR))
-OPT_FLAGS_SOS = -xO0
-export OPTIM
+# OPTIM_OPT = -xO0
+# OPTIM_DBG = -g -xO0
+# OPTIM = $(OPTIM_$(GARFLAVOR))
+# OPT_FLAGS_SOS = -xO0
+# export OPTIM
 
-LICENSE = LICENSE.txt
+# Don't run tests (at least for now); there are some LD_LIBRARY_PATH issues
+SKIPTEST ?= 1
 
-# The following overrides are necessary because of a bug in krb5-config, please
-# see bug http://www.opencsw.org/bugtrack/view.php?id=4384
-CHECKPKG_OVERRIDES_CSWcupsd += bad-rpath-entry
-CHECKPKG_OVERRIDES_CSWlibcups2 += bad-rpath-entry
+# For some reason, the CUPS guys have decided to use DSTROOT for what
+# everybody else calls DESTDIR.
+INSTALL_OVERRIDE_VARS = DSTROOT
+INSTALL_OVERRIDE_VAR_DSTROOT = $(DESTDIR)
 
 PROTOTYPE_MODIFIERS = lp_group_etc
 PROTOTYPE_FILES_lp_group_etc = $(sysconfdir).*
@@ -376,9 +357,13 @@
 PROTOTYPE_FILES_lp_group_var = $(localstatedir).*
 PROTOTYPE_GROUP_lp_group_var = lp
 
+# http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html
+SAMPLECONF += $(sysconfdir)/cups/client\.conf\.CSW
+INITSMF = $(sysconfdir)/init\.d/cswcups
+
 include gar/category.mk
 
-post-install-modulated: $(CUPSLINKS_TARGET)
+dont-post-install-modulated: $(CUPSLINKS_TARGET)
 	(cd $(DESTDIR)$(sysconfdir)/cups; \
 	echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \
 	for i in cupsd.conf; do \
@@ -400,7 +385,7 @@
 		$(DESTDIR)$(datadir)/doc/cupsclient/README
 	@$(MAKECOOKIE)
 
-cupslinks:
+dont-cupslinks:
 	# https://www.opencsw.org/mantis/view.php?id=2924
 	ginstall -d -m 755 $(DESTDIR)/usr/bin
 	for f in cancel lp lpoptions lppassd lpq lpr lprm lpstat; do \

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