1 files changed, 34 insertions, 57 deletions

diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index f01a754783fc..cfbd071f1935 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -6,85 +6,62 @@
 #
 
 PORTNAME=	suphp
-PORTVERSION=	0.2.3
-PORTREVISION=	1
+PORTVERSION=	0.3
 CATEGORIES=	www
 MASTER_SITES=	http://www.suphp.org/download/
 
 MAINTAINER=	sheepkiller@cultdeadsheep.org
-COMMENT=	suPHP is a combination which provides a wrapper for PHP
+COMMENT=	A combination which provides a wrapper for PHP
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${LOCALBASE}/bin/php:${PORTSDIR}/www/php4-cgi
 
-USE_REINPLACE=	yes
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFLICTS=	mod_php4-4*
 
-MAKE_ARGS+=	APXS="${APXS}"
 APXS?=		${LOCALBASE}/sbin/apxs
-WWW_USER?=	www
-WWW_GROUP?=	www
 LOG_PATH?=	/var/log
 PHP_PATH?=	${LOCALBASE}/bin/php
+APACHE_USER?=	www
 
-.include <bsd.port.pre.mk>
+CONFIGURE_ARGS+=	--with-php=${PHP_PATH} \
+			--with-logfile=${LOG_PATH}/suphp.log \
+			--with-apache-user=${APACHE_USER} \
+			--with-min-gid=80 \
+			--with-min-uid=80 \
+			--with-apxs=${APXS}
 
-.if exists(${LOCALBASE}/libexec/apache/libphp4.so)
-IGNORE="suPHP conflicts with mod_php4. It works only with php4-cgi"
+## Available knobs:
+##   WITHOUT_CHECKPATH: disable check if script resides in DOCUMENT_ROOT
+.if defined(WITHOUT_CHECKPATH)
+CONFIGURE_ARGS+=	--disable-checkpath
+.endif
+##   WITHOUT_CHECKUID: accept UIDs that are not listed in /etc/passwd
+.if defined(WITHOUT_CHECKUID)
+CONFIGURE_ARGS+=	--disable-checkuid
+.endif
+##   WITHOUT_CHECKGID: accept GIDs that are not listed in /etc/group
+.if defined(WITHOUT_CHECKGID)
+CONFIGURE_ARGS+=	--disable-checkgid
 .endif
 
-pre-configure:
-	@${ECHO}
-	@${ECHO} "*-------------------------------------------------------------*"
-	@${ECHO} " Options :"
-	@${ECHO} "     - WWW_USER = Apache's User (default www)"
-	@${ECHO} "     - Define CHECK_PATH, to enable suExec-like path checking"
-	@${ECHO} "       (based on DocumentRoot directive)."
-	@${ECHO} "     - LOG_PATH=/path/to/your/logs. Default /var/log/."
-	@${ECHO} "     - PHP_PATH=/path/to/bin/php. Default ${LOCALBASE}/bin/php."
-	@${ECHO} "*-------------------------------------------------------------*"
-	@${ECHO}
+.include <bsd.port.pre.mk>
 
-do-configure:
-	@${ECHO} "Setting User to : ${WWW_USER}"
-	@${REINPLACE_CMD} -e 's!OPT_APACHE_USER "wwwrun"!OPT_APACHE_USER "${WWW_USER}"!' \
-		${WRKSRC}/config.h
-	@${ECHO} "Setting Group to : ${WWW_GROUP}"
-	@${REINPLACE_CMD} -e 's!OPT_APACHE_GROUP "wwwrun"!OPT_APACHE_GROUP "${WWW_USER}"!' \
-		${WRKSRC}/config.h
-	@${ECHO} "Setting checkpath. (if enabled)"
-.if !defined(CHECK_PATH)
-	@${REINPLACE_CMD} -e 's!#define OPT_CHECKPATH!/*#define OPT_CHECKPATH*/!' \
-		${WRKSRC}/config.h
+.if exists(${LOCALBASE}/include/apache2/apr.h)
+BROKEN=                "Doesn't work with Apache 2"
 .endif
-	@${ECHO} "Setting logs path"
-	@${REINPLACE_CMD} -e 's,OPT_LOGFILE "/opt/apache/var/logs/suphp_log",OPT_LOGFILE "${LOG_PATH}/suphp_log",' \
-		${WRKSRC}/config.h
-	 @${ECHO} "Setting php path"
-	@${REINPLACE_CMD} -e 's,OPT_PATH_TO_PHP "/usr/bin/php",OPT_PATH_TO_PHP "${PHP_PATH}",' \
-		${WRKSRC}/config.h
-	@${ECHO} "Setting suphp path in mod_suphp"
-	@${REINPLACE_CMD} -e "s,/usr/sbin/suphp,${PREFIX}/sbin/suphp," ${WRKSRC}/apache/mod_suphp.c
 
-post-build:
-	@(cd ${WRKSRC}/apache && ${APXS} -c mod_suphp.c) 
+show-options:
+	@${EGREP} '^##' ${.CURDIR}/Makefile | ${SED} 's/##//'
+
+pre-everything::
+	@${MAKE} show-options
 
 post-install:
-	@(cd ${WRKSRC}/apache && ${APXS} -i -a -n suphp ${WRKSRC}/apache/mod_suphp.so)
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/apache ${DOCSDIR}/de-doc ${DOCSDIR}/de-doc/apache
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/apache/CONFIG ${DOCSDIR}/apache
-	${INSTALL_DATA} ${WRKSRC}/apache/README ${DOCSDIR}/apache
-	${INSTALL_DATA} ${WRKSRC}/apache/INSTALL ${DOCSDIR}/apache
-	${INSTALL_DATA} ${WRKSRC}/apache/LICENSE ${DOCSDIR}/apache
-	${INSTALL_DATA} -d ${WRKSRC}/de-doc/ ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/de-doc/README.de ${DOCSDIR}/de-doc/
-	${INSTALL_DATA} ${WRKSRC}/de-doc/INSTALL.de ${DOCSDIR}/de-doc/
-	${INSTALL_DATA} ${WRKSRC}/de-doc/apache/README.de ${DOCSDIR}/de-doc/apache
-	${INSTALL_DATA} ${WRKSRC}/de-doc/apache/INSTALL.de ${DOCSDIR}/de-doc/apache
-	${INSTALL_DATA} ${WRKSRC}/de-doc/apache/CONFIG.de ${DOCSDIR}/de-doc/apache
+	@${MKDIR} ${DOCSDIR}
+	@${CP} -Rfp ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}