aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/suphp/Makefile5
-rw-r--r--www/suphp/files/patch-Makefile.in9
2 files changed, 11 insertions, 3 deletions
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index 70ccf5f0bd72..4d715d38d3ec 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -18,15 +18,14 @@ GNU_CONFIGURE= yes
USE_PHP= yes
USE_APACHE= yes
WANT_PHP_CGI= yes
-CONFLICTS= mod_php4-4* php-4.*
+CONFLICTS= mod_php4-4* php-4.* mod_php5-5* php-5.*
WITH_LOGFILE?= /var/log/suphp.log
PHP_PATH?= ${LOCALBASE}/bin/php
MIN_UID?= 80
MIN_GID?= 80
WITH_SETID_MODE?= owner
-MYPORTDOCS= apache/CONFIG apache/INSTALL apache/README apache/LICENSE \
- LICENSE INSTALL README
+MYPORTDOCS= apache/CONFIG apache/INSTALL apache/README apache/LICENSE LICENSE INSTALL README
LANG= en de
CONFIGURE_ARGS+= --with-php=${PHP_PATH} \
diff --git a/www/suphp/files/patch-Makefile.in b/www/suphp/files/patch-Makefile.in
new file mode 100644
index 000000000000..d1181f75ef17
--- /dev/null
+++ b/www/suphp/files/patch-Makefile.in
@@ -0,0 +1,9 @@
+--- Makefile.in.orig Tue Jul 13 02:43:40 2004
++++ Makefile.in Wed Oct 27 23:10:27 2004
+@@ -17,5 +17,5 @@
+ srcdir='$(srcdir)'
+
+ all install clean:
+- @$(MAKE) $(MAKEDEFS) -C src $@
++ cd src && $(MAKE) $(MAKEDEFS) $@
+