From owner-svn-ports-all@FreeBSD.ORG  Sun Sep 14 19:31:04 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 38478428;
 Sun, 14 Sep 2014 19:31:04 +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 233D6C96;
 Sun, 14 Sep 2014 19:31:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8EJV4k7084859;
 Sun, 14 Sep 2014 19:31:04 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8EJV36i084857;
 Sun, 14 Sep 2014 19:31:03 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201409141931.s8EJV36i084857@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, 14 Sep 2014 19:31:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r368221 - head/databases/phpmyadmin
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Sep 2014 19:31:04 -0000

Author: antoine
Date: Sun Sep 14 19:31:03 2014
New Revision: 368221
URL: http://svnweb.freebsd.org/changeset/ports/368221
QAT: https://qat.redports.org/buildarchive/r368221/

Log:
  Allow staging as a regular user

Modified:
  head/databases/phpmyadmin/Makefile
  head/databases/phpmyadmin/pkg-plist-chunk

Modified: head/databases/phpmyadmin/Makefile
==============================================================================
--- head/databases/phpmyadmin/Makefile	Sun Sep 14 19:26:23 2014	(r368220)
+++ head/databases/phpmyadmin/Makefile	Sun Sep 14 19:31:03 2014	(r368221)
@@ -84,9 +84,7 @@ post-patch:
 	    -e "s,^\.$$,@dirrmtry %%WWWDIR%%," \
 	    -e "s,^\.,@dirrm %%WWWDIR%%,"	     >>${PLIST}
 
-do-install: install-app install-conf
-
-install-app:
+do-install:
 	cd ${WRKSRC} ; \
 	for src in $$( ${FIND} . ! -name .cvsignore ! -name '*.bak' ) ; do \
 	    dst=${STAGEDIR}${WWWDIR}$${src#.} ; \
@@ -97,8 +95,4 @@ install-app:
 	    fi \
 	done
 
-install-conf: install-app
-	${CHMOD} 0640 ${STAGEDIR}${WWWDIR}/${CFG_FILE}.sample ; \
-	${CHGRP} ${WWWGRP} ${STAGEDIR}${WWWDIR}/${CFG_FILE}.sample ;
-
 .include <bsd.port.mk>

Modified: head/databases/phpmyadmin/pkg-plist-chunk
==============================================================================
--- head/databases/phpmyadmin/pkg-plist-chunk	Sun Sep 14 19:26:23 2014	(r368220)
+++ head/databases/phpmyadmin/pkg-plist-chunk	Sun Sep 14 19:31:03 2014	(r368221)
@@ -1,5 +1 @@
-@mode 640
-@group %%PMA_GRP%%
-@sample %%WWWDIR%%/config.inc.php.sample
-@mode
-@group
+@sample(,%%PMA_GRP%%,640) %%WWWDIR%%/config.inc.php.sample