svn commit: r368221 - head/databases/phpmyadmin

[Antoine Brodin]

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,^\.$$, at dirrmtry %%WWWDIR%%," \
 	    -e "s,^\., at 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 @@
- at mode 640
- at group %%PMA_GRP%%
- at sample %%WWWDIR%%/config.inc.php.sample
- at mode
- at group
+ at sample(,%%PMA_GRP%%,640) %%WWWDIR%%/config.inc.php.sample