SF.net SVN: gar:[26690] csw/mgar/pkg/php5/branches/php-5.6.x/Makefile

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Aug 21 19:30:24 CEST 2020 

Revision: 26690
          http://sourceforge.net/p/gar/code/26690
Author:   dmichelsen
Date:     2020-08-21 17:30:24 +0000 (Fri, 21 Aug 2020)
Log Message:
-----------
php5/branches/php-5.6.x: Reworked path structure to conform OpenCSW standards

Modified Paths:
--------------
    csw/mgar/pkg/php5/branches/php-5.6.x/Makefile

Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile	2020-08-19 08:52:04 UTC (rev 26689)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile	2020-08-21 17:30:24 UTC (rev 26690)
@@ -32,6 +32,10 @@
 MERGE_SCRIPTS_isa-default64-sapi-ap24 = copy-relocate
 MERGE_SCRIPTS_isa-default64-sapi-fpm = copy-relocate
 
+MERGE_DIRS_isa-default64-sapi-ap2 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_DIRS_isa-default64-sapi-ap24 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_DIRS_isa-default64-sapi-fpm = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+
 # There is no FPM on SPARC before SPARCV9
 SKIP_MODULATIONS += isa-sparcv8plus-sapi-fpm
 
@@ -105,6 +109,7 @@
 BUILD_DEP_PKGS += CSWlibxpm-dev
 BUILD_DEP_PKGS += CSWlibaspell-dev
 
+PRESERVECONF += $(sysconfdir)/php.ini
 PRESERVECONF += $(sysconfdir)/$(MM_LIBDIR)/php.ini
 PRESERVECONF += $(sysconfdir)/pear.conf
 PRESERVECONF += $(sysconfdir_ap2)/extra/httpd-php5.conf
@@ -112,17 +117,15 @@
 
 define php5_subpackage
 PACKAGES += CSWphp5-$(subst _,-,$(1))
-CATALOGNAME_CSWphp5-$(subst _,-,$(1)) ?= php5_$(subst -,_,$(1))
 SPKG_DESC_CSWphp5-$(subst _,-,$(1)) ?= The $(1) extention for PHP5
 RUNTIME_DEP_PKGS_CSWphp5-$(subst _,-,$(1)) += CSWphp5 $(2)
 # OBSOLETED_BY_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5$(subst _,-,$(1))
 PKGFILES_CSWphp5-$(subst _,-,$(1)) += .*/$(1).so
 PKGFILES_CSWphp5-$(subst _,-,$(1)) += $(includedir)/php/ext/$(1)
-# CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5
 endef
 
 PACKAGES += CSWphp5
-CATALOGNAME_CSWphp5        = php5
 SPKG_DESC_CSWphp5          = A High-Level Scripting Language
 RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 CSWlibexpat1 CSWlibz1
 RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicui18n57
@@ -131,45 +134,63 @@
 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/PEAR/Config.php
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/bin/php
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/php
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/php
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/php/PEAR/Config.php
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/php/PEAR/Config.php
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/php/PEAR/Config.php
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/php/doc/PEAR/README.rst
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/php/doc/PEAR/README.rst
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/php/doc/PEAR/README.rst
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/bin/php-cgi
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/php-cgi
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/php-cgi
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/sbin/php-fpm
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/sbin/amd64/php-fpm
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/sbin/sparcv9/php-fpm
 # verify these...
 CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/etc/opt/csw/php5/php.ini.CSW
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/php/man/man1/php-config.1
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/apache2/modules/libphp5.so
-CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/doc/PEAR/README.rst
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/etc/opt/csw/php5/64/php.ini.CSW
+CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/etc/opt/csw/php5/php-fpm.conf.default
 
-
 PACKAGES += CSWphp5-dev
-CATALOGNAME_CSWphp5-dev   = php5_dev
 SPKG_DESC_CSWphp5-dev     = Development files for php5
 RUNTIME_DEP_PKGS_CSWphp5-dev      = CSWphp5
-PKGFILES_CSWphp5-dev  = $(prefix)/php5/bin/php-config
-PKGFILES_CSWphp5-dev  = $(prefix)/bin/php-config
-PKGFILES_CSWphp5-dev += $(prefix)/php5/bin/phpize
-PKGFILES_CSWphp5-dev += $(prefix)/php5/bin/peardev
-PKGFILES_CSWphp5-dev += $(prefix)/bin/peardev
-PKGFILES_CSWphp5-dev += $(prefix)/php5/lib/php/build/.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/TSRM.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/Zend.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/include.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/main.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/regex.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/date.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/filter.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/libxml.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/pcre.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/spl.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/standard.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/xml.*
-PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/php-config.1
-PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/phpize.1
-CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4
-CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4
-CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool
-CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4
-CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1
+# Some include files like the ones for hash and session belong to the
+# specific PHP module package and not the general PHP development package
+PKGFILES_DEVEL_INCLUDEDIR =
+PKGFILES_CSWphp5-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWphp5-dev += $(call baseisadirs,$(bindir),phpize)
+PKGFILES_CSWphp5-dev += $(call baseisadirs,$(bindir),peardev)
+PKGFILES_CSWphp5-dev += $(call baseisadirs,$(libdir),build/.*)
+PKGFILES_CSWphp5-dev += $(prefix)/include/php/TSRM.*
+PKGFILES_CSWphp5-dev += $(prefix)/include/php/Zend.*
+PKGFILES_CSWphp5-dev += $(prefix)/include/php/include.*
+PKGFILES_CSWphp5-dev += $(prefix)/include/php/main.*
+PKGFILES_CSWphp5-dev += $(prefix)/include/php/regex.*
+PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/date.*
+PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/filter.*
+PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/libxml.*
+PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/pcre.*
+PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/spl.*
+PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/standard.*
+PKGFILES_CSWphp5-dev += $(prefix)/include/php/ext/xml.*
+PKGFILES_CSWphp5-dev += $(mandir)/man1/php-config.1
+PKGFILES_CSWphp5-dev += $(mandir)/man1/phpize.1
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/build/acinclude.m4
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/build/libtool.m4
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/build/shtool
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/build/phpize.m4
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/build/acinclude.m4
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/build/libtool.m4
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/build/shtool
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/build/phpize.m4
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/build/acinclude.m4
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/build/libtool.m4
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/build/shtool
+CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/build/phpize.m4
+CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5
 
 EXTRA_MERGE_EXCLUDE_FILES-ap24 += $(prefix)/apache2.*
 EXTRA_MERGE_EXCLUDE_FILES-ap2 += $(sysconfdir_ap24).*
@@ -185,16 +206,13 @@
 RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicui18n57
 RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuuc57
 RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuio57
-#PKGFILES_CSWap24-modphp5 += $(call baseisadirs,$(prefix)/lib,apache2/modules/libphp5.so)
-PKGFILES_CSWap24-modphp5 += $(prefix)/lib/apache2/modules/libphp5.so
-PKGFILES_CSWap24-modphp5 += $(prefix)/lib/64/apache2/modules/libphp5.so
+PKGFILES_CSWap24-modphp5 += $(call pkgfiles_lib,apache2/modules/libphp5.so)
 PKGFILES_CSWap24-modphp5 += $(sysconfdir_ap24).*
-#work/solaris10-i386/pkgroot/opt/csw/lib/apache2/modules/libphp5.so
-#work/solaris10-i386/pkgroot/opt/csw/lib/64/apache2/modules/libphp5.so
 
-
 CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWapache24
 CHECKPKG_OVERRIDES_CSWap24-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/apache2/modules/libphp5.so
+CHECKPKG_OVERRIDES_CSWap24-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/apache2/modules/libphp5.so
+CHECKPKG_OVERRIDES_CSWap24-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/apache2/modules/libphp5.so
 
 PACKAGES += CSWap2-modphp5
 SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module
@@ -211,6 +229,8 @@
 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWap2-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so
+# There are no 64 bit packages for Apache 2.2
+CHECKPKG_OVERRIDES_CSWap2-modphp5 += 64-bit-binaries-missing
 
 $(eval $(call php5_subpackage,bcmath,))
 $(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0))
@@ -251,7 +271,7 @@
 CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWlibssl1-0-0
 $(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18))
 $(eval $(call php5_subpackage,odbc,CSWlibodbc2))
-RUNTIME_DEP_PKGS_CSWphp5-openssl_sparc += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWphp5-openssl_sparc += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWphp5-openssl += $(RUNTIME_DEP_PKGS_CSWphp5-openssl_$(GARCH))
 $(eval $(call php5_subpackage,openssl,CSWlibssl1-0-0))
 $(eval $(call php5_subpackage,pcntl,))
@@ -258,23 +278,19 @@
 $(eval $(call php5_subpackage,pdo,))
 PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.*
 $(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient18 CSWphp5-pdo))
-PKGFILES_CSWphp5-pdomysql += .*/lib/extensions/.*/pdo_mysql.so
-PKGFILES_CSWphp5-pdomysql += .*/lib/64/extensions/.*/pdo_mysql.so
+PKGFILES_CSWphp5-pdomysql += $(call baseisadirs,$(libdir),extensions/.*/pdo_mysql.so)
 PKGFILES_CSWphp5-pdomysql += .*extensions/pdo_mysql
 CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo
 $(eval $(call php5_subpackage,pdoodbc,CSWlibodbc2 CSWphp5-pdo))
-PKGFILES_CSWphp5-pdoodbc += .*/lib/extensions/.*/pdo_odbc.so
-PKGFILES_CSWphp5-pdoodbc += .*/lib/64/extensions/.*/pdo_odbc.so
+PKGFILES_CSWphp5-pdoodbc += $(call baseisadirs,$(libdir),extensions/.*/pdo_odbc.so)
 PKGFILES_CSWphp5-pdoodbc += .*extensions/pdo_odbc
 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo
 $(eval $(call php5_subpackage,pdopgsql,CSWlibpq5 CSWphp5-pdo))
-PKGFILES_CSWphp5-pdopgsql += .*/lib/extensions/.*/pdo_pgsql.so
-PKGFILES_CSWphp5-pdopgsql += .*/lib/64/extensions/.*/pdo_pgsql.so
+PKGFILES_CSWphp5-pdopgsql += $(call baseisadirs,$(libdir),extensions/.*/pdo_pgsql.so)
 PKGFILES_CSWphp5-pdopgsql += .*extensions/pdo_pgsql
 CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo
 $(eval $(call php5_subpackage,pdosqlite,CSWphp5-pdo CSWlibsqlite3-0))
-PKGFILES_CSWphp5-pdosqlite += .*/lib/extensions/.*/pdo_sqlite.so
-PKGFILES_CSWphp5-pdosqlite += .*/lib/64/extensions/.*/pdo_sqlite.so
+PKGFILES_CSWphp5-pdosqlite += $(call baseisadirs,$(libdir),extensions/.*/pdo_sqlite.so)
 PKGFILES_CSWphp5-pdosqlite += .*extensions/pdo_sqlite
 CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo
 $(eval $(call php5_subpackage,pgsql,CSWlibpq5))
@@ -363,12 +379,12 @@
 #   configure: WARNING: unrecognized options: --enable-magic-quotes, --enable-sqlite-utf8, --enable-sqlite3, --with-curlwrappers, --with-exec-dir, --with-sqlite
 
 # Taken out for testing
-exec_prefix = /opt/csw/php5
+#exec_prefix = /opt/csw/php5
 
-EXTRA_MERGE_DIRS += $(abspath $(prefix)/bin/$(MM_LIBDIR))
-EXTRA_MERGE_DIRS += $(abspath $(prefix)/sbin/$(MM_LIBDIR))
-EXTRA_MERGE_DIRS += $(abspath $(prefix)/libexec/$(MM_LIBDIR))
-EXTRA_MERGE_DIRS += $(abspath $(prefix)/lib/$(MM_LIBDIR))
+#EXTRA_MERGE_DIRS += $(abspath $(prefix)/bin/$(MM_LIBDIR))
+#EXTRA_MERGE_DIRS += $(abspath $(prefix)/sbin/$(MM_LIBDIR))
+#EXTRA_MERGE_DIRS += $(abspath $(prefix)/libexec/$(MM_LIBDIR))
+#EXTRA_MERGE_DIRS += $(abspath $(prefix)/lib/$(MM_LIBDIR))
 
 #MERGEBASE_$(bindir)     ?= $(bindir_install)
 #MERGEBASE_$(sbindir)    ?= $(sbindir_install)
@@ -532,16 +548,16 @@
 	rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* $(DESTDIR)/.f*
 	perl -pi -e 's!s:17:"http://proxy:3128!s:0:"!' $(DESTDIR)$(sysconfdir)/pear.conf*
 	mkdir -p $(DESTDIR)$(prefix)/bin/$(MM_BINDIR)
-	( cd $(DESTDIR)$(prefix)/bin/$(MM_BINDIR); \
-	   for f in pear peardev pecl phar php php-config; do \
-		ln -s $(if $(filter 64,$(MEMORYMODEL)),../../php5/bin/$(MM_BINDIR)/$$f,../php5/bin/$$f) $$f; \
-	   done )
+	#( cd $(DESTDIR)$(prefix)/bin/$(MM_BINDIR); \
+	#   for f in pear peardev pecl phar php php-config; do \
+	#	ln -s $(if $(filter 64,$(MEMORYMODEL)),../../php5/bin/$(MM_BINDIR)/$$f,../php5/bin/$$f) $$f; \
+	#   done )
 	@$(MAKECOOKIE)
 
-post-merge-all:
-	gln -s . $(PKGROOT)$(libdir)/32
-	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
-	@$(MAKECOOKIE)
+#post-merge-all:
+#	gln -s . $(PKGROOT)$(libdir)/32
+#	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
+#	@$(MAKECOOKIE)
 
 
 #post-merge-all:

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