svn commit: r330741 - in head/lang: php5 php5/files php55 php55/files

[Alex Dupre]

Author: ale
Date: Fri Oct 18 12:37:45 2013
New Revision: 330741
URL: http://svnweb.freebsd.org/changeset/ports/330741

Log:
  Fix installation of mod_php.

Added:
  head/lang/php5/files/patch-sapi_apache2filter_config.m4   (contents, props changed)
  head/lang/php5/files/patch-sapi_apache2handler_config.m4   (contents, props changed)
  head/lang/php55/files/patch-sapi_apache2filter_config.m4   (contents, props changed)
  head/lang/php55/files/patch-sapi_apache2handler_config.m4   (contents, props changed)
Modified:
  head/lang/php5/Makefile
  head/lang/php5/pkg-plist
  head/lang/php55/Makefile

Modified: head/lang/php5/Makefile
==============================================================================
--- head/lang/php5/Makefile	Fri Oct 18 12:00:08 2013	(r330740)
+++ head/lang/php5/Makefile	Fri Oct 18 12:37:45 2013	(r330741)
@@ -101,7 +101,6 @@ IGNORE=		cannot be built with multiple S
 .endif
 
 .if ${PORT_OPTIONS:MAPACHE}
-BROKEN=		doesn't install in STAGEDIR: working on a fix
 PHP_SAPI+=	mod
 USE_APACHE=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"

Added: head/lang/php5/files/patch-sapi_apache2filter_config.m4
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/php5/files/patch-sapi_apache2filter_config.m4	Fri Oct 18 12:37:45 2013	(r330741)
@@ -0,0 +1,11 @@
+--- sapi/apache2filter/config.m4.orig	2013-10-18 12:17:14.622544934 +0000
++++ sapi/apache2filter/config.m4	2013-10-18 12:22:13.032234760 +0000
+@@ -68,7 +68,7 @@
+   fi
+ 
+   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+-  if test -z `$APXS -q SYSCONFDIR`; then
++  if true; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                        -i -n php5"

Added: head/lang/php5/files/patch-sapi_apache2handler_config.m4
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/php5/files/patch-sapi_apache2handler_config.m4	Fri Oct 18 12:37:45 2013	(r330741)
@@ -0,0 +1,11 @@
+--- sapi/apache2handler/config.m4.orig	2013-10-18 12:22:26.576545216 +0000
++++ sapi/apache2handler/config.m4	2013-10-18 12:23:00.903131412 +0000
+@@ -67,7 +67,7 @@
+   fi
+ 
+   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+-  if test -z `$APXS -q SYSCONFDIR`; then
++  if true; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                        -i -n php5"

Modified: head/lang/php5/pkg-plist
==============================================================================
--- head/lang/php5/pkg-plist	Fri Oct 18 12:00:08 2013	(r330740)
+++ head/lang/php5/pkg-plist	Fri Oct 18 12:37:45 2013	(r330741)
@@ -239,7 +239,9 @@ lib/php/build/shtool
 %%APACHE%%@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
 %%APACHE%%@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f
 %%CGI%%man/man1/php-cgi.1.gz
+man/man1/php-config.1.gz
 %%CLI%%man/man1/php.1.gz
+man/man1/phpize.1.gz
 %%FPM%%man/man8/php-fpm.8.gz
 %%FPM%%share/php/fpm/status.html
 @dirrm include/php/TSRM

Modified: head/lang/php55/Makefile
==============================================================================
--- head/lang/php55/Makefile	Fri Oct 18 12:00:08 2013	(r330740)
+++ head/lang/php55/Makefile	Fri Oct 18 12:37:45 2013	(r330741)
@@ -101,7 +101,6 @@ IGNORE=		cannot be built with multiple S
 .endif
 
 .if ${PORT_OPTIONS:MAPACHE}
-BROKEN=		doesn't install in STAGEDIR: working on a fix
 PHP_SAPI+=	mod
 USE_APACHE=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"

Added: head/lang/php55/files/patch-sapi_apache2filter_config.m4
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/php55/files/patch-sapi_apache2filter_config.m4	Fri Oct 18 12:37:45 2013	(r330741)
@@ -0,0 +1,11 @@
+--- sapi/apache2filter/config.m4.orig	2013-10-18 12:17:14.622544934 +0000
++++ sapi/apache2filter/config.m4	2013-10-18 12:22:13.032234760 +0000
+@@ -68,7 +68,7 @@
+   fi
+ 
+   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+-  if test -z `$APXS -q SYSCONFDIR`; then
++  if true; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                        -i -n php5"

Added: head/lang/php55/files/patch-sapi_apache2handler_config.m4
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/php55/files/patch-sapi_apache2handler_config.m4	Fri Oct 18 12:37:45 2013	(r330741)
@@ -0,0 +1,11 @@
+--- sapi/apache2handler/config.m4.orig	2013-10-18 12:22:26.576545216 +0000
++++ sapi/apache2handler/config.m4	2013-10-18 12:23:00.903131412 +0000
+@@ -67,7 +67,7 @@
+   fi
+ 
+   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+-  if test -z `$APXS -q SYSCONFDIR`; then
++  if true; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                        -i -n php5"