- Improve handling of config files, making them not world readable

  by default.

- Add a WITH_SUPHP option.

PR:		ports/66758
Submitted by:	maintainer.

1 files changed, 71 insertions, 14 deletions

diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile
index e6d92f49e342..6729dbf81bac 100644
--- a/net/phpldapadmin/Makefile
+++ b/net/phpldapadmin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	phpldapadmin
 PORTVERSION=	0.9.4b
+PORTREVISION=	1
 CATEGORIES=	net www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpldapadmin
@@ -14,33 +15,80 @@ MASTER_SITE_SUBDIR=	phpldapadmin
 MAINTAINER=	m.seaman@infracaninophile.co.uk
 COMMENT=	A set of PHP-scripts to administer LDAP servers over the web
 
+NO_BUILD=	yes
+
+.if defined(WITH_SUPHP)
+
+RUN_DEPENDS+=	${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp
+PKGNAMESUFFIX=	-suphp
+PKGINST_SKEL=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
+PKGINSTALL=	${WRKDIR}/pkg-install${PKGNAMESUFFIX}
+PKGDEINST_SKEL=	${PKGDIR}/pkg-deinstall${PKGNAMESUFFIX}
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall${PKGNAMESUFFIX}
+
+PLAUSR?=	pldapadm
+
+SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
+		-e 's,%%PLADIR%%,${PLADIR},g' \
+		-e 's,%%PLAUSR%%,${PLAUSR},g' \
+		-e 's,%%PLAGRP%%,${PLAGRP},g'
+
+.else
+
 USE_PHP=	yes
 WANT_PHP_WEB=	yes
-NO_BUILD=	yes
 
-WWWDIR?=	www/${PORTNAME}
+.endif
 
 MSG_SKEL=	${PKGDIR}/pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
+
+# PLAUSR is only used WITH_SUPHP
+PLADIR?=	www/${PORTNAME}
+PLAGRP?=	${WWWGRP}
+CFGFILE=	config.php
+
 PLIST=		${WRKDIR}/plist
-PLIST_SUB+=	WWWDIR=${WWWDIR}
+PLIST_SUB+=	PLADIR=${PLADIR} PLAGRP=${PLAGRP}
 
 .SILENT:
 
+pre-everything::
+	${ECHO_MSG} ""
+	${ECHO_MSG} "You may use the following build options:"
+	${ECHO_MSG} ""
+	${ECHO_MSG} "    WITH_SUPHP=yes   Install appropriately for use with"
+	${ECHO_MSG} "                     the www/suphp port [default: no]"
+	${ECHO_MSG} ""
+
 post-patch:
 	${RM} -f ${PLIST}
 	cd ${WRKSRC} ; \
-	${FIND} . ! -type d ! -name .cvsignore | ${SORT} | \
-	    ${SED} "s,^.,%%WWWDIR%%," >${PLIST} ; \
-	${FIND} . -type d | ${SORT} -r | \
-	    ${SED} "s,^.,@dirrm %%WWWDIR%%," >>${PLIST}
-	${SED} -e 's,%%WWWDIR%%,${WWWDIR},g' \
-	       -e 's,%%PREFIX%%,${PREFIX},g' ${MSG_SKEL} > ${PKGMESSAGE}
-
-do-install:
+	${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore | \
+	    ${SORT} | ${SED} "s,^\.,%%PLADIR%%,"     >${PLIST} ; \
+	${CAT} ${PKGDIR}/pkg-plist-chunk            >>${PLIST} ; \
+	${FIND} . -type d | ${SORT} -r | ${SED} \
+	    -e "s,^\.$$,@unexec rmdir %D/%%PLADIR%% 2>/dev/null || true," \
+	    -e "s,^\.,@dirrm %%PLADIR%%,"           >>${PLIST}
+	${SED} -e 's,%%PKGNAME%%,${PKGNAME},g' \
+	       -e 's,%%PREFIX%%,${PREFIX},g'   \
+	       -e 's,%%PLADIR%%,${PLADIR},g'   ${MSG_SKEL} > ${PKGMESSAGE}
+.if defined(WITH_SUPHP)
+	${SED} ${SED_SCRIPT} ${PKGINST_SKEL}   > ${PKGINSTALL}
+	${SED} ${SED_SCRIPT} ${PKGDEINST_SKEL} > ${PKGDEINSTALL}
+.endif
+
+pre-install:
+.if defined(WITH_SUPHP)
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+.endif
+
+do-install: install-app install-conf
+
+install-app:
 	cd ${WRKSRC} ; \
 	for src in $$( ${FIND} . ! -name .cvsignore  ) ; do \
-	    dst=${PREFIX}/${WWWDIR}$${src#.} ; \
+	    dst=${PREFIX}/${PLADIR}$${src#.} ; \
 	    if ${TEST} -d $$src ; then \
 	        ${MKDIR} $$dst ; \
 	    else \
@@ -48,9 +96,18 @@ do-install:
 	    fi \
 	done
 
+install-conf:
+	cd ${PREFIX}/${PLADIR} ; \
+	${CHMOD} 0640 ${CFGFILE}.example ; \
+	${CHGRP} ${PLAGRP} ${CFGFILE}.example ; \
+	if ${TEST} ! -f ${CFGFILE} ; then \
+	    ${CP} -p ${CFGFILE}.example ${CFGFILE} ; \
+	fi
+
 post-install:
-	${ECHO_MSG}
+.if defined(WITH_SUPHP)
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
 	${CAT} ${PKGMESSAGE}
-	${ECHO_MSG}
 
 .include <bsd.port.mk>