Fix installation of mod_php.

This commit is contained in:
Alex Dupre 2013-10-18 12:37:45 +00:00
parent 0031c1839b
commit 8e7fdd9d37
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=330741
7 changed files with 46 additions and 2 deletions

View file

@ -101,7 +101,6 @@ IGNORE= cannot be built with multiple SAPI (apache and embedded)
.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"

View file

@ -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"

View file

@ -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"

View file

@ -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

View file

@ -101,7 +101,6 @@ IGNORE= cannot be built with multiple SAPI (apache and embedded)
.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"

View file

@ -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"

View file

@ -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"