ports/73226: Update to suphp port

[Jeremy Chadwick]

>Number:         73226
>Category:       ports
>Synopsis:       Update to suphp port
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 28 06:40:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Chadwick
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
Parodius Networking
>Environment:
System: FreeBSD pentarou.parodius.com 4.10-STABLE FreeBSD 4.10-STABLE #0: Sat Sep 18 21:49:46 PDT 2004 root at pentarou.parodius.com:/usr/obj/usr/src/sys/PENTAROU i386
>Description:
	Update to suphp port:

	* Missed "make -C" in main Makefile.in; breaks FreeBSD 4.8.  Reported by Alex <docal at mail.wplus.net>
	* Added some additional CONFLICTS (module-ised version of php5)
	* Minor cosmetical clean-up for MYPORTDOCS.
>How-To-Repeat:
	n/a
>Fix:
	Apply below patch.


diff -ruN suphp.orig/Makefile suphp/Makefile
--- suphp.orig/Makefile	Thu Aug 12 02:31:51 2004
+++ suphp/Makefile	Wed Oct 27 23:33:53 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	suphp
 PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.suphp.org/download/
 
@@ -18,15 +18,14 @@
 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 -ruN suphp.orig/files/patch::Makefile.in suphp/files/patch::Makefile.in
--- suphp.orig/files/patch::Makefile.in	Wed Dec 31 16:00:00 1969
+++ suphp/files/patch::Makefile.in	Wed Oct 27 23:10:58 2004
@@ -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) $@
+ 
>Release-Note:
>Audit-Trail:
>Unformatted: