From bonivart at users.sourceforge.net Tue Apr 10 23:27:42 2018 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Apr 2018 21:27:42 +0000 Subject: SF.net SVN: gar:[26403] csw/mgar/pkg/clamav/trunk Message-ID: <1523395663.43843.10174@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26403 http://sourceforge.net/p/gar/code/26403 Author: bonivart Date: 2018-04-10 21:27:42 +0000 (Tue, 10 Apr 2018) Log Message: ----------- clamav/trunk: Update to 0.100.0 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2018-03-29 07:52:15 UTC (rev 26402) +++ csw/mgar/pkg/clamav/trunk/Makefile 2018-04-10 21:27:42 UTC (rev 26403) @@ -1,5 +1,5 @@ NAME = clamav -VERSION = 0.99.4 +VERSION = 0.100.0 GARTYPE = v2 DESCRIPTION = Clam AntiVirus @@ -113,6 +113,7 @@ CHECKPKG_OVERRIDES_CSWlibclam7 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.7.1.1|soname=libclamav.so.7|pkgname=CSWlibclam7|expected=CSWlibclamav7 CHECKPKG_OVERRIDES_CSWlibclam7 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.7.1.1|soname=libclamunrar.so.7|pkgname=CSWlibclam7|expected=CSWlibclamunrar7 CHECKPKG_OVERRIDES_CSWlibclam7 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.7.1.1|soname=libclamunrar_iface.so.7|pkgname=CSWlibclam7|expected=CSWlibclamunrar-iface7 +CHECKPKG_OVERRIDES_CSWlibclam7 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclammspack.so.0.1.0|soname=libclammspack.so.0|pkgname=CSWlibclam7|expected=CSWlibclammspack0 # Should not matter since the old pkg is declared incompatible CHECKPKG_OVERRIDES_CSWlibclam7-dev += file-collision|/opt/csw/bin/clamav-config|CSWlibclam6-dev|CSWlibclam7-dev Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2018-03-29 07:52:15 UTC (rev 26402) +++ csw/mgar/pkg/clamav/trunk/checksums 2018-04-10 21:27:42 UTC (rev 26403) @@ -1 +1 @@ -b9359b90086948b3c4eb97c84cf4b400 clamav-0.99.4.tar.gz +93e8efb489c2afdfca73703b76c24e01 clamav-0.100.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 13 12:13:48 2018 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Apr 2018 10:13:48 +0000 Subject: SF.net SVN: gar:[26404] csw/mgar/pkg Message-ID: <1523614428.983916.25504@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26404 http://sourceforge.net/p/gar/code/26404 Author: dmichelsen Date: 2018-04-13 10:13:47 +0000 (Fri, 13 Apr 2018) Log Message: ----------- php7: Initial commit Added Paths: ----------- csw/mgar/pkg/php7/ csw/mgar/pkg/php7/trunk/ csw/mgar/pkg/php7/trunk/Makefile csw/mgar/pkg/php7/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/php7/branches/php-5.5.x/ csw/mgar/pkg/php7/branches/php-5.6.x/ csw/mgar/pkg/php7/trunk/ csw/mgar/pkg/php7/trunk/Makefile csw/mgar/pkg/php7/trunk/checksums Deleted: csw/mgar/pkg/php7/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2016-08-25 10:05:54 UTC (rev 25900) +++ csw/mgar/pkg/php7/trunk/Makefile 2018-04-13 10:13:47 UTC (rev 26404) @@ -1,501 +0,0 @@ -NAME = php -VERSION = 5.6.24 -GARTYPE = v2 - -BUNDLE = php5 - -DESCRIPTION = A high-level scripting language. -define BLURB -PHP is a widely-used Open Source general-purpose scripting language that is -especially suited for Web development and can be embedded into HTML. Its -syntax draws upon C, Java, and Perl, and is easy to learn. PHP runs on many -different platforms and can be used as a standalone executable or as a -module under a variety of Web servers. It has excellent support for -databases, XML, LDAP, IMAP, Java, various Internet protocols, and general -data manipulation, and is extensible via its powerful API. It is actively -developed and supported by a talented and energetic international team. -Numerous Open Source and commercial PHP-based application packages are -available. -endef - -EXTRA_MODULATORS = SAPI -MODULATIONS_SAPI += ap24 -MODULATIONS_SAPI += ap2 -# MODULATIONS_SAPI += cgi -MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all -MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all -MERGE_SCRIPTS_isa-default-sapi-ap24 = copy-all - -# turn on the build scripts to enable/disable modules -# use the SVR4 class 'build' -PHP5_EXT = 1 -# this triggers /bin/ap2mod_build_scripts -AP2_MODS-ap2 = 1 -AP2_MODFILES-ap2 = *libphp5.so -AP2_MODS += $(AP2_MODS-$(SAPI)) -AP2_MODFILES += $(AP2_MODFILES-$(SAPI)) - -# at least for a decent echo used during build. -PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) - -MASTER_SITES += http://de1.php.net/distributions/ -MASTER_SITES += http://downloads.php.net/tyrael/ -MASTER_SITES += http://snaps.php.net/ -# SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g') - -EXTRA_INSTALL_ENV = INSTALL_ROOT=$(DESTDIR) -EXTRA_TEST_ENV = NO_INTERACTION=1 - -VENDOR_URL = http://www.php.net/ -LICENSE = LICENSE - -DISTNAME = $(NAME)-$(VERSION) -DISTFILES += $(DISTNAME).tar.xz -DISTFILES += phpext -DISTFILES += pear.conf.CSW -DISTFILES += CSWphp5.postinstall -DISTFILES += CSWphp5.cswreleasenotes -DISTFILES += CSWap24-modphp5.cswreleasenotes -DISTFILES += CSWap24-modphp5.postinstall -DISTFILES += CSWap24-modphp5.preremove -DISTFILES += CSWap2-modphp5.cswreleasenotes -DISTFILES += CSWap2-modphp5.postinstall -DISTFILES += CSWap2-modphp5.preremove -DISTFILES += httpd-php5.conf -DISTFILES += map.solaris10 -DISTFILES += php.ini.patch - -PATCHFILES += 0001-Strip-usr-ucblib-references.patch -PATCHFILES += 0003-Do-not-activate-php5-module-during-package-build.patch - -# TBD: Where specifically do these come from? -PATCHFILES += 0001-Undef-disturbing-definition-of-SS-on-Solaris.patch -PATCHFILES += 0002-Undef-ES-on-Solaris.patch - -PATCHFILES += 0004-Do-not-add-Wno-write-strings-unconditionally.patch -PATCHFILES += 0005-Remove-another-Wno.patch -# our apache24 has threaded and prefork MPM, needs 'autoreconf' -PATCHFILES += 0006-disable-zts-build - -BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils -BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWlibcurl-dev CSWjpeg -BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib-dev CSWlibgdbm-dev CSWlibgmp10 -BUILD_DEP_PKGS += CSWggettext-dev CSWlibssl-dev CSWlibgd2 -BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWlibiconv-dev -BUILD_DEP_PKGS += CSWopenldap-dev CSWlibkrb5-dev CSWsasl CSWlibltdl7 -BUILD_DEP_PKGS += CSWmcrypt-dev CSWfreetds CSWmysql-dev CSWunixodbc -BUILD_DEP_PKGS += CSWlibreadline-dev CSWlibncurses-dev CSWnetsnmp-dev -BUILD_DEP_PKGS += CSWlibsqlite3-dev CSWaspell CSWtidy-dev CSWpostgresql-dev -BUILD_DEP_PKGS += CSWlibfreetype-dev -BUILD_DEP_PKGS += CSWlibxpm-dev -BUILD_DEP_PKGS += CSWlibaspell-dev - -PRESERVECONF += $(sysconfdir)/php.ini -PRESERVECONF += $(sysconfdir)/pear.conf -PRESERVECONF += $(sysconfdir_ap2)/extra/httpd-php5.conf -PRESERVECONF += $(sysconfdir_ap24)/extra/httpd-php5.conf - -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)) += .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1) -# 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 -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc57 -RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuio57 -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 -# 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 - - -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 - -EXTRA_MERGE_EXCLUDE_FILES-ap24 += $(prefix)/apache2.* -EXTRA_MERGE_EXCLUDE_FILES-ap2 += $(sysconfdir_ap24).* -EXTRA_MERGE_EXCLUDE_FILES += $(EXTRA_MERGE_EXCLUDE_FILES-$(SAPI)) - -PACKAGES += CSWap24-modphp5 -SPKG_DESC_CSWap24-modphp5 = The apache 2.4.x php5 module -RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWapache24 -RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWphp5 -RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicui18n57 -RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuuc57 -RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuio57 -PKGFILES_CSWap24-modphp5 += $(libdir)/apache2/modules.* -PKGFILES_CSWap24-modphp5 += $(sysconfdir_ap24).* -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 - -PACKAGES += CSWap2-modphp5 -SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module -CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWphp5 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWapache2 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWphp5 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n57 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuio57 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuuc57 -RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibz1 -PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* -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 - -$(eval $(call php5_subpackage,bcmath,)) -$(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0)) -$(eval $(call php5_subpackage,calendar,)) -$(eval $(call php5_subpackage,ctype,)) -RUNTIME_DEP_PKGS_CSWphp5-curl_sparc += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWphp5-curl += $(RUNTIME_DEP_PKGS_CSWphp5-curl_$(GARCH)) -$(eval $(call php5_subpackage,curl,CSWlibcurl4)) -$(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42)) -$(eval $(call php5_subpackage,dom,CSWlibxml2-2)) -PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* -$(eval $(call php5_subpackage,exif,)) -$(eval $(call php5_subpackage,ftp,CSWlibssl1-0-0)) -RUNTIME_DEP_PKGS_CSWphp5-gd_sparc += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWphp5-gd_sparc += CSWlibz1 -RUNTIME_DEP_PKGS_CSWphp5-gd_sparc += CSWlibpng16-16 -RUNTIME_DEP_PKGS_CSWphp5-gd_sparc += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWphp5-gd += $(RUNTIME_DEP_PKGS_CSWphp5-gd_$(GARCH)) -$(eval $(call php5_subpackage,gd,CSWlibgd3 CSWlibt1-5 CSWlibxpm4)) -PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.* -$(eval $(call php5_subpackage,gettext,CSWlibintl8)) -$(eval $(call php5_subpackage,gmp,CSWlibgmp10)) -$(eval $(call php5_subpackage,hash,)) -PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.* -$(eval $(call php5_subpackage,iconv,CSWlibiconv2)) -PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* -$(eval $(call php5_subpackage,imap,CSWlibc-client-dev)) -$(eval $(call php5_subpackage,json,)) -$(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2)) -$(eval $(call php5_subpackage,mbstring,)) -PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* -RUNTIME_DEP_PKGS_CSWphp5-mcrypt_sparc += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWphp5-mcrypt += $(RUNTIME_DEP_PKGS_CSWphp5-mcrypt_$(GARCH)) -$(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4)) -$(eval $(call php5_subpackage,mssql,CSWlibsybdb5)) -$(eval $(call php5_subpackage,mysql,CSWlibmysqlclient18 CSWlibssl1-0-0)) -# likely a checkpkg glitch (uses sparcv8plus+vis path for the library) -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 += $(RUNTIME_DEP_PKGS_CSWphp5-openssl_$(GARCH)) -$(eval $(call php5_subpackage,openssl,CSWlibssl1-0-0)) -$(eval $(call php5_subpackage,pcntl,)) -$(eval $(call php5_subpackage,pdo,)) -PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* -$(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient18 CSWphp5-pdo)) -PKGFILES_CSWphp5-pdomysql += .*/lib/php/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/php/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/php/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/php/extensions/.*/pdo_sqlite.so -PKGFILES_CSWphp5-pdosqlite += .*extensions/pdo_sqlite -CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo -$(eval $(call php5_subpackage,pgsql,CSWlibpq5)) -$(eval $(call php5_subpackage,posix,)) -$(eval $(call php5_subpackage,pspell,CSWlibaspell15)) -RUNTIME_DEP_PKGS_CSWphp5-readline_sparc += CSWlibncurses6 -RUNTIME_DEP_PKGS_CSWphp5-readline += $(RUNTIME_DEP_PKGS_CSWphp5-readline_$(GARCH)) -$(eval $(call php5_subpackage,readline,CSWlibreadline6)) -$(eval $(call php5_subpackage,session,CSWlibmm)) -PKGFILES_CSWphp5-session += .*/include/php/ext/session.* -$(eval $(call php5_subpackage,shmop,)) -$(eval $(call php5_subpackage,snmp,CSWlibnetsnmp30)) -$(eval $(call php5_subpackage,soap,CSWlibxml2-2)) -$(eval $(call php5_subpackage,sockets,)) -# $(eval $(call php5_subpackage,sqlite,CSWsqlite)) -$(eval $(call php5_subpackage,sysvmsg,)) -$(eval $(call php5_subpackage,sysvsem,)) -$(eval $(call php5_subpackage,sysvshm,)) -$(eval $(call php5_subpackage,tidy,CSWlibtidy0-99-0)) -$(eval $(call php5_subpackage,tokenizer,)) -$(eval $(call php5_subpackage,wddx,)) -$(eval $(call php5_subpackage,xmlreader,CSWlibxml2-2)) -$(eval $(call php5_subpackage,xmlrpc,CSWlibiconv2 CSWlibexpat1)) -$(eval $(call php5_subpackage,xmlwriter,CSWlibxml2-2)) -RUNTIME_DEP_PKGS_CSWphp5-xsl_sparc += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWphp5-xsl += $(RUNTIME_DEP_PKGS_CSWphp5-xsl_$(GARCH)) -$(eval $(call php5_subpackage,xsl,CSWlibxml2-2 CSWlibxslt1 CSWlibexslt0)) -$(eval $(call php5_subpackage,zip,CSWlibz1)) -# $(eval $(call php5_subpackage,ibm_db2,)) - -# Use reinplacement until this is fixed: -# https://bugs.php.net/bug.php?id=66298 -#REINPLACEMENTS += dos -#REINPLACE_MATCH_dos = \r$$ -#REINPLACE_WITH_dos = -#REINPLACE_FILES_dos += ext/opcache/Optimizer/zend_optimizer.c - -EXTRA_CFLAGS = -I$(prefix)/include/ncursesw -EXTRA_LIB = /opt/csw/postgresql/lib - -GARCOMPILER = SOS12U4 -# GARCOMPILER = GNU - -# We link with /usr/ccs/bin/ld which requires setting the path to libCstd.so, -# using CC as linker would have made this automatic. -SUBDIR64-sparc = v9 -SUBDIR64-i386 = amd64 -#EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lz -# EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCrun -# /opt/solarisstudio12.4/lib/compilers/ -EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/compilers/ -lCrun -EXTRA_LD_OPTIONS = -M "$(abspath $(WORKDIR)/map.solaris10)" - -NOISALIST = 1 -STRIP_LIBTOOL = 1 - -# We must not cut back on libc as we need current libmysql requiring getpagesizes2 -LINKER_MAPS = - -# EXTRA_CONFIGURE_EXPORTS += IBM_DB_INCLUDE -# EXTRA_CONFIGURE_EXPORTS += IBM_DB_LIB -# EXTRA_CONFIGURE_EXPORTS += DB2INSTANCE -# EXTRA_CONFIGURE_EXPORTS += DB2DIR - -# This is needed for DB2 module -# CONFIGURE_ENV_IBM_DB_INCLUDE = /opt/IBM/db2/V8.1/include -# CONFIGURE_ENV_IBM_DB_LIB = /opt/IBM/db2/V8.1/lib -# CONFIGURE_ENV_DB2INSTANCE = db2inst1 -# CONFIGURE_ENV_DB2DIR = /opt/IBM/db2/V8.1 - -# EXTRA_RUNPATH_LINKER_FLAGS += -R$(CONFIGURE_ENV_IBM_DB_LIB) - -# We need CMSG_SPACE -# EXTRA_CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__ -EXTRA_CFLAGS += -D_XPG4_2 -D__EXTENSIONS__ - -# Otherwise we get the following error because std:: is not explicitly used: -# "/opt/SUNWspro/prod/include/CC/Cstd/rw/traits", line 535: Error: The function "wcsstr" must have a prototype. -#EXTRA_CPPFLAGS += -D_RWSTD_NO_NEW_HEADER - -sysconfdir = /etc$(prefix)/php5 -sysconfdir_ap24 = /etc$(prefix)/apache2 -sysconfdir_ap2 = $(prefix)/apache2/etc - -CONFIGURE_ARGS += --prefix=$(prefix)/php5 -CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) -## build this static, php can not run without it. -## it is more efficient to have this built into the php binary -CONFIGURE_ARGS += --enable-simplexml -CONFIGURE_ARGS += --disable-static -CONFIGURE_ARGS += --enable-xml -CONFIGURE_ARGS += --enable-intl -CONFIGURE_ARGS += --with-libxml-dir=$(prefix) -CONFIGURE_ARGS += --with-config-file-path=$(sysconfdir) -CONFIGURE_ARGS += --with-config-file-scan-dir=$(sysconfdir)/conf.d -CONFIGURE_ARGS += --enable-bcmath=shared -CONFIGURE_ARGS += --enable-calendar=shared -CONFIGURE_ARGS += --enable-ctype=shared -CONFIGURE_ARGS += --enable-dba=shared -CONFIGURE_ARGS += --enable-dom=shared -CONFIGURE_ARGS += --enable-exif=shared -CONFIGURE_ARGS += --enable-filter=shared -CONFIGURE_ARGS += --enable-ftp=shared -CONFIGURE_ARGS += --enable-gd-jis-conv -CONFIGURE_ARGS += --enable-gd-native-ttf -CONFIGURE_ARGS += --enable-hash=shared -CONFIGURE_ARGS += --enable-json=shared -CONFIGURE_ARGS += --enable-magic-quotes -CONFIGURE_ARGS += --enable-mbstring=shared -CONFIGURE_ARGS += --enable-pcntl=shared -CONFIGURE_ARGS += --enable-pdo=shared -CONFIGURE_ARGS += --enable-phar=shared -CONFIGURE_ARGS += --enable-posix=shared -CONFIGURE_ARGS += --enable-session=shared -CONFIGURE_ARGS += --enable-shmop=shared -CONFIGURE_ARGS += --enable-soap=shared -CONFIGURE_ARGS += --enable-sockets=shared -CONFIGURE_ARGS += --enable-sqlite-utf8 -CONFIGURE_ARGS += --enable-sqlite3=shared,$(prefix) -CONFIGURE_ARGS += --enable-sysvmsg=shared -CONFIGURE_ARGS += --enable-sysvsem=shared -CONFIGURE_ARGS += --enable-sysvshm=shared -CONFIGURE_ARGS += --enable-tokenizer=shared -CONFIGURE_ARGS += --enable-wddx=shared -CONFIGURE_ARGS += --enable-xmlreader=shared -CONFIGURE_ARGS += --enable-xmlwriter=shared -CONFIGURE_ARGS += --enable-zip=shared -CONFIGURE_ARGS += --with-bz2=shared,$(prefix) -CONFIGURE_ARGS += --with-curl=shared,$(prefix) -CONFIGURE_ARGS += --with-curlwrappers -CONFIGURE_ARGS += --with-db4=$(prefix)/bdb4 -CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin -CONFIGURE_ARGS += --with-freetype-dir=$(prefix) -CONFIGURE_ARGS += --with-gd=shared,$(prefix) -CONFIGURE_ARGS += --with-gdbm=$(prefix) -CONFIGURE_ARGS += --with-gettext=shared,$(prefix) -CONFIGURE_ARGS += --with-gmp=shared,$(prefix) -# CONFIGURE_ARGS += --with-ibm-db2=shared,/export/db2inst1/sqllib -CONFIGURE_ARGS += --with-iconv=shared,$(prefix) -CONFIGURE_ARGS += --with-imap-ssl=$(prefix) -CONFIGURE_ARGS += --with-imap=shared,$(prefix) -CONFIGURE_ARGS += --with-jpeg-dir=$(prefix) -CONFIGURE_ARGS += --with-kerberos=$(prefix) -CONFIGURE_ARGS += --with-ldap-sasl=$(prefix) -CONFIGURE_ARGS += --with-ldap=shared,$(prefix) -CONFIGURE_ARGS += --with-libedit=no -CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) -CONFIGURE_ARGS += --with-mcrypt=shared,$(prefix) -CONFIGURE_ARGS += --with-mhash=shared,$(prefix) -CONFIGURE_ARGS += --with-mm=$(prefix) -CONFIGURE_ARGS += --with-mssql=shared,$(prefix) -CONFIGURE_ARGS += --with-mysql=shared,$(prefix) -CONFIGURE_ARGS += --with-mysqli=shared,$(prefix)/bin/mysql_config -CONFIGURE_ARGS += --with-ndbm -CONFIGURE_ARGS += --with-openssl=shared,$(prefix) -CONFIGURE_ARGS += --with-pcre-dir=$(prefix) -CONFIGURE_ARGS += --with-pcre-regex -# not documented, but you can pass the path to mysql_config directly -# we need the 32-bit version, so we have to force this -CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/bin/mysql_config -CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix) -CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(bindir)/ -CONFIGURE_ARGS += --with-pdo-sqlite=shared,$(prefix) -CONFIGURE_ARGS += --with-pear=shared -CONFIGURE_ARGS += --with-pgsql=shared,$(bindir)/ -CONFIGURE_ARGS += --with-png-dir=$(prefix) -CONFIGURE_ARGS += --with-pspell=shared,$(prefix) -CONFIGURE_ARGS += --with-readline=shared,/opt/csw -CONFIGURE_ARGS += --with-snmp=shared,$(prefix) -CONFIGURE_ARGS += --with-sqlite=shared,$(prefix) -CONFIGURE_ARGS += --with-t1lib=$(prefix) -CONFIGURE_ARGS += --with-tidy=shared,$(prefix) -CONFIGURE_ARGS += --with-unixODBC=shared,$(prefix) -CONFIGURE_ARGS += --with-xmlrpc=shared -CONFIGURE_ARGS += --with-xpm-dir=$(prefix) -CONFIGURE_ARGS += --with-xsl=shared,$(prefix) -CONFIGURE_ARGS += --with-zlib-dir=$(prefix) -CONFIGURE_ARGS += --with-zlib=$(prefix) -CONFIGURE_ARGS += --enable-cli -CONFIGURE_ARGS_fpm += --enable-fpm - -CONFIGURE_ARGS-ap24 += --with-apxs2=$(prefix)/bin/apxs -CONFIGURE_ARGS-ap2 += --with-apxs2=$(prefix)/apache2/sbin/apxs -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(SAPI)) - -# Disable Tests (report submitted to PHP QA) -# works, but takes a lot of time -SKIPTEST = 1 -#ENABLE_CHECK = 0 -TEST_TARGET = test - -include gar/category.mk - -# they're using git now and ship a .gitignore that excludes aclocal.m4 -# that broke one of our patches so we'll nuke .gitignore before we patch -pre-patch-modulated: - @-(cd $(WORKSRC); rm .gitignore; git add -A; git commit -m 'adding files that were previously ignored' ) - @$(MAKECOOKIE) - -pre-configure-modulated: - (cd $(WORKSRC) && autoreconf) - @$(MAKECOOKIE) - -xxxxpre-configure-modulated: - @echo Munging c-client routine in configure. - @(cd $(WORKSRC); \ - perl -pi -e "s|c-client4 c-client|c-client.2007f|g" configure; \ - git add configure; git commit -m 'modify c-client finding routine') - @$(MAKECOOKIE) - -# this allows apxs to install the module. stupid, but i couldn't make -# the darn thing _not_ do try to add the httpd.conf lines, even with -# patching... -# pre-install-modulated: AP2SYSCONF=$(sysconfdir_ap2) -# pre-install-modulated: $(PI_SCRIPTS) -# @(mkdir -p $(DESTDIR)$(AP2SYSCONF); \ -# cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF) ) -# @echo "LoadModule foo_module libexec/mod_foo.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf -# @echo "LoadModule foo1_module libexec/mod_foo1.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf -# @echo "LoadModule foo2_module libexec/mod_foo2.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf -# @$(MAKECOOKIE) - -post-install-modulated: AP2SYSCONF=$(sysconfdir_$(SAPI))/httpd.conf -post-install-modulated: AP2EXTCONF=$(sysconfdir_$(SAPI))/extra -post-install-modulated: INIDEST=$(DESTDIR)/etc$(prefix)/php5/php.ini -post-install-modulated: - @rm -f $(DESTDIR)$(AP2SYSCONF) - @ginstall -d -m 0755 $(DESTDIR)$(AP2EXTCONF) - @ginstall -m 0644 $(WORKDIR)/httpd-php5.conf $(DESTDIR)$(AP2EXTCONF) - @ginstall -m 0644 $(WORKSRC)/php.ini-production $(INIDEST) - @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) - @ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/ - @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)/opt/csw/bin - @( cd $(DESTDIR)/opt/csw/bin; \ - for f in pear peardev pecl phar php php-config; do \ - ln -s ../php5/bin/$$f $$f; \ - done ) - @$(MAKECOOKIE) - -post-merge-all: - @echo " ==> Fixing php.ini: adding loadable session.so ctype.so phar.so support" - cat $(WORKDIR)/php.ini.patch | ed -s $(PKGROOT)/$(sysconfdir)/php.ini.CSW - @$(MAKECOOKIE) - -post-merge-modulated: - @echo "merge for $(SAPI)" - @echo "preserve $(PRESERVECONF)" - @$(MAKECOOKIE) Copied: csw/mgar/pkg/php7/trunk/Makefile (from rev 25973, csw/mgar/pkg/php5/branches/php-5.6.x/Makefile) =================================================================== --- csw/mgar/pkg/php7/trunk/Makefile (rev 0) +++ csw/mgar/pkg/php7/trunk/Makefile 2018-04-13 10:13:47 UTC (rev 26404) @@ -0,0 +1,528 @@ +NAME = php +VERSION = 5.6.35 +GARTYPE = v2 + +BUNDLE = php5 + +DESCRIPTION = A high-level scripting language. +define BLURB +PHP is a widely-used Open Source general-purpose scripting language that is +especially suited for Web development and can be embedded into HTML. Its +syntax draws upon C, Java, and Perl, and is easy to learn. PHP runs on many +different platforms and can be used as a standalone executable or as a +module under a variety of Web servers. It has excellent support for +databases, XML, LDAP, IMAP, Java, various Internet protocols, and general +data manipulation, and is extensible via its powerful API. It is actively +developed and supported by a talented and energetic international team. +Numerous Open Source and commercial PHP-based application packages are +available. +endef + +BUILD64 = 1 + +EXTRA_MODULATORS = SAPI +MODULATIONS_SAPI += ap24 +MODULATIONS_SAPI += ap2 +MODULATIONS_SAPI += fpm +# MODULATIONS_SAPI += cgi +MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all +MERGE_SCRIPTS_isa-default-sapi-ap24 = copy-all +MERGE_SCRIPTS_isa-default-sapi-fpm = copy-all +MERGE_SCRIPTS_isa-default64-sapi-ap2 = copy-relocate +MERGE_SCRIPTS_isa-default64-sapi-ap24 = copy-relocate +MERGE_SCRIPTS_isa-default64-sapi-fpm = copy-relocate + +# There is no FPM on SPARC before SPARCV9 +SKIP_MODULATIONS += isa-sparcv8plus-sapi-fpm + +# Just for testing!!! +#SKIP_MODULATIONS += isa-sparcv8plus-sapi-ap24 isa-sparcv8plus-sapi-ap2 +SKIP_MODULATIONS += isa-sparcv9-sapi-ap2 +SKIP_MODULATIONS += isa-amd64-sapi-ap2 +#SKIP_MODULATIONS += isa-sparcv9-sapi-fpm + +# turn on the build scripts to enable/disable modules +# use the SVR4 class 'build' +PHP5_EXT = 1 +# this triggers /bin/ap2mod_build_scripts +AP2_MODS-ap2 = 1 +AP2_MODFILES-ap2 = *libphp5.so +AP2_MODS += $(AP2_MODS-$(SAPI)) +AP2_MODFILES += $(AP2_MODFILES-$(SAPI)) + +# at least for a decent echo used during build. +# $(bindir) can contain the 64 bit path +PATH := /opt/csw/gnu:$(bindir):/opt/csw/bin:$(PATH) + +MASTER_SITES += http://de2.php.net/get/ + +EXTRA_INSTALL_ENV = INSTALL_ROOT=$(DESTDIR) +EXTRA_TEST_ENV = NO_INTERACTION=1 + +VENDOR_URL = http://www.php.net/ +LICENSE = LICENSE + +DISTNAME = $(NAME)-$(VERSION) +DISTFILES += $(DISTNAME).tar.xz +DISTFILES += phpext +DISTFILES += pear.conf.CSW +DISTFILES += CSWphp5.postinstall +DISTFILES += CSWphp5.cswreleasenotes +DISTFILES += CSWap24-modphp5.cswreleasenotes +DISTFILES += CSWap24-modphp5.postinstall +DISTFILES += CSWap24-modphp5.preremove +DISTFILES += CSWap2-modphp5.cswreleasenotes +DISTFILES += CSWap2-modphp5.postinstall +DISTFILES += CSWap2-modphp5.preremove +DISTFILES += httpd-php5.conf +DISTFILES += map.solaris10 +DISTFILES += php.ini.patch + +PATCHFILES += 0001-Strip-usr-ucblib-references.patch +PATCHFILES += 0003-Do-not-activate-php5-module-during-package-build.patch + +# TBD: Where specifically do these come from? +PATCHFILES += 0001-Undef-disturbing-definition-of-SS-on-Solaris.patch +PATCHFILES += 0002-Undef-ES-on-Solaris.patch + +PATCHFILES += 0004-Do-not-add-Wno-write-strings-unconditionally.patch +PATCHFILES += 0005-Remove-another-Wno.patch +# our apache24 has threaded and prefork MPM, needs 'autoreconf' +PATCHFILES += 0006-disable-zts-build + +BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils +BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWlibcurl-dev CSWjpeg +BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib-dev CSWlibgdbm-dev CSWlibgmp10 +BUILD_DEP_PKGS += CSWggettext-dev CSWlibssl-dev CSWlibgd2 +BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWlibiconv-dev +BUILD_DEP_PKGS += CSWopenldap-dev CSWlibkrb5-dev CSWsasl CSWlibltdl7 +BUILD_DEP_PKGS += CSWmcrypt-dev CSWfreetds CSWmysql56-dev CSWunixodbc +BUILD_DEP_PKGS += CSWlibreadline-dev CSWlibncurses-dev CSWnetsnmp-dev +BUILD_DEP_PKGS += CSWlibsqlite3-dev CSWaspell CSWtidy-dev CSWpostgresql-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibxpm-dev +BUILD_DEP_PKGS += CSWlibaspell-dev + +PRESERVECONF += $(sysconfdir)/$(MM_LIBDIR)/php.ini +PRESERVECONF += $(sysconfdir)/pear.conf +PRESERVECONF += $(sysconfdir_ap2)/extra/httpd-php5.conf +PRESERVECONF += $(sysconfdir_ap24)/extra/httpd-php5.conf + +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 +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 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc57 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuio57 +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 +# 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 + + +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 + +EXTRA_MERGE_EXCLUDE_FILES-ap24 += $(prefix)/apache2.* +EXTRA_MERGE_EXCLUDE_FILES-ap2 += $(sysconfdir_ap24).* +EXTRA_MERGE_EXCLUDE_FILES += $(EXTRA_MERGE_EXCLUDE_FILES-$(SAPI)) + +PACKAGES += CSWap24-modphp5 +SPKG_DESC_CSWap24-modphp5 = The apache 2.4.x php5 module +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWapache24 +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWphp5 +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicui18n57 +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuuc57 +RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuio57 +PKGFILES_CSWap24-modphp5 += $(libdir)/apache2/modules.* +PKGFILES_CSWap24-modphp5 += $(sysconfdir_ap24).* +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 + +PACKAGES += CSWap2-modphp5 +SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module +CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWphp5 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWapache2 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWphp5 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n57 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuio57 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuuc57 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibz1 +PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* +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 + +$(eval $(call php5_subpackage,bcmath,)) +$(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0)) +$(eval $(call php5_subpackage,calendar,)) +$(eval $(call php5_subpackage,ctype,)) +RUNTIME_DEP_PKGS_CSWphp5-curl_sparc += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWphp5-curl += $(RUNTIME_DEP_PKGS_CSWphp5-curl_$(GARCH)) +$(eval $(call php5_subpackage,curl,CSWlibcurl4)) +$(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42)) +$(eval $(call php5_subpackage,dom,CSWlibxml2-2)) +PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* +$(eval $(call php5_subpackage,exif,)) +$(eval $(call php5_subpackage,ftp,CSWlibssl1-0-0)) +RUNTIME_DEP_PKGS_CSWphp5-gd_sparc += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWphp5-gd_sparc += CSWlibz1 +RUNTIME_DEP_PKGS_CSWphp5-gd_sparc += CSWlibpng16-16 +RUNTIME_DEP_PKGS_CSWphp5-gd_sparc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWphp5-gd += $(RUNTIME_DEP_PKGS_CSWphp5-gd_$(GARCH)) +$(eval $(call php5_subpackage,gd,CSWlibgd3 CSWlibt1-5 CSWlibxpm4)) +PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.* +$(eval $(call php5_subpackage,gettext,CSWlibintl9)) +$(eval $(call php5_subpackage,gmp,CSWlibgmp10)) +$(eval $(call php5_subpackage,hash,)) +PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.* +$(eval $(call php5_subpackage,iconv,CSWlibiconv2)) +PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* +$(eval $(call php5_subpackage,imap,CSWlibc-client-dev)) +$(eval $(call php5_subpackage,json,)) +$(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2)) +$(eval $(call php5_subpackage,mbstring,)) +PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* +RUNTIME_DEP_PKGS_CSWphp5-mcrypt_sparc += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWphp5-mcrypt += $(RUNTIME_DEP_PKGS_CSWphp5-mcrypt_$(GARCH)) +$(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4)) +$(eval $(call php5_subpackage,mssql,CSWlibsybdb5)) +$(eval $(call php5_subpackage,mysql,CSWlibmysqlclient18 CSWlibssl1-0-0)) +# likely a checkpkg glitch (uses sparcv8plus+vis path for the library) +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 += $(RUNTIME_DEP_PKGS_CSWphp5-openssl_$(GARCH)) +$(eval $(call php5_subpackage,openssl,CSWlibssl1-0-0)) +$(eval $(call php5_subpackage,pcntl,)) +$(eval $(call php5_subpackage,pdo,)) +PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* +$(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient18 CSWphp5-pdo)) +PKGFILES_CSWphp5-pdomysql += .*/lib/php/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/php/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/php/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/php/extensions/.*/pdo_sqlite.so +PKGFILES_CSWphp5-pdosqlite += .*extensions/pdo_sqlite +CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo +$(eval $(call php5_subpackage,pgsql,CSWlibpq5)) +$(eval $(call php5_subpackage,posix,)) +$(eval $(call php5_subpackage,pspell,CSWlibaspell15)) +RUNTIME_DEP_PKGS_CSWphp5-readline_sparc += CSWlibncurses6 +RUNTIME_DEP_PKGS_CSWphp5-readline += $(RUNTIME_DEP_PKGS_CSWphp5-readline_$(GARCH)) +$(eval $(call php5_subpackage,readline,CSWlibreadline6)) +$(eval $(call php5_subpackage,session,CSWlibmm)) +PKGFILES_CSWphp5-session += .*/include/php/ext/session.* +$(eval $(call php5_subpackage,shmop,)) +$(eval $(call php5_subpackage,snmp,CSWlibnetsnmp30)) +$(eval $(call php5_subpackage,soap,CSWlibxml2-2)) +$(eval $(call php5_subpackage,sockets,)) +# $(eval $(call php5_subpackage,sqlite,CSWsqlite)) +$(eval $(call php5_subpackage,sysvmsg,)) +$(eval $(call php5_subpackage,sysvsem,)) +$(eval $(call php5_subpackage,sysvshm,)) +$(eval $(call php5_subpackage,tidy,CSWlibtidy0-99-0)) +$(eval $(call php5_subpackage,tokenizer,)) +$(eval $(call php5_subpackage,wddx,)) +$(eval $(call php5_subpackage,xmlreader,CSWlibxml2-2)) +$(eval $(call php5_subpackage,xmlrpc,CSWlibiconv2 CSWlibexpat1)) +$(eval $(call php5_subpackage,xmlwriter,CSWlibxml2-2)) +RUNTIME_DEP_PKGS_CSWphp5-xsl_sparc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWphp5-xsl += $(RUNTIME_DEP_PKGS_CSWphp5-xsl_$(GARCH)) +$(eval $(call php5_subpackage,xsl,CSWlibxml2-2 CSWlibxslt1 CSWlibexslt0)) +$(eval $(call php5_subpackage,zip,CSWlibz1)) +# $(eval $(call php5_subpackage,ibm_db2,)) + +# Use reinplacement until this is fixed: +# https://bugs.php.net/bug.php?id=66298 +#REINPLACEMENTS += dos +#REINPLACE_MATCH_dos = \r$$ +#REINPLACE_WITH_dos = +#REINPLACE_FILES_dos += ext/opcache/Optimizer/zend_optimizer.c + +EXTRA_CFLAGS = -I$(prefix)/include/ncursesw +EXTRA_LIB += /opt/csw/postgresql/lib + +# BDB 64 bit libs are in a subdirectory +EXTRA_LIB += /opt/csw/bdb4/lib + +GARCOMPILER = SOS12U4 +# GARCOMPILER = GNU + +# We link with /usr/ccs/bin/ld which requires setting the path to libCstd.so, +# using CC as linker would have made this automatic. +SUBDIR64-sparc = sparcv9 +SUBDIR64-i386 = amd64 +#EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lz +# EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCrun +# /opt/solarisstudio12.4/lib/compilers/libCrun.so +# /opt/solarisstudio12.4/lib/compilers/sparcv9/libCrun.so +EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/compilers/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCrun +EXTRA_LD_OPTIONS = -M "$(abspath $(WORKDIR)/map.solaris10)" + +NOISALIST = 1 +STRIP_LIBTOOL = 1 + +# We must not cut back on libc as we need current libmysql requiring getpagesizes2 +LINKER_MAPS = + +# EXTRA_CONFIGURE_EXPORTS += IBM_DB_INCLUDE +# EXTRA_CONFIGURE_EXPORTS += IBM_DB_LIB +# EXTRA_CONFIGURE_EXPORTS += DB2INSTANCE +# EXTRA_CONFIGURE_EXPORTS += DB2DIR + +# This is needed for DB2 module +# CONFIGURE_ENV_IBM_DB_INCLUDE = /opt/IBM/db2/V8.1/include +# CONFIGURE_ENV_IBM_DB_LIB = /opt/IBM/db2/V8.1/lib +# CONFIGURE_ENV_DB2INSTANCE = db2inst1 +# CONFIGURE_ENV_DB2DIR = /opt/IBM/db2/V8.1 + +# EXTRA_RUNPATH_LINKER_FLAGS += -R$(CONFIGURE_ENV_IBM_DB_LIB) + +# We need CMSG_SPACE +# EXTRA_CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__ +EXTRA_CFLAGS += -D_XPG4_2 -D__EXTENSIONS__ + +# Otherwise we get the following error because std:: is not explicitly used: +# "/opt/SUNWspro/prod/include/CC/Cstd/rw/traits", line 535: Error: The function "wcsstr" must have a prototype. +#EXTRA_CPPFLAGS += -D_RWSTD_NO_NEW_HEADER + +sysconfdir = /etc/opt/csw/php5 +sysconfdir_ap2 = /opt/csw/apache2/etc +sysconfdir_ap24 = /etc/opt/csw/apache2 +sysconfdir_fpm = /etc/opt/csw/apache2 + +# XXX: TBD review options: +# 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 + +CONFIGURE_ARGS += $(DIRPATHS) +#CONFIGURE_ARGS += --prefix=$(prefix)/php5 +#CONFIGURE_ARGS += --libdir=$(abspath $(prefix)/php5/lib/$(MM_LIBDIR)) +#CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) +## build this static, php can not run without it. +## it is more efficient to have this built into the php binary +CONFIGURE_ARGS += --enable-simplexml +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --enable-xml +CONFIGURE_ARGS += --enable-intl +CONFIGURE_ARGS += --with-libxml-dir=$(prefix) +CONFIGURE_ARGS += --with-config-file-path=$(sysconfdir) +CONFIGURE_ARGS += --with-config-file-scan-dir=$(sysconfdir)/conf.d +CONFIGURE_ARGS += --enable-bcmath=shared +CONFIGURE_ARGS += --enable-calendar=shared +CONFIGURE_ARGS += --enable-ctype=shared +CONFIGURE_ARGS += --enable-dba=shared +CONFIGURE_ARGS += --enable-dom=shared +CONFIGURE_ARGS += --enable-exif=shared +CONFIGURE_ARGS += --enable-filter=shared +CONFIGURE_ARGS += --enable-ftp=shared +CONFIGURE_ARGS += --enable-gd-jis-conv +CONFIGURE_ARGS += --enable-gd-native-ttf +CONFIGURE_ARGS += --enable-hash=shared +CONFIGURE_ARGS += --enable-json=shared +CONFIGURE_ARGS += --enable-magic-quotes +CONFIGURE_ARGS += --enable-mbstring=shared +CONFIGURE_ARGS += --enable-pcntl=shared +CONFIGURE_ARGS += --enable-pdo=shared +CONFIGURE_ARGS += --enable-phar=shared +CONFIGURE_ARGS += --enable-posix=shared +CONFIGURE_ARGS += --enable-session=shared +CONFIGURE_ARGS += --enable-shmop=shared +CONFIGURE_ARGS += --enable-soap=shared +CONFIGURE_ARGS += --enable-sockets=shared +CONFIGURE_ARGS += --enable-sqlite-utf8 +CONFIGURE_ARGS += --enable-sqlite3=shared,$(prefix) +CONFIGURE_ARGS += --enable-sysvmsg=shared +CONFIGURE_ARGS += --enable-sysvsem=shared +CONFIGURE_ARGS += --enable-sysvshm=shared +CONFIGURE_ARGS += --enable-tokenizer=shared +CONFIGURE_ARGS += --enable-wddx=shared +CONFIGURE_ARGS += --enable-xmlreader=shared +CONFIGURE_ARGS += --enable-xmlwriter=shared +CONFIGURE_ARGS += --enable-zip=shared +CONFIGURE_ARGS += --with-bz2=shared,$(prefix) +CONFIGURE_ARGS += --with-curl=shared,$(prefix) +CONFIGURE_ARGS += --with-curlwrappers +CONFIGURE_ARGS += --with-db4=$(prefix)/bdb4 +CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin +CONFIGURE_ARGS += --with-freetype-dir=$(prefix) +CONFIGURE_ARGS += --with-gd=shared,$(prefix) +CONFIGURE_ARGS += --with-gdbm=$(prefix) +CONFIGURE_ARGS += --with-gettext=shared,$(prefix) +CONFIGURE_ARGS += --with-gmp=shared,$(prefix) +# CONFIGURE_ARGS += --with-ibm-db2=shared,/export/db2inst1/sqllib +CONFIGURE_ARGS += --with-iconv=shared,$(prefix) +CONFIGURE_ARGS += --with-imap-ssl=$(prefix) +CONFIGURE_ARGS += --with-imap=shared,$(prefix) +CONFIGURE_ARGS += --with-jpeg-dir=$(prefix) +CONFIGURE_ARGS += --with-kerberos=$(prefix) +CONFIGURE_ARGS += --with-ldap-sasl=$(prefix) +CONFIGURE_ARGS += --with-ldap=shared,$(prefix) +CONFIGURE_ARGS += --with-libedit=no +CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) +CONFIGURE_ARGS += --with-mcrypt=shared,$(prefix) +CONFIGURE_ARGS += --with-mhash=shared,$(prefix) +CONFIGURE_ARGS += --with-mm=$(prefix) +CONFIGURE_ARGS += --with-mssql=shared,$(prefix) +CONFIGURE_ARGS += --with-mysql=shared,$(prefix) +CONFIGURE_ARGS += --with-mysqli=shared,$(prefix)/bin/mysql_config +CONFIGURE_ARGS += --with-ndbm +CONFIGURE_ARGS += --with-openssl=shared,$(prefix) +CONFIGURE_ARGS += --with-pcre-dir=$(prefix) +CONFIGURE_ARGS += --with-pcre-regex +# not documented, but you can pass the path to mysql_config directly +# we need the 32-bit version, so we have to force this +CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/bin/mysql_config +CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix) +CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(bindir)/ +CONFIGURE_ARGS += --with-pdo-sqlite=shared,$(prefix) +CONFIGURE_ARGS += --with-pear=shared +CONFIGURE_ARGS += --with-pgsql=shared,$(bindir)/ +CONFIGURE_ARGS += --with-png-dir=$(prefix) +CONFIGURE_ARGS += --with-pspell=shared,$(prefix) +CONFIGURE_ARGS += --with-readline=shared,/opt/csw +CONFIGURE_ARGS += --with-snmp=shared,$(prefix) +CONFIGURE_ARGS += --with-sqlite=shared,$(prefix) +CONFIGURE_ARGS += --with-t1lib=$(prefix) +CONFIGURE_ARGS += --with-tidy=shared,$(prefix) +CONFIGURE_ARGS += --with-unixODBC=shared,$(prefix) +CONFIGURE_ARGS += --with-xmlrpc=shared +CONFIGURE_ARGS += --with-xpm-dir=$(prefix) +CONFIGURE_ARGS += --with-xsl=shared,$(prefix) +CONFIGURE_ARGS += --with-zlib-dir=$(prefix) +CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --enable-cli +# We don't have Tokyo Cabinet +CONFIGURE_ARGS += --without-tcadb + +CONFIGURE_ARGS-fpm += --enable-fpm +CONFIGURE_ARGS-ap24 += --with-apxs2=$(abspath $(prefix)/bin/$(MM_BINDIR))/apxs +CONFIGURE_ARGS-ap2 += --with-apxs2=$(prefix)/apache2/sbin/$(MM_LIBDIR)/apxs +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(SAPI)) + +TEST_TARGET = test + +# Disable Tests (report submitted to PHP QA) +# works, but takes a lot of time +SKIPTEST ?= 1 +#ENABLE_CHECK = 0 + +include gar/category.mk + +# they're using git now and ship a .gitignore that excludes aclocal.m4 +# that broke one of our patches so we'll nuke .gitignore before we patch +pre-patch-modulated: + @-(cd $(WORKSRC); rm .gitignore; git add -A; git commit -m 'adding files that were previously ignored' ) + @$(MAKECOOKIE) + +pre-configure-modulated: + (cd $(WORKSRC) && autoreconf) + @$(MAKECOOKIE) + +xxxxpre-configure-modulated: + @echo Munging c-client routine in configure. + @(cd $(WORKSRC); \ + perl -pi -e "s|c-client4 c-client|c-client.2007f|g" configure; \ + git add configure; git commit -m 'modify c-client finding routine') + @$(MAKECOOKIE) + +# this allows apxs to install the module. stupid, but i couldn't make +# the darn thing _not_ do try to add the httpd.conf lines, even with +# patching... +# pre-install-modulated: AP2SYSCONF=$(sysconfdir_ap2) +# pre-install-modulated: $(PI_SCRIPTS) +# @(mkdir -p $(DESTDIR)$(AP2SYSCONF); \ +# cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF) ) +# @echo "LoadModule foo_module libexec/mod_foo.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf +# @echo "LoadModule foo1_module libexec/mod_foo1.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf +# @echo "LoadModule foo2_module libexec/mod_foo2.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf +# @$(MAKECOOKIE) + +post-install: AP2SYSCONF=$(sysconfdir_$(SAPI))/$(MM_LIBDIR)/httpd.conf +post-install: AP2EXTCONF=$(sysconfdir_$(SAPI))/$(MM_LIBDIR)/extra +post-install: INIDEST=$(DESTDIR)$(sysconfdir)/$(MM_LIBDIR)/php.ini +post-install: + rm -f $(DESTDIR)$(AP2SYSCONF) + ginstall -d -m 0755 $(DESTDIR)$(AP2EXTCONF) + ginstall -m 0644 $(WORKDIR)/httpd-php5.conf $(DESTDIR)$(AP2EXTCONF) + ginstall -D -m 0644 $(WORKSRC)/php.ini-production $(INIDEST) + perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) + cat $(WORKDIR)/php.ini.patch | ed -s $(INIDEST) + ginstall -D -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(bindir)/phpext + 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/$(MEMORYMODEL) + ( cd $(DESTDIR)$(prefix)/bin/$(MEMORYMODEL); \ + for f in pear peardev pecl phar php php-config; do \ + ln -s $(if $(filter 64,$(MM_LIBDIR)),../../php5/bin/64/$$f,../php5/bin/$$f) $$f; \ + done ) + @$(MAKECOOKIE) + +#post-merge-all: +# @echo " ==> Fixing php.ini: adding loadable session.so ctype.so phar.so support" +# cat $(WORKDIR)/php.ini.patch | ed -s $(PKGROOT)/$(sysconfdir)/php.ini.CSW +# @$(MAKECOOKIE) + Deleted: csw/mgar/pkg/php7/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2016-08-25 10:05:54 UTC (rev 25900) +++ csw/mgar/pkg/php7/trunk/checksums 2018-04-13 10:13:47 UTC (rev 26404) @@ -1 +0,0 @@ -3ef6e3573698b9b444be88edd3b23494 php-5.6.24.tar.xz Copied: csw/mgar/pkg/php7/trunk/checksums (from rev 25971, csw/mgar/pkg/php5/branches/php-5.6.x/checksums) =================================================================== --- csw/mgar/pkg/php7/trunk/checksums (rev 0) +++ csw/mgar/pkg/php7/trunk/checksums 2018-04-13 10:13:47 UTC (rev 26404) @@ -0,0 +1 @@ +50afbbc745ad433b9f368c5885bd73bf php-5.6.35.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 13 13:57:29 2018 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Apr 2018 11:57:29 +0000 Subject: SF.net SVN: gar:[26405] csw/mgar/pkg/apache24/trunk Message-ID: <1523620649.330081.30194@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26405 http://sourceforge.net/p/gar/code/26405 Author: dmichelsen Date: 2018-04-13 11:57:28 +0000 (Fri, 13 Apr 2018) Log Message: ----------- apache24/trunk: Update to 2.4.33 Modified Paths: -------------- csw/mgar/pkg/apache24/trunk/Makefile csw/mgar/pkg/apache24/trunk/checksums Modified: csw/mgar/pkg/apache24/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache24/trunk/Makefile 2018-04-13 10:13:47 UTC (rev 26404) +++ csw/mgar/pkg/apache24/trunk/Makefile 2018-04-13 11:57:28 UTC (rev 26405) @@ -1,7 +1,7 @@ # $Id: Makefile 18185 2012-06-01 02:30:46Z bdwalton $ NAME = httpd -VERSION = 2.4.29 +VERSION = 2.4.33 GARTYPE = v2 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc @@ -51,6 +51,9 @@ RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibnghttp2-14 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibjansson4 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibbrotlienc1 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibcurl4 EXTRA_MERGE_SCRIPTS_isa-default64 += copy-apache-modules Modified: csw/mgar/pkg/apache24/trunk/checksums =================================================================== --- csw/mgar/pkg/apache24/trunk/checksums 2018-04-13 10:13:47 UTC (rev 26404) +++ csw/mgar/pkg/apache24/trunk/checksums 2018-04-13 11:57:28 UTC (rev 26405) @@ -1 +1 @@ -6380b0856658f07479fdcba9e20294a6 httpd-2.4.29.tar.gz +e983c251062872e5caf87372776c04c0 httpd-2.4.33.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 13 14:44:20 2018 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Apr 2018 12:44:20 +0000 Subject: SF.net SVN: gar:[26406] csw/mgar/pkg/php7/trunk Message-ID: <1523623460.187106.14637@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26406 http://sourceforge.net/p/gar/code/26406 Author: dmichelsen Date: 2018-04-13 12:44:18 +0000 (Fri, 13 Apr 2018) Log Message: ----------- php7/trunk: Update to version 7.2.4 and skip patch that no longer apply for now Modified Paths: -------------- csw/mgar/pkg/php7/trunk/Makefile csw/mgar/pkg/php7/trunk/checksums Modified: csw/mgar/pkg/php7/trunk/Makefile =================================================================== --- csw/mgar/pkg/php7/trunk/Makefile 2018-04-13 11:57:28 UTC (rev 26405) +++ csw/mgar/pkg/php7/trunk/Makefile 2018-04-13 12:44:18 UTC (rev 26406) @@ -1,5 +1,5 @@ NAME = php -VERSION = 5.6.35 +VERSION = 7.2.4 GARTYPE = v2 BUNDLE = php5 @@ -78,15 +78,15 @@ DISTFILES += map.solaris10 DISTFILES += php.ini.patch -PATCHFILES += 0001-Strip-usr-ucblib-references.patch -PATCHFILES += 0003-Do-not-activate-php5-module-during-package-build.patch +###PATCHFILES += 0001-Strip-usr-ucblib-references.patch +###PATCHFILES += 0003-Do-not-activate-php5-module-during-package-build.patch # TBD: Where specifically do these come from? PATCHFILES += 0001-Undef-disturbing-definition-of-SS-on-Solaris.patch -PATCHFILES += 0002-Undef-ES-on-Solaris.patch +###PATCHFILES += 0002-Undef-ES-on-Solaris.patch -PATCHFILES += 0004-Do-not-add-Wno-write-strings-unconditionally.patch -PATCHFILES += 0005-Remove-another-Wno.patch +###PATCHFILES += 0004-Do-not-add-Wno-write-strings-unconditionally.patch +###PATCHFILES += 0005-Remove-another-Wno.patch # our apache24 has threaded and prefork MPM, needs 'autoreconf' PATCHFILES += 0006-disable-zts-build Modified: csw/mgar/pkg/php7/trunk/checksums =================================================================== --- csw/mgar/pkg/php7/trunk/checksums 2018-04-13 11:57:28 UTC (rev 26405) +++ csw/mgar/pkg/php7/trunk/checksums 2018-04-13 12:44:18 UTC (rev 26406) @@ -1 +1 @@ -50afbbc745ad433b9f368c5885bd73bf php-5.6.35.tar.xz +8266120cf6500a96f1ba335d9ef1e01b php-7.2.4.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 16 13:50:39 2018 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Apr 2018 11:50:39 +0000 Subject: SF.net SVN: gar:[26407] csw/mgar/pkg/mutt/trunk Message-ID: <1523879439.681420.32193@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26407 http://sourceforge.net/p/gar/code/26407 Author: dmichelsen Date: 2018-04-16 11:50:36 +0000 (Mon, 16 Apr 2018) Log Message: ----------- mutt/trunk: Update to 1.9.5 Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile csw/mgar/pkg/mutt/trunk/checksums Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2018-04-13 12:44:18 UTC (rev 26406) +++ csw/mgar/pkg/mutt/trunk/Makefile 2018-04-16 11:50:36 UTC (rev 26407) @@ -1,5 +1,5 @@ NAME = mutt -VERSION = 1.9.3 +VERSION = 1.9.5 GARTYPE = v2 EXTRA_MODULATORS = SLANG Modified: csw/mgar/pkg/mutt/trunk/checksums =================================================================== --- csw/mgar/pkg/mutt/trunk/checksums 2018-04-13 12:44:18 UTC (rev 26406) +++ csw/mgar/pkg/mutt/trunk/checksums 2018-04-16 11:50:36 UTC (rev 26407) @@ -1 +1 @@ -2cfaabbf0c0ef74cff9af2a0a30de30d mutt-1.9.3.tar.gz +9694baaa9cbfb033334efb5f4d830ad4 mutt-1.9.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 20 16:31:46 2018 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Apr 2018 14:31:46 +0000 Subject: SF.net SVN: gar:[26408] csw/mgar/pkg/pidgin/trunk Message-ID: <1524234706.617388.17303@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26408 http://sourceforge.net/p/gar/code/26408 Author: dmichelsen Date: 2018-04-20 14:31:39 +0000 (Fri, 20 Apr 2018) Log Message: ----------- pidgin/trunk: Update to 2.13.0 Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2018-04-16 11:50:36 UTC (rev 26407) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2018-04-20 14:31:39 UTC (rev 26408) @@ -1,7 +1,7 @@ # $Id$ NAME = pidgin -VERSION = 2.10.12 +VERSION = 2.13.0 GARTYPE = v2 DESCRIPTION = Multi-protocol IM client @@ -41,6 +41,7 @@ CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH) EXTRA_CFLAGS = -xc99 -D_XPG6 -D__EXTENSIONS__ -D__unix__ +#EXTRA_LD_OPTIONS = -z nolazyload NCURSES_HEADERS = /opt/csw/include/ncursesw EXTRA_CONFIGURE_EXPORTS += CFLAGS NCURSES_HEADERS @@ -52,7 +53,7 @@ RUNTIME_DEP_PKGS_CSWpidgin += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibdbus-glib1-2 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgstreamer0-10-0 +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgstreamer1-0-0 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgtkspell0 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibatk1-0-0 @@ -65,10 +66,10 @@ RUNTIME_DEP_PKGS_CSWpidgin += CSWtk RUNTIME_DEP_PKGS_CSWpidgin += CSWdbus RUNTIME_DEP_PKGS_CSWpidgin += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWpidgin += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibncursesw6 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWpidgin += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibintl9 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibtcl8-5 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibtk8-5 @@ -75,18 +76,24 @@ RUNTIME_DEP_PKGS_CSWpidgin += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibpython2-7-1-0 -RUNTIME_DEP_PKGS_CSWpidgin += CSWlibpanelw5 +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibpanelw6 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilc1-1-2 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilcclient1-1-3 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgnutls28 + # Apparently needed for icons RUNTIME_DEP_PKGS_CSWpidgin += CSWgtk2 +CHECKPKG_OVERRIDES_CSWpidgin += surplus-dependency|CSWgtk2 ### # due to the ld bug ifeq ($(shell /usr/bin/uname -p),sparc) +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibpangoft2-1-0-0 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibpangocairo1-0-0 endif ### @@ -121,6 +128,7 @@ PATCHFILES += patch-pidgin-plugins-perl-common-Makefile.PL.in PATCHFILES += patch-libpurple-plugins-perl-common-Makefile.PL.in PATCHFILES += 0004-irc-with-sasl.patch +PATCHFILES += 0005_AF_UNIX_not_LOCAL.patch CHECKPKG_OVERRIDES_CSWpidgin += file-with-bad-content|/usr/local|root/opt/csw/lib/pidgin/musicmessaging.so CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libgnt.so @@ -128,10 +136,9 @@ CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libpurple.so CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/purple-2/libjabber.so CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/purple-2/liboscar.so -CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/purple-2/libymsg.so CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libgnt.so.0.8.10|soname=libgnt.so.0|pkgname=CSWpidgin|expected=CSWlibgnt0 -CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpurple-client.so.0.10.12|soname=libpurple-client.so.0|pkgname=CSWpidgin|expected=CSWlibpurple-client0 -CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpurple.so.0.10.12|soname=libpurple.so.0|pkgname=CSWpidgin|expected=CSWlibpurple0 +CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpurple-client.so.0.13.0|soname=libpurple-client.so.0|pkgname=CSWpidgin|expected=CSWlibpurple-client0 +CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpurple.so.0.13.0|soname=libpurple.so.0|pkgname=CSWpidgin|expected=CSWlibpurple0 CHECKPKG_OVERRIDES_CSWpidgin += surplus-dependency|CSWaspell CHECKPKG_OVERRIDES_CSWpidgin += surplus-dependency|CSWtcl @@ -138,7 +145,6 @@ CHECKPKG_OVERRIDES_CSWpidgin += surplus-dependency|CSWtk CHECKPKG_OVERRIDES_CSWpidgin += surplus-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpidgin += surplus-dependency|CSWdbus -CHECKPKG_OVERRIDES_CSWpidgin += surplus-dependency|CSWgtk2 include gar/category.mk Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2018-04-16 11:50:36 UTC (rev 26407) +++ csw/mgar/pkg/pidgin/trunk/checksums 2018-04-20 14:31:39 UTC (rev 26408) @@ -1 +1 @@ -14e0f5cfb2ed065e4dc80391a806ac76 pidgin-2.10.12.tar.bz2 +423403494fe1951e47cc75231f743bb0 pidgin-2.13.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 23 15:30:54 2018 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 Apr 2018 13:30:54 +0000 Subject: SF.net SVN: gar:[26409] csw/mgar/pkg/libsigsegv/trunk Message-ID: <1524490254.907256.26738@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26409 http://sourceforge.net/p/gar/code/26409 Author: dmichelsen Date: 2018-04-23 13:30:48 +0000 (Mon, 23 Apr 2018) Log Message: ----------- libsigsegv/trunk: Update to 2.12 Modified Paths: -------------- csw/mgar/pkg/libsigsegv/trunk/Makefile csw/mgar/pkg/libsigsegv/trunk/checksums Modified: csw/mgar/pkg/libsigsegv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigsegv/trunk/Makefile 2018-04-20 14:31:39 UTC (rev 26408) +++ csw/mgar/pkg/libsigsegv/trunk/Makefile 2018-04-23 13:30:48 UTC (rev 26409) @@ -1,5 +1,5 @@ NAME = libsigsegv -VERSION = 2.11 +VERSION = 2.12 GARTYPE = v2 DESCRIPTION = A library for catching and handling segmentation faults Modified: csw/mgar/pkg/libsigsegv/trunk/checksums =================================================================== --- csw/mgar/pkg/libsigsegv/trunk/checksums 2018-04-20 14:31:39 UTC (rev 26408) +++ csw/mgar/pkg/libsigsegv/trunk/checksums 2018-04-23 13:30:48 UTC (rev 26409) @@ -1 +1 @@ -a812d9481f6097f705599b218eea349f libsigsegv-2.11.tar.gz +58a6db48f79f5c735a9dce3a37c52779 libsigsegv-2.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 26 11:54:20 2018 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Apr 2018 09:54:20 +0000 Subject: SF.net SVN: gar:[26410] csw/mgar/pkg/liblognorm/trunk Message-ID: <1524736460.399034.15327@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26410 http://sourceforge.net/p/gar/code/26410 Author: dmichelsen Date: 2018-04-26 09:54:18 +0000 (Thu, 26 Apr 2018) Log Message: ----------- liblognorm/trunk: Update to 2.0.5 Modified Paths: -------------- csw/mgar/pkg/liblognorm/trunk/Makefile csw/mgar/pkg/liblognorm/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/liblognorm/trunk/files/0001-Use-substitute-for-strndup.patch Modified: csw/mgar/pkg/liblognorm/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblognorm/trunk/Makefile 2018-04-23 13:30:48 UTC (rev 26409) +++ csw/mgar/pkg/liblognorm/trunk/Makefile 2018-04-26 09:54:18 UTC (rev 26410) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = liblognorm -VERSION = 1.1.1 +VERSION = 2.0.5 GARTYPE = v2 DESCRIPTION = Liblognorm shall help to make sense out of syslog data @@ -10,10 +10,6 @@ MASTER_SITES = http://www.liblognorm.com/files/download/ DISTFILES += $(DISTNAME).tar.gz -# Use patch until this is fixed: -# http://bugzilla.adiscon.com/show_bug.cgi?id=539 -PATCHFILES += 0001-Use-substitute-for-strndup.patch - VENDOR_URL = http://www.liblognorm.com/ BUILD_DEP_PKGS += CSWpy-sphinx @@ -20,17 +16,17 @@ BUILD_DEP_PKGS += CSWlibjson-c-dev BUILD_DEP_PKGS += CSWlibestr-dev -PACKAGES += CSWliblognorm2 -SPKG_DESC_CSWliblognorm2 = Liblognorm shall help to make sense out of syslog data, liblognorm.so.2 -PKGFILES_CSWliblognorm2 += $(call pkgfiles_lib,liblognorm.so.2) -RUNTIME_DEP_PKGS_CSWliblognorm2 += CSWlibjson-c3 -RUNTIME_DEP_PKGS_CSWliblognorm2 += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSWliblognorm2 += CSWlibestr0 +PACKAGES += CSWliblognorm5 +SPKG_DESC_CSWliblognorm5 = Liblognorm shall help to make sense out of syslog data, liblognorm.so.5 +PKGFILES_CSWliblognorm5 += $(call pkgfiles_lib,liblognorm.so.5) +RUNTIME_DEP_PKGS_CSWliblognorm5 += CSWlibfastjson4 +RUNTIME_DEP_PKGS_CSWliblognorm5 += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWliblognorm5 += CSWlibestr0 PACKAGES += CSWliblognorm-dev SPKG_DESC_CSWliblognorm-dev = Deevelopment files for liblognorm -RUNTIME_DEP_PKGS_CSWliblognorm-dev += CSWliblognorm2 -RUNTIME_DEP_PKGS_CSWliblognorm-dev += CSWlibjson-c3 +RUNTIME_DEP_PKGS_CSWliblognorm-dev += CSWliblognorm5 +RUNTIME_DEP_PKGS_CSWliblognorm-dev += CSWlibfastjson4 RUNTIME_DEP_PKGS_CSWliblognorm-dev += CSWlibestr0 BUILD64 = 1 @@ -39,7 +35,17 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --enable-regexp CONFIGURE_ARGS += --enable-docs +CONFIGURE_ARGS += --disable-Werror +# We need asprintf from libc SUNW_1.22.7 +LINKER_MAPS = +CHECKPKG_OVERRIDES_CSWliblognorm5 += forbidden-version-interface-dependencies|/opt/csw/lib/amd64/liblognorm.so.5.1.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWliblognorm5 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/liblognorm.so.5.1.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWliblognorm5 += forbidden-version-interface-dependencies|/opt/csw/lib/liblognorm.so.5.1.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 + +# We need 'grep -F' +TEST_ENV_PATH = /opt/csw/gnu:$(PATH) + # We GNU find as 'find' INSTALL_ENV_PATH = /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/liblognorm/trunk/checksums =================================================================== --- csw/mgar/pkg/liblognorm/trunk/checksums 2018-04-23 13:30:48 UTC (rev 26409) +++ csw/mgar/pkg/liblognorm/trunk/checksums 2018-04-26 09:54:18 UTC (rev 26410) @@ -1 +1 @@ -a5a452be3d0f187cdd589236d5e7e936 liblognorm-1.1.1.tar.gz +74dc898c65a9918139b898a44a2735e8 liblognorm-2.0.5.tar.gz Deleted: csw/mgar/pkg/liblognorm/trunk/files/0001-Use-substitute-for-strndup.patch =================================================================== --- csw/mgar/pkg/liblognorm/trunk/files/0001-Use-substitute-for-strndup.patch 2018-04-23 13:30:48 UTC (rev 26409) +++ csw/mgar/pkg/liblognorm/trunk/files/0001-Use-substitute-for-strndup.patch 2018-04-26 09:54:18 UTC (rev 26410) @@ -1,41 +0,0 @@ -From 9c393161ed8256970b56aac6487bc73d13433565 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 1 Jul 2015 14:10:08 +0200 -Subject: [PATCH] Use substitute for strndup - ---- - src/liblognorm.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/src/liblognorm.c b/src/liblognorm.c -index a530b99..ea73f63 100644 ---- a/src/liblognorm.c -+++ b/src/liblognorm.c -@@ -42,6 +42,24 @@ - } - - char * -+strndup (const char *s, size_t n) -+{ -+ char *result; -+ size_t len = strlen (s); -+ -+ if (n < len) -+ len = n; -+ -+ result = (char *) malloc (len + 1); -+ if (!result) -+ return 0; -+ -+ result[len] = '\0'; -+ return (char *) memcpy (result, s, len); -+} -+ -+ -+char * - ln_version(void) - { - return VERSION; --- -2.4.0 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 26 14:40:14 2018 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Apr 2018 12:40:14 +0000 Subject: SF.net SVN: gar:[26411] csw/mgar/pkg/rsyslog/trunk Message-ID: <1524746414.193907.11096@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26411 http://sourceforge.net/p/gar/code/26411 Author: dmichelsen Date: 2018-04-26 12:39:55 +0000 (Thu, 26 Apr 2018) Log Message: ----------- rsyslog/trunk: Update to 8.34.0 Modified Paths: -------------- csw/mgar/pkg/rsyslog/trunk/Makefile csw/mgar/pkg/rsyslog/trunk/checksums Modified: csw/mgar/pkg/rsyslog/trunk/Makefile =================================================================== --- csw/mgar/pkg/rsyslog/trunk/Makefile 2018-04-26 09:54:18 UTC (rev 26410) +++ csw/mgar/pkg/rsyslog/trunk/Makefile 2018-04-26 12:39:55 UTC (rev 26411) @@ -1,5 +1,5 @@ NAME = rsyslog -VERSION = 8.32.0 +VERSION = 8.34.0 GARTYPE = v2 DESCRIPTION = Enhanced multi-threaded syslogd with a focus on security and reliability @@ -30,7 +30,7 @@ RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibgcrypt20 RUNTIME_DEP_PKGS_CSWrsyslog-sparc += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibfastjson4 -# RUNTIME_DEP_PKGS_CSWrsyslog += CSWliblognorm2 +RUNTIME_DEP_PKGS_CSWrsyslog += CSWliblognorm5 RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibdbi1 RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibssl1-0-0 @@ -72,8 +72,7 @@ CONFIGURE_ARGS += --enable-elasticsearch CONFIGURE_ARGS += --enable-gnutls CONFIGURE_ARGS += --enable-mail -# Disable for now until liblognorm can get updated -# CONFIGURE_ARGS += --enable-mmnormalize +CONFIGURE_ARGS += --enable-mmnormalize CONFIGURE_ARGS += --enable-mmjsonparse CONFIGURE_ARGS += --enable-mmaudit CONFIGURE_ARGS += --enable-mmanon Modified: csw/mgar/pkg/rsyslog/trunk/checksums =================================================================== --- csw/mgar/pkg/rsyslog/trunk/checksums 2018-04-26 09:54:18 UTC (rev 26410) +++ csw/mgar/pkg/rsyslog/trunk/checksums 2018-04-26 12:39:55 UTC (rev 26411) @@ -1 +1 @@ -0811aad3186bcae3b2dcd92063d9eb1d rsyslog-8.32.0.tar.gz +19a21c83d77f7df4f4f3c4e486c00659 rsyslog-8.34.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 26 14:42:12 2018 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Apr 2018 12:42:12 +0000 Subject: SF.net SVN: gar:[26412] csw/mgar/pkg/jdk8/trunk Message-ID: <1524746532.403966.11831@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26412 http://sourceforge.net/p/gar/code/26412 Author: dmichelsen Date: 2018-04-26 12:41:53 +0000 (Thu, 26 Apr 2018) Log Message: ----------- jdk8/trunk: Update to 8u171 Modified Paths: -------------- csw/mgar/pkg/jdk8/trunk/Makefile csw/mgar/pkg/jdk8/trunk/checksums Modified: csw/mgar/pkg/jdk8/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk8/trunk/Makefile 2018-04-26 12:39:55 UTC (rev 26411) +++ csw/mgar/pkg/jdk8/trunk/Makefile 2018-04-26 12:41:53 UTC (rev 26412) @@ -1,5 +1,5 @@ NAME = jre8 -RELEASE = 161 +RELEASE = 171 SPKG_VERSION = 1.8.0_$(RELEASE) VERSION = 8u$(RELEASE) GARTYPE = v2 Modified: csw/mgar/pkg/jdk8/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk8/trunk/checksums 2018-04-26 12:39:55 UTC (rev 26411) +++ csw/mgar/pkg/jdk8/trunk/checksums 2018-04-26 12:41:53 UTC (rev 26412) @@ -1,2 +1,2 @@ -aac4d085d3ff48420e2990cb104a44a3 jdk-8u161-solaris-sparcv9.tar.gz -369c273116183f6dd069c6a3ff8a73a0 jdk-8u161-solaris-x64.tar.gz +d878a4c51424a5af0652324f07dc5824 jdk-8u171-solaris-sparcv9.tar.gz +2bd83713f53566e0234fa3979eb2ccab jdk-8u171-solaris-x64.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Sun Apr 29 00:56:18 2018 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Sat, 28 Apr 2018 22:56:18 +0000 Subject: SF.net SVN: gar:[26413] csw/mgar/pkg/gnustep-back/trunk Message-ID: <1524956178.527311.24496@sfp-scm-5.v30.lw.sourceforge.com> Revision: 26413 http://sourceforge.net/p/gar/code/26413 Author: rmottola Date: 2018-04-28 22:56:11 +0000 (Sat, 28 Apr 2018) Log Message: ----------- gnustep-back/trunk: 0.26 update Modified Paths: -------------- csw/mgar/pkg/gnustep-back/trunk/Makefile csw/mgar/pkg/gnustep-back/trunk/checksums Modified: csw/mgar/pkg/gnustep-back/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-back/trunk/Makefile 2018-04-26 12:41:53 UTC (rev 26412) +++ csw/mgar/pkg/gnustep-back/trunk/Makefile 2018-04-28 22:56:11 UTC (rev 26413) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = gnustep-back -VERSION = 0.25.1 +VERSION = 0.26.0 GARTYPE = v2 DESCRIPTION = GNUstep-core back @@ -56,7 +56,7 @@ #this is by bundle design -CHECKPKG_OVERRIDES_CSWgnustep-back += shared-library-missing-dot-so|file=opt/csw/GNUstep/System/Library/Bundles/libgnustep-back-025.bundle/libgnustep-back-025 +CHECKPKG_OVERRIDES_CSWgnustep-back += shared-library-missing-dot-so|file=opt/csw/GNUstep/System/Library/Bundles/libgnustep-back-026.bundle/libgnustep-back-026 #we do not care about placement CHECKPKG_OVERRIDES_CSWgnustep-back += binary-architecture-does-not-match-placement Modified: csw/mgar/pkg/gnustep-back/trunk/checksums =================================================================== --- csw/mgar/pkg/gnustep-back/trunk/checksums 2018-04-26 12:41:53 UTC (rev 26412) +++ csw/mgar/pkg/gnustep-back/trunk/checksums 2018-04-28 22:56:11 UTC (rev 26413) @@ -1 +1 @@ -310880099a4d4c99be13a25c151b53e7 gnustep-back-0.25.1.tar.gz +6758fa83bf5ddd70fbe4e131d059a642 gnustep-back-0.26.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Sun Apr 29 01:10:00 2018 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Sat, 28 Apr 2018 23:10:00 +0000 Subject: SF.net SVN: gar:[26414] csw/mgar/pkg/gs_performance/trunk/Makefile Message-ID: <1524957001.108594.27627@sfp-scm-5.v30.lw.sourceforge.com> Revision: 26414 http://sourceforge.net/p/gar/code/26414 Author: rmottola Date: 2018-04-28 23:09:58 +0000 (Sat, 28 Apr 2018) Log Message: ----------- gs_performance/trunk: fix receipe Modified Paths: -------------- csw/mgar/pkg/gs_performance/trunk/Makefile Modified: csw/mgar/pkg/gs_performance/trunk/Makefile =================================================================== --- csw/mgar/pkg/gs_performance/trunk/Makefile 2018-04-28 22:56:11 UTC (rev 26413) +++ csw/mgar/pkg/gs_performance/trunk/Makefile 2018-04-28 23:09:58 UTC (rev 26414) @@ -1,4 +1,4 @@ - $Id$ +# $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = Performance This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 29 21:16:12 2018 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 29 Apr 2018 19:16:12 +0000 Subject: SF.net SVN: gar:[26415] csw/mgar/pkg/gs_performance/trunk/Makefile Message-ID: <1525029372.305454.27074@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26415 http://sourceforge.net/p/gar/code/26415 Author: dmichelsen Date: 2018-04-29 19:16:01 +0000 (Sun, 29 Apr 2018) Log Message: ----------- gs_performance/trunk: Some cleanup, nothing serious changed Modified Paths: -------------- csw/mgar/pkg/gs_performance/trunk/Makefile Modified: csw/mgar/pkg/gs_performance/trunk/Makefile =================================================================== --- csw/mgar/pkg/gs_performance/trunk/Makefile 2018-04-28 23:09:58 UTC (rev 26414) +++ csw/mgar/pkg/gs_performance/trunk/Makefile 2018-04-29 19:16:01 UTC (rev 26415) @@ -5,9 +5,6 @@ VERSION = 0.5.0 GARTYPE = v2 -PACKAGES += CSWperformance - - DESCRIPTION = GNUstep data utility library define BLURB GNUstep library for writing high performance Data code @@ -16,10 +13,13 @@ MASTER_SITES += ftp://ftp.gnustep.org/pub/gnustep/libs/ DISTFILES = $(DISTNAME).tar.gz +#where can we build? +PACKAGING_PLATFORMS += solaris9-i386 +PACKAGING_PLATFORMS += solaris9-sparc +PACKAGING_PLATFORMS += solaris10-i386 +PACKAGING_PLATFORMS += solaris10-sparc - -BUILD_DEP_PKGS += CSWgmake - +PACKAGES += CSWperformance RUNTIME_DEP_PKGS_CSWperformance += CSWgnustep-make RUNTIME_DEP_PKGS_CSWperformance += CSWgnustep-base RUNTIME_DEP_PKGS_CSWperformance += CSWlibgcc-s1 @@ -33,17 +33,9 @@ CHECKPKG_OVERRIDES_CSWperformance += binary-architecture-does-not-match-placement CHECKPKG_OVERRIDES_CSWperformance += no-direct-binding - -#where can we build? -PACKAGING_PLATFORMS += solaris9-i386 -PACKAGING_PLATFORMS += solaris9-sparc -PACKAGING_PLATFORMS += solaris10-i386 -PACKAGING_PLATFORMS += solaris10-sparc - #we absolutely need GCC for Objective-C support. The only alternative in the future would be clang GARCOMPILER = GNU - # now special targets for build and install so that we can source # GNUstep.sh before # configure is skipped @@ -52,8 +44,7 @@ INSTALL_SCRIPTS = sourcegs # Disable test scripts for now -TEST_SCRIPTS = -SKIPTEST = ?1 +SKIPTEST ?= 1 include gar/category.mk @@ -64,7 +55,3 @@ install-sourcegs: $(INSTALL_ENV) &&. $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && $(MAKE) install DESTDIR=$(DESTDIR) @$(MAKECOOKIE) - -test-none : - @$(MAKECOOKIE) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Mon Apr 30 22:47:47 2018 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Mon, 30 Apr 2018 20:47:47 +0000 Subject: SF.net SVN: gar:[26416] csw/mgar/pkg/gs_WebServices/trunk/Makefile Message-ID: <1525121267.786413.11511@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26416 http://sourceforge.net/p/gar/code/26416 Author: rmottola Date: 2018-04-30 20:47:01 +0000 (Mon, 30 Apr 2018) Log Message: ----------- gs_WebServices/trunk: cleanup Modified Paths: -------------- csw/mgar/pkg/gs_WebServices/trunk/Makefile Modified: csw/mgar/pkg/gs_WebServices/trunk/Makefile =================================================================== --- csw/mgar/pkg/gs_WebServices/trunk/Makefile 2018-04-29 19:16:01 UTC (rev 26415) +++ csw/mgar/pkg/gs_WebServices/trunk/Makefile 2018-04-30 20:47:01 UTC (rev 26416) @@ -15,7 +15,11 @@ MASTER_SITES = ftp://ftp.gnustep.org/pub/gnustep/libs/ DISTFILES = $(DISTNAME).tar.gz -BUILD_DEP_PKGS += CSWgmake +#where can we build? +PACKAGING_PLATFORMS += solaris9-i386 +PACKAGING_PLATFORMS += solaris9-sparc +PACKAGING_PLATFORMS += solaris10-i386 +PACKAGING_PLATFORMS += solaris10-sparc RUNTIME_DEP_PKGS_CSWgnustep-webservices += CSWgnustep-make RUNTIME_DEP_PKGS_CSWgnustep-webservices += CSWgnustep-base @@ -48,7 +52,7 @@ # Disable test scripts for now TEST_SCRIPTS = -SKIPTEST = ?1 +SKIPTEST ?= 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.