svn commit: r367511 - head/databases/adminer

[Antoine Brodin]

Author: antoine
Date: Sun Sep  7 11:01:53 2014
New Revision: 367511
URL: http://svnweb.freebsd.org/changeset/ports/367511
QAT: https://qat.redports.org/buildarchive/r367511/

Log:
  Allow staging as a regular user

Modified:
  head/databases/adminer/Makefile
  head/databases/adminer/pkg-plist

Modified: head/databases/adminer/Makefile
==============================================================================
--- head/databases/adminer/Makefile	Sun Sep  7 10:52:49 2014	(r367510)
+++ head/databases/adminer/Makefile	Sun Sep  7 11:01:53 2014	(r367511)
@@ -7,8 +7,8 @@ PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	SF/${PORTNAME}/Adminer/Adminer%20${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-			${PORTNAME}-${PORTVERSION}.php ${PORTNAME}-${PORTVERSION}-en.php \
-			${PORTNAME}-${PORTVERSION}-mysql.php ${PORTNAME}-${PORTVERSION}-mysql-en.php
+		${PORTNAME}-${PORTVERSION}.php ${PORTNAME}-${PORTVERSION}-en.php \
+		${PORTNAME}-${PORTVERSION}-mysql.php ${PORTNAME}-${PORTVERSION}-mysql-en.php
 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	udvzsolt at gmail.com
@@ -20,6 +20,7 @@ USES=		zip
 NO_BUILD=	yes
 USE_PHP=	mysql session
 SUB_FILES=	pkg-message
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 OPTIONS_SINGLE=	VERSION
 OPTIONS_SINGLE_VERSION= LITE FULL
@@ -51,18 +52,11 @@ POSTFIX=${POSTFIX_MYSQL}${POSTFIX_NLS}
 .endif
 
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 .if ${PORT_OPTIONS:MFULL}
-		@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 .else
-		${MKDIR} ${STAGEDIR}${WWWDIR}/${PORTNAME}
-		${CP} ${DISTDIR}/${ADMINER_FILE}${POSTFIX}.php ${STAGEDIR}${WWWDIR}/${PORTNAME}/index.php
+	${MKDIR} ${STAGEDIR}${WWWDIR}/${PORTNAME}
+	${CP} ${DISTDIR}/${ADMINER_FILE}${POSTFIX}.php ${STAGEDIR}${WWWDIR}/${PORTNAME}/index.php
 .endif
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
-	@${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}' \
-		>> ${TMPPLIST}
-	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}' \
-		>> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/databases/adminer/pkg-plist
==============================================================================
--- head/databases/adminer/pkg-plist	Sun Sep  7 10:52:49 2014	(r367510)
+++ head/databases/adminer/pkg-plist	Sun Sep  7 11:01:53 2014	(r367511)
@@ -1,3 +1,6 @@
+ at owner %%WWWOWN%%
+ at group %%WWWGRP%%
+ at mode 0755
 %%FULL%%%%WWWDIR%%/adminer/call.inc.php
 %%FULL%%%%WWWDIR%%/adminer/create.inc.php
 %%FULL%%%%WWWDIR%%/adminer/database.inc.php
@@ -228,3 +231,6 @@
 %%FULL%%@dirrm %%WWWDIR%%/plugins
 %%FULL%%@dirrm %%WWWDIR%%/tests
 @dirrm %%WWWDIR%%
+ at owner root
+ at group wheel
+ at mode