Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Sep 2014 20:30:18 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r367977 - head/www/nibbleblog
Message-ID:  <201409112030.s8BKUIjr037247@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Thu Sep 11 20:30:17 2014
New Revision: 367977
URL: http://svnweb.freebsd.org/changeset/ports/367977
QAT: https://qat.redports.org/buildarchive/r367977/

Log:
  - Allow staging as a regular user
  - Bump portrevision has files weren't packaged with intended owner

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

Modified: head/www/nibbleblog/Makefile
==============================================================================
--- head/www/nibbleblog/Makefile	Thu Sep 11 20:19:05 2014	(r367976)
+++ head/www/nibbleblog/Makefile	Thu Sep 11 20:30:17 2014	(r367977)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nibbleblog
 PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/v${PORTVERSION}/
 DISTNAME=	nibbleblogv302
@@ -20,6 +20,7 @@ USES=		zip
 NO_BUILD=	yes
 USE_PHP=	session filter xml simplexml gd
 PKGMESSAGE=	${MASTERDIR}/pkg-message
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
@@ -33,10 +34,6 @@ RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/l
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
-	@${CP} -r ${WRKDIR}/${PORTNAME}/ ${STAGEDIR}${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
-
-post-install:
-	${CAT} ${PKGMESSAGE}
+	${CP} -r ${WRKDIR}/${PORTNAME}/ ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>

Modified: head/www/nibbleblog/pkg-plist
==============================================================================
--- head/www/nibbleblog/pkg-plist	Thu Sep 11 20:19:05 2014	(r367976)
+++ head/www/nibbleblog/pkg-plist	Thu Sep 11 20:30:17 2014	(r367977)
@@ -1,3 +1,5 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%WWWDIR%%/COPYRIGHT.txt
 %%WWWDIR%%/LICENSE.txt
 %%WWWDIR%%/.htaccess
@@ -177,4 +179,5 @@
 @dirrm %%WWWDIR%%/admin/ajax
 @dirrm %%WWWDIR%%/admin
 @dirrmtry %%WWWDIR%%
-@exec mkdir -p %D/%%WWWDIR%%/content
+@owner root
+@group wheel



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