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

[dmichelsen at users.sourceforge.net]

Revision: 25643
          http://sourceforge.net/p/gar/code/25643
Author:   dmichelsen
Date:     2016-04-04 16:25:58 +0000 (Mon, 04 Apr 2016)
Log Message:
-----------
php5/branches/php-5.6.x: Update to 5.6.20, fix preservation of config files, update to ncurses 6.0

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

Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile	2016-04-04 09:41:13 UTC (rev 25642)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile	2016-04-04 16:25:58 UTC (rev 25643)
@@ -1,5 +1,6 @@
 NAME = php
 VERSION = 5.6.19
+VERSION = 5.6.20
 GARTYPE = v2
 
 BUNDLE = php5
@@ -92,9 +93,8 @@
 
 PRESERVECONF += $(sysconfdir)/php.ini
 PRESERVECONF += $(sysconfdir)/pear.conf
-PRESERVECONF-ap2 += $(sysconfdir_ap2)/extra/httpd-php5.conf
-PRESERVECONF-ap24 += $(sysconfdir_ap24)/extra/httpd-php5.conf
-PRESERVECONF += $(PRESERVECONF-$(SAPI))
+PRESERVECONF += $(sysconfdir_ap2)/extra/httpd-php5.conf
+PRESERVECONF += $(sysconfdir_ap24)/extra/httpd-php5.conf
 
 define php5_subpackage
 PACKAGES += CSWphp5-$(subst _,-,$(1))
@@ -255,7 +255,7 @@
 $(eval $(call php5_subpackage,pgsql,CSWlibpq5))
 $(eval $(call php5_subpackage,posix,))
 $(eval $(call php5_subpackage,pspell,CSWlibaspell15))
-RUNTIME_DEP_PKGS_CSWphp5-readline_sparc += CSWlibncurses5
+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))

Modified: csw/mgar/pkg/php5/branches/php-5.6.x/checksums
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/checksums	2016-04-04 09:41:13 UTC (rev 25642)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/checksums	2016-04-04 16:25:58 UTC (rev 25643)
@@ -1 +1 @@
-aab960cc1b2bfbeb00d030a9d42b38bd  php-5.6.19.tar.xz
+e81f3993997acafeac2ddd2c8bab7153  php-5.6.20.tar.xz

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