summaryrefslogtreecommitdiffstats
path: root/www/suphp
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2004-10-28 18:29:16 +0000
committerpav <pav@FreeBSD.org>2004-10-28 18:29:16 +0000
commit8fb2704cd3a320076b74193580966ebc536bd7c1 (patch)
tree63a36a0d61ca6fdc654f35352e57d3d8175cd988 /www/suphp
parente0d469fb58c07296dad257bd3798b18ab2d6f011 (diff)
downloadFreeBSD-ports-8fb2704cd3a320076b74193580966ebc536bd7c1.zip
FreeBSD-ports-8fb2704cd3a320076b74193580966ebc536bd7c1.tar.gz
- Avoid make -C fixing build on FreeBSD 4.8 and older
- Expand CONFLICTS - Style PR: ports/73226 Submitted by: Jeremy Chadwick <freebsd@jdc.parodius.com> (maintainer)
Diffstat (limited to 'www/suphp')
-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 70ccf5f..4d715d3 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 0000000..d1181f7
--- /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) $@
+
OpenPOWER on IntegriCloud