Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Sep 2014 06:28:17 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r367164 - head/www/yourls
Message-ID:  <201409030628.s836SHui032573@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Wed Sep  3 06:28:16 2014
New Revision: 367164
URL: http://svnweb.freebsd.org/changeset/ports/367164
QAT: https://qat.redports.org/buildarchive/r367164/

Log:
  Properly set credentials via plist

Modified:
  head/www/yourls/Makefile
  head/www/yourls/pkg-plist

Modified: head/www/yourls/Makefile
==============================================================================
--- head/www/yourls/Makefile	Wed Sep  3 06:23:56 2014	(r367163)
+++ head/www/yourls/Makefile	Wed Sep  3 06:28:16 2014	(r367164)
@@ -21,19 +21,10 @@ USE_PHP=	bcmath curl json mysql pcre xml
 
 SUB_LIST+=	PKGNAME=${PKGNAME}
 SUB_FILES+=	pkg-message
-
-.include <bsd.port.pre.mk>
+PLIST_SUB=	WWWOWN=${WWWOWN} \
+		WWWGRP=${WWWGRP}
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
-		${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
-	@${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
-	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
-		${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
-	@${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
-	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
-		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/yourls/pkg-plist
==============================================================================
--- head/www/yourls/pkg-plist	Wed Sep  3 06:23:56 2014	(r367163)
+++ head/www/yourls/pkg-plist	Wed Sep  3 06:28:16 2014	(r367164)
@@ -1,3 +1,5 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%WWWDIR%%/admin/admin-ajax.php
 %%WWWDIR%%/admin/index.php
 %%WWWDIR%%/admin/install.php
@@ -365,23 +367,25 @@
 %%WWWDIR%%/yourls-go.php
 %%WWWDIR%%/yourls-infos.php
 %%WWWDIR%%/yourls-loader.php
-@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/js
-@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/img
-@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/css
-@dirrm %%WWWDIR%%/user/plugins/sample-toolbar
-@dirrm %%WWWDIR%%/user/plugins/sample-plugin
-@dirrm %%WWWDIR%%/user/plugins/sample-page
+@dirrm %%WWWDIR%%/admin
+@dirrm %%WWWDIR%%/css
+@dirrm %%WWWDIR%%/images
+@dirrm %%WWWDIR%%/includes/geo/flags
+@dirrm %%WWWDIR%%/includes/geo
+@dirrm %%WWWDIR%%/includes
+@dirrm %%WWWDIR%%/js
+@dirrm %%WWWDIR%%/pages
+@dirrm %%WWWDIR%%/user/plugins/hyphens-in-urls
 @dirrm %%WWWDIR%%/user/plugins/random-bg/img
 @dirrm %%WWWDIR%%/user/plugins/random-bg
-@dirrm %%WWWDIR%%/user/plugins/hyphens-in-urls
+@dirrm %%WWWDIR%%/user/plugins/sample-page
+@dirrm %%WWWDIR%%/user/plugins/sample-plugin
+@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/css
+@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/img
+@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/js
+@dirrm %%WWWDIR%%/user/plugins/sample-toolbar
 @dirrm %%WWWDIR%%/user/plugins
 @dirrm %%WWWDIR%%/user
-@dirrm %%WWWDIR%%/pages
-@dirrm %%WWWDIR%%/js
-@dirrm %%WWWDIR%%/includes/geo/flags
-@dirrm %%WWWDIR%%/includes/geo
-@dirrm %%WWWDIR%%/includes
-@dirrm %%WWWDIR%%/images
-@dirrm %%WWWDIR%%/css
-@dirrm %%WWWDIR%%/admin
 @dirrm %%WWWDIR%%
+@owner root
+@group wheel



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409030628.s836SHui032573>