summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Brodin <antoine@FreeBSD.org>2014-09-11 20:30:17 +0000
committerAntoine Brodin <antoine@FreeBSD.org>2014-09-11 20:30:17 +0000
commit944cd36394857dbccf5fbfc305f9b4da7085501e (patch)
tree34508a66f3d861fecfd45d416ef077e40db02e4e
parent- Update to CyaSSL 3.2.0 (diff)
- Allow staging as a regular user
- Bump portrevision has files weren't packaged with intended owner
-rw-r--r--www/nibbleblog/Makefile9
-rw-r--r--www/nibbleblog/pkg-plist5
2 files changed, 7 insertions, 7 deletions
diff --git a/www/nibbleblog/Makefile b/www/nibbleblog/Makefile
index 2b1c17d8e792..fa4d883a1c7b 100644
--- a/www/nibbleblog/Makefile
+++ b/www/nibbleblog/Makefile
@@ -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/lighttpd
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>
diff --git a/www/nibbleblog/pkg-plist b/www/nibbleblog/pkg-plist
index 92042a147f95..98ca96a6bcfd 100644
--- a/www/nibbleblog/pkg-plist
+++ b/www/nibbleblog/pkg-plist
@@ -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