- moves the default installation directory to /usr/local/www/phpMyAdmin

  instead of /usr/local/www/data/phpMyAdmin

- Improves handling config files, making them not world readable
  by default.

- Generates pkg-plist dynamically

- Adds a WITH_SUPHP option

PR:		ports/66697
Submitted by:	maintainer

1 files changed, 90 insertions, 11 deletions

diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index 1b3d2fc8dd10..8f5900ddf1e1 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	phpMyAdmin
 PORTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
@@ -15,21 +16,99 @@ MAINTAINER=	m.seaman@infracaninophile.co.uk
 COMMENT=	A set of PHP-scripts to adminster MySQL over the web
 
 USE_BZIP2=	yes
-USE_PHP=	yes
 NO_BUILD=	yes
 
-MYADMDIR?=	www/data/phpMyAdmin
+.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}
+
+MYADMUSR?=	phpmyadm
+
+SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g'     \
+		-e 's,%%MYADMDIR%%,${MYADMDIR},g' \
+		-e 's,%%MYADMUSR%%,${MYADMUSR},g' \
+		-e 's,%%MYADMGRP%%,${MYADMGRP},g'
+
+.else
+
+USE_PHP=	yes
+WANT_PHP_WEB=	yes
+
+.endif
+
+MSG_SKEL=	${PKGDIR}/pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
-PLIST_SUB+=	MYADMDIR=${MYADMDIR}
+# MYADMUSR is only used WITH_SUPHP
+MYADMDIR?=	www/phpMyAdmin
+MYADMGRP?=	${WWWGRP}
+CFGFILE=	config.inc.php
+
+PLIST=		${WRKDIR}/plist
+PLIST_SUB+=	MYADMDIR=${MYADMDIR} MYADMGRP=${MYADMGRP}
+
+.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:
-	@${MV} ${WRKSRC}/config.inc.php ${WRKSRC}/config.inc.php.sample
-
-do-install:
-	@${MKDIR} ${PREFIX}/${MYADMDIR}
-	@${FIND} ${WRKSRC} ! -path '*/CVS*' ! -path '*/.cvsignore' | \
-		${XARGS} -n1 ${SH} -c 'if ${TEST} -d $$0; \
-			then ${MKDIR} ${PREFIX}/${MYADMDIR}$${0#${WRKSRC}}; \
-			else ${INSTALL_DATA} $$0 ${PREFIX}/${MYADMDIR}$${0#${WRKSRC}}; fi'
+	${MV} ${WRKSRC}/${CFGFILE} ${WRKSRC}/${CFGFILE}.sample
+	cd ${WRKSRC} ; \
+	${FIND} . ! -type d ! -name ${CFGFILE}.sample | ${SORT} | \
+	    ${SED} -e "s,^\.,%%MYADMDIR%%,"           >${PLIST} ; \
+	${CAT} ${PKGDIR}/pkg-plist-chunk             >>${PLIST} ; \
+	${FIND} . -type d | ${SORT} -r | ${SED} \
+	     -e "s,^\.$$,@unexec rmdir %D/%%MYADMDIR%% 2>/dev/null || true," \
+	     -e "s,^\.,@dirrm %%MYADMDIR%%,"         >>${PLIST}
+	${SED} -e 's,%%MYADMDIR%%,${MYADMDIR},g' \
+	       -e 's,%%PREFIX%%,${PREFIX},g'     \
+	       -e 's,%%PKGNAME%%,${PKGNAME},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}/${MYADMDIR}$${src#.} ; \
+	    if ${TEST} -d $$src ; then \
+	        ${MKDIR} $$dst ; \
+	    else \
+	        ${INSTALL_DATA} $$src $$dst ; \
+	    fi \
+	done
+
+install-conf: install-app
+	cd ${PREFIX}/${MYADMDIR} ; \
+	${CHMOD} 0640 ${CFGFILE}.sample ; \
+	${CHGRP} ${MYADMGRP} ${CFGFILE}.sample ; \
+	if ${TEST} ! -f ${CFGFILE} ; then \
+	    ${CP} -p ${CFGFILE}.sample ${CFGFILE} ; \
+	fi
+
+post-install:
+.if defined(WITH_SUPHP)
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>