From owner-svn-ports-head@FreeBSD.ORG  Sun Sep  7 11:01:54 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A56DFE9D;
 Sun,  7 Sep 2014 11:01:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 76EDE103B;
 Sun,  7 Sep 2014 11:01:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s87B1sMs016208;
 Sun, 7 Sep 2014 11:01:54 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s87B1s4I016205;
 Sun, 7 Sep 2014 11:01:54 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201409071101.s87B1s4I016205@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sun, 7 Sep 2014 11:01:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r367511 - head/databases/adminer
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Sep 2014 11:01:54 -0000

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@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 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
+@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%%
+@owner root
+@group wheel
+@mode