1 files changed, 27 insertions, 74 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index ce13f35cab89..70a5aa36c517 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -23,8 +23,18 @@ NO_BUILD=	yes
 USE_PHP=	ctype mysql session spl filter
 .endif
 
-# Unfortunately can't make WITH_SUPHP part of the OPTIONS selection,
-# since it has to be processed before just about anything else.
+OPTIONS=	SUPHP	 "suPHP support" off \
+		BZ2	 "bzip2 library support" on \
+		GD	 "GD library support" on \
+		MYSQLI	 "Improved MySQL support" off \
+		OPENSSL	 "OpenSSL support" on \
+		PDF	 "PDFlib support (implies GD)" on \
+		ZLIB	 "ZLIB support" on \
+		MCRYPT	 "MCrypt library support" on \
+		MBSTRING "Multi-byte character-set string support" on \
+		ZIP	 "Zip compression support" on
+
+.include <bsd.port.options.mk>
 
 .if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
 
@@ -38,30 +48,19 @@ WANT_PHP_WEB=	yes
 
 .endif
 
-# PMA_USR is only used WITH_SUPHP
-
-PMA_GRP?=	${WWWGRP}
-PMA_GID?=	${_PMA_GID}
+# USERS is only used WITH_SUPHP
+GROUPS?=	${WWWGRP}
 CFGFILE=	config.inc.php
 
 PLIST=		${WRKDIR}/plist
-PLIST_SUB+=	PMA_GRP=${PMA_GRP}
+PLIST_SUB+=	PMA_GRP=${GROUPS}
 
 .if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
 
-PMA_USR?=	_pma
-PMA_UID?=	336
-PMA_GCOS?=	"phpMyAdmin Owner"
-PMA_HOME?=	/nonexistent
-PMA_SHELL?=	/sbin/nologin
-
-SUB_LIST+=	PMA_USR=${PMA_USR}    \
-		PMA_UID=${PMA_UID}    \
-		PMA_GRP=${PMA_GRP}    \
-		PMA_GID=${PMA_GID}    \
-		PMA_GCOS=${PMA_GCOS}  \
-		PMA_HOME=${PMA_HOME}  \
-		PMA_SHELL=${PMA_SHELL}
+USERS?=		_pma
+
+SUB_LIST+=	PMA_USR=${USERS}     \
+		PMA_GRP=${GROUPS}
 SUB_FILES+=	pkg-install pkg-deinstall
 
 .endif
@@ -69,26 +68,7 @@ SUB_FILES+=	pkg-install pkg-deinstall
 SUB_LIST+=	PKGNAME=${PKGNAME}
 SUB_FILES+=	pkg-message
 
-# Copy the way lang/php{4,5}-extensions deals with its OPTIONS -- avoids
-# problems with include of bsd.port.pre.mk
-
-OPTIONS=	BZ2	 "bzip2 library support" on \
-		GD	 "GD library support" on \
-		MYSQLI	 "Improved MySQL support" off \
-		OPENSSL	 "OpenSSL support" on \
-		PDF	 "PDFlib support (implies GD)" on \
-		ZLIB	 "ZLIB support" on \
-		MCRYPT   "MCrypt library support" on \
-		MBSTRING "Multi-byte character-set string support" on \
-		ZIP      "Zip compression support" on
-
-PORT_DBDIR?=	/var/db/ports
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
 
 .if !defined(WITHOUT_PHP_DEPENDS)
 # Options that default to on:
@@ -106,42 +86,20 @@ USE_PHP+=	${opt:L}
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-
-_PMA_GID!=	${PW} group show -n ${PMA_GRP} | ${CUT} -d : -f 3
-.if empty(_PMA_GID)
-_PMA_GID=	80
-.endif
-
 .SILENT:
 
 do-build:
 	@${DO_NADA}
 
 pre-everything::
-	${ECHO_MSG} ""
-	${ECHO_MSG} "You may use the following additional build option:"
-	${ECHO_MSG} ""
-	${ECHO_MSG} "    WITH_SUPHP=yes   Install appropriately for use with"
-	${ECHO_MSG} "                     the www/suphp port [default: no]"
-	${ECHO_MSG} ""
 	${ECHO_MSG} "This version of phpmyadmin requires PHP 5.2+ and MySQL"
 	${ECHO_MSG} "5.0+.  If you need to use an older version of PHP or"
 	${ECHO_MSG} "manage older MYSQL databases, please use the"
 	${ECHO_MSG} "databases/phpmyadmin211 port instead."
 	${ECHO_MSG} ""
-.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
-	@if ${PW} show -n phpmyadm >/dev/null 2>&1 ; then                     \
-	    ${ECHO_MSG} "===> WARNING ******************************" ;       \
-	    ${ECHO_MSG} "The default username used by ${PKNAME} has changed"; \
-	    ${ECHO_MSG} "to ${PMA_USR} -- you should delete the old user:" ;  \
-	    ${ECHO_MSG} "  # ${PW} user del -n phpmyadm" ;                    \
-	    ${ECHO_MSG} "" ;                                                  \
-	fi
-.endif
 
 # When creating a package, empty directories will not be generated
-# from the pkg tarball.  Therefore make sure no directories are empty.
+# from the pkg tarball.	 Therefore make sure no directories are empty.
 
 post-patch:
 	cd ${WRKSRC} ; \
@@ -151,16 +109,11 @@ post-patch:
 	${CP} ${FILESDIR}/${CFGFILE}.sample ${WRKSRC}/${CFGFILE}.sample
 	cd ${WRKSRC} ; \
 	${FIND} . ! -type d ! -name ${CFGFILE}.sample | ${SORT} | \
-	    ${SED} -e "s,^\.,%%WWWDIR%%,"             >${PLIST} ; \
-	${CAT} ${PKGDIR}/pkg-plist-chunk             >>${PLIST} ; \
+	    ${SED} -e "s,^\.,%%WWWDIR%%,"	      >${PLIST} ; \
+	${CAT} ${PKGDIR}/pkg-plist-chunk	     >>${PLIST} ; \
 	${FIND} . -type d | ${SORT} -r | ${SED} \
 	     -e "s,^\.$$,@dirrmtry %%WWWDIR%%," \
-	     -e "s,^\.,@dirrm %%WWWDIR%%,"           >>${PLIST}
-
-pre-install:
-.if defined(WITH_SUPHP)
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-.endif
+	     -e "s,^\.,@dirrm %%WWWDIR%%,"	     >>${PLIST}
 
 do-install: install-app install-conf
 
@@ -169,16 +122,16 @@ install-app:
 	for src in $$( ${FIND} . ! -name .cvsignore ) ; do \
 	    dst=${WWWDIR}$${src#.} ; \
 	    if ${TEST} -d $$src ; then \
-	        ${MKDIR} $$dst ; \
+		${MKDIR} $$dst ; \
 	    else \
-	        ${INSTALL_DATA} $$src $$dst ; \
+		${INSTALL_DATA} $$src $$dst ; \
 	    fi \
 	done
 
 install-conf: install-app
 	cd ${WWWDIR} ; \
 	${CHMOD} 0640 ${CFGFILE}.sample ; \
-	${CHGRP} ${PMA_GRP} ${CFGFILE}.sample ; \
+	${CHGRP} ${WWWGRP} ${CFGFILE}.sample ; \
 	if ${TEST} ! -f ${CFGFILE} ; then \
 	    ${CP} -p ${CFGFILE}.sample ${CFGFILE} ; \
 	fi
@@ -189,4 +142,4 @@ post-install:
 .endif
 	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>