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

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Sun Apr 17 22:58:14 CEST 2011


Revision: 14299
          http://gar.svn.sourceforge.net/gar/?rev=14299&view=rev
Author:   bdwalton
Date:     2011-04-17 20:58:14 +0000 (Sun, 17 Apr 2011)

Log Message:
-----------
php5/trunk: re-org to make per-package statements proximate within the recipe

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-04-17 20:55:06 UTC (rev 14298)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-04-17 20:58:14 UTC (rev 14299)
@@ -27,7 +27,6 @@
 VENDOR_URL     = http://www.php.net/
 MASTER_SITES   = http://us.php.net/distributions/
 INSTALL_ENV   += INSTALL_ROOT=$(DESTDIR)
-#STRIP_DIRS    := $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/
 
 LICENSE = LICENSE
 
@@ -49,8 +48,58 @@
 CHECKPKG_OVERRIDES_CSWphp5-$(1) += surplus-dependency|CSWphp5
 endef
 
-PACKAGES = CSWphp5 CSWphp5-dev
+PACKAGES = CSWphp5
+CATALOGNAME_CSWphp5        = php5
+SPKG_DESC_CSWphp5          = A High-Level Scripting Language
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWiconv CSWexpat CSWzlib
+INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase
+INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5
+# embeded 'magic' information to detect file types...odd, but...
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi
+# verify these...
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW
+
+
+PACKAGES += CSWphp5-dev
+CATALOGNAME_CSWphp5-dev   = php5_dev
+SPKG_DESC_CSWphp5-dev     = Development files for php5
+RUNTIME_DEP_PKGS_CSWphp5-dev      = CSWphp5
+OBSOLETED_BY_CSWphp5-dev = CSWphp5devel
+PKGFILES_CSWphp5-dev  = $(bindir)/php-config
+PKGFILES_CSWphp5-dev += $(bindir)/phpize
+PKGFILES_CSWphp5-dev += $(bindir)/peardev
+PKGFILES_CSWphp5-dev += $(libdir)/php/build/.*
+PKGFILES_CSWphp5-dev += $(includedir)/php/TSRM.*
+PKGFILES_CSWphp5-dev += $(includedir)/php/Zend.*
+PKGFILES_CSWphp5-dev += $(includedir)/php/include.*
+PKGFILES_CSWphp5-dev += $(includedir)/php/main.*
+PKGFILES_CSWphp5-dev += $(includedir)/php/regex.*
+PKGFILES_CSWphp5-dev += $(includedir)/php/ext/date.*
+PKGFILES_CSWphp5-dev += $(includedir)/php/ext/filter.*
+PKGFILES_CSWphp5-dev += $(includedir)/php/ext/libxml.*
+PKGFILES_CSWphp5-dev += $(includedir)/php/ext/pcre.*
+PKGFILES_CSWphp5-dev += $(includedir)/php/ext/spl.*
+PKGFILES_CSWphp5-dev += $(includedir)/php/ext/standard.*
+PKGFILES_CSWphp5-dev += $(includedir)/php/ext/xml.*
+PKGFILES_CSWphp5-dev += $(mandir)/man1/php-config.1
+PKGFILES_CSWphp5-dev += $(mandir)/man1/phpize.1
+CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5
+
 PACKAGES += CSWap2-modphp5
+CATALOGNAME_CSWap2-modphp5 = ap2_modphp5
+SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module
+RUNTIME_DEP_PKGS_CSWap2-modphp5  = CSWphp5 CSWapache2 CSWlibxml2 CSWiconv
+RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib
+OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5
+PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.*
+CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5
 
 $(eval $(call php5_subpackage,bcmath))
 $(eval $(call php5_subpackage,bz2,CSWbzip2))
@@ -122,59 +171,8 @@
 
 BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils
 
-CATALOGNAME_CSWphp5        = php5
-SPKG_DESC_CSWphp5          = A High-Level Scripting Language
-RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2 CSWiconv CSWexpat CSWzlib
-INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase
-INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5
-
-# embeded 'magic' information to detect file types...odd, but...
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi
-# verify these...
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php.ini.CSW
-
-
 # end verify...
 
-CATALOGNAME_CSWphp5-dev   = php5_dev
-SPKG_DESC_CSWphp5-dev     = Development files for php5
-RUNTIME_DEP_PKGS_CSWphp5-dev      = CSWphp5
-OBSOLETED_BY_CSWphp5-dev = CSWphp5devel
-
-CATALOGNAME_CSWap2-modphp5 = ap2_modphp5
-SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module
-RUNTIME_DEP_PKGS_CSWap2-modphp5  = CSWphp5 CSWapache2 CSWlibxml2 CSWiconv
-RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWexpat CSWzlib
-OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5
-
-PKGFILES_CSWphp5-dev  = $(bindir)/php-config
-PKGFILES_CSWphp5-dev += $(bindir)/phpize
-PKGFILES_CSWphp5-dev += $(bindir)/peardev
-PKGFILES_CSWphp5-dev += $(libdir)/php/build/.*
-PKGFILES_CSWphp5-dev += $(includedir)/php/TSRM.*
-PKGFILES_CSWphp5-dev += $(includedir)/php/Zend.*
-PKGFILES_CSWphp5-dev += $(includedir)/php/include.*
-PKGFILES_CSWphp5-dev += $(includedir)/php/main.*
-PKGFILES_CSWphp5-dev += $(includedir)/php/regex.*
-PKGFILES_CSWphp5-dev += $(includedir)/php/ext/date.*
-PKGFILES_CSWphp5-dev += $(includedir)/php/ext/filter.*
-PKGFILES_CSWphp5-dev += $(includedir)/php/ext/libxml.*
-PKGFILES_CSWphp5-dev += $(includedir)/php/ext/pcre.*
-PKGFILES_CSWphp5-dev += $(includedir)/php/ext/spl.*
-PKGFILES_CSWphp5-dev += $(includedir)/php/ext/standard.*
-PKGFILES_CSWphp5-dev += $(includedir)/php/ext/xml.*
-PKGFILES_CSWphp5-dev += $(mandir)/man1/php-config.1
-PKGFILES_CSWphp5-dev += $(mandir)/man1/phpize.1
-
-PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.*
-
 # PATCHFILES += configure.diff
 # PATCHFILES += odbc.diff
 # PATCHFILES += pdopgsql.diff
@@ -309,9 +307,6 @@
 SKIPTEST = 1
 #ENABLE_CHECK = 0
 
-CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5
-CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5
-
 include gar/category.mk
 
 # this allows apxs to install the module.  stupid, but i couldn't make


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