SF.net SVN: gar:[25329] csw/mgar/pkg/php5/branches/php-5.6.x
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Tue Oct 27 11:56:25 CET 2015
Revision: 25329
http://sourceforge.net/p/gar/code/25329
Author: cgrzemba
Date: 2015-10-27 10:56:25 +0000 (Tue, 27 Oct 2015)
Log Message:
-----------
php5/branches/php-5.6.x: fix apache sysconf path, fix apache module package name
Modified Paths:
--------------
csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
Added Paths:
-----------
csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.cswreleasenotes
csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall
csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove
Removed Paths:
-------------
csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.cswreleasenotes
csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall
csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-10-27 10:31:05 UTC (rev 25328)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-10-27 10:56:25 UTC (rev 25329)
@@ -78,7 +78,7 @@
BUILD_DEP_PKGS += CSWlibaspell-dev
PRESERVECONF = $(sysconfdir)/php.ini $(sysconfdir)/pear.conf
-PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-php5.conf
+PRESERVECONF += $(sysconfdir_ap2)/extra/httpd-php5.conf
MIGRATE_FILES_CSWphp5 = "php.ini"
MIGRATE_SOURCE_DIR_CSWphp5 = /opt/csw/php5/lib
MIGRATE_DEST_DIR = $(sysconfdir)
@@ -283,6 +283,7 @@
#EXTRA_CPPFLAGS += -D_RWSTD_NO_NEW_HEADER
sysconfdir = /etc$(prefix)/php5
+sysconfdir_ap2 = /etc$(prefix)/apache2
CONFIGURE_ARGS += --prefix=$(prefix)/php5
CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)
@@ -412,7 +413,7 @@
# 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)/apache2
+# pre-install-modulated: AP2SYSCONF=$(sysconfdir_ap2)
# pre-install-modulated: $(PI_SCRIPTS)
# @(mkdir -p $(DESTDIR)$(AP2SYSCONF); \
# cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF) )
@@ -421,8 +422,8 @@
# @echo "LoadModule foo2_module libexec/mod_foo2.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf
# @$(MAKECOOKIE)
-post-install-modulated: AP2SYSCONF=$(sysconfdir)/apache2/httpd.conf
-post-install-modulated: AP2EXTCONF=$(sysconfdir)/apache2/extra
+post-install-modulated: AP2SYSCONF=$(sysconfdir_ap2)/httpd.conf
+post-install-modulated: AP2EXTCONF=$(sysconfdir_ap2)/extra
post-install-modulated: INIDEST=$(DESTDIR)/etc$(prefix)/php5/php.ini
post-install-modulated:
@rm -f $(DESTDIR)$(AP2SYSCONF)
Deleted: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.cswreleasenotes
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.cswreleasenotes 2015-10-27 10:31:05 UTC (rev 25328)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.cswreleasenotes 2015-10-27 10:56:25 UTC (rev 25329)
@@ -1,2 +0,0 @@
-/usr/local references:
- libexec/libphp5.so -> embeds 'magic' filetype info in the binary
Deleted: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall 2015-10-27 10:31:05 UTC (rev 25328)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall 2015-10-27 10:56:25 UTC (rev 25329)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/etc/opt/csw
-AP2_CONFIG=$CSW_PREFIX/apache2/httpd.conf
-
-# Configure mod_php5 in httpd.conf
-if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ]
-then
- echo "Existing mod_php5 configuration detected"
-elif [ -n "`egrep '#Include extra/httpd-php5.conf' $AP2_CONFIG`" ]; then
- echo "Re-enabling existing config"
- perl -i -plne 's,^#(Include extra/httpd-php5.conf),$1,' $AP2_CONFIG
-else
- echo "Adding Include for extra/http-php5.conf to httpd.conf"
- cat << END >> $AP2_CONFIG
-
-Include extra/httpd-php5.conf
-END
-fi
-
-# Finito
-cat <<END
-
-NOTICE: mod_php5 is enabled in httpd.conf but the server was not restarted.
-Please examine your php5 configuration and restart apache.
-
-END
-
-exit 0
Deleted: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove 2015-10-27 10:31:05 UTC (rev 25328)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove 2015-10-27 10:56:25 UTC (rev 25329)
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/etc/opt/csw
-AP2_CONFIG=$CSW_PREFIX/apache2/httpd.conf
-
-echo "Disabling httpd-php5.conf in httpd.conf"
-perl -i -plne 's,(?<!#)(Include extra/httpd-php5.conf),#$1,' $AP2_CONFIG
-
-cat <<END
-
-NOTICE: mod_php5 is disabled in httpd.conf but the server was not restarted.
-Please check your configuration and restart apache.
-
-END
-
-exit 0
Added: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.cswreleasenotes
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.cswreleasenotes (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.cswreleasenotes 2015-10-27 10:56:25 UTC (rev 25329)
@@ -0,0 +1,2 @@
+/usr/local references:
+ libexec/libphp5.so -> embeds 'magic' filetype info in the binary
Added: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall 2015-10-27 10:56:25 UTC (rev 25329)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/etc/opt/csw
+AP2_CONFIG=$CSW_PREFIX/apache2/httpd.conf
+
+# Configure mod_php5 in httpd.conf
+if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ]
+then
+ echo "Existing mod_php5 configuration detected"
+elif [ -n "`egrep '#Include extra/httpd-php5.conf' $AP2_CONFIG`" ]; then
+ echo "Re-enabling existing config"
+ perl -i -plne 's,^#(Include extra/httpd-php5.conf),$1,' $AP2_CONFIG
+else
+ echo "Adding Include for extra/http-php5.conf to httpd.conf"
+ cat << END >> $AP2_CONFIG
+
+Include extra/httpd-php5.conf
+END
+fi
+
+# Finito
+cat <<END
+
+NOTICE: mod_php5 is enabled in httpd.conf but the server was not restarted.
+Please examine your php5 configuration and restart apache.
+
+END
+
+exit 0
Added: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove (rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove 2015-10-27 10:56:25 UTC (rev 25329)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/etc/opt/csw
+AP2_CONFIG=$CSW_PREFIX/apache2/httpd.conf
+
+echo "Disabling httpd-php5.conf in httpd.conf"
+perl -i -plne 's,(?<!#)(Include extra/httpd-php5.conf),#$1,' $AP2_CONFIG
+
+cat <<END
+
+NOTICE: mod_php5 is disabled in httpd.conf but the server was not restarted.
+Please check your configuration and restart apache.
+
+END
+
+exit 0
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