Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Sep 2014 17:28:53 +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: r368206 - head/www/bblog
Message-ID:  <201409141728.s8EHSrml023918@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sun Sep 14 17:28:53 2014
New Revision: 368206
URL: http://svnweb.freebsd.org/changeset/ports/368206
QAT: https://qat.redports.org/buildarchive/r368206/

Log:
  - Allow staging as a regular user
  - Fix ownership of packaged files

Modified:
  head/www/bblog/Makefile

Modified: head/www/bblog/Makefile
==============================================================================
--- head/www/bblog/Makefile	Sun Sep 14 17:26:58 2014	(r368205)
+++ head/www/bblog/Makefile	Sun Sep 14 17:28:53 2014	(r368206)
@@ -3,7 +3,7 @@
 
 PORTNAME=	bBlog
 PORTVERSION=	0.7.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}%20${PORTVERSION}
 
@@ -21,13 +21,14 @@ BBLOGDIR?=	${WWWDOCROOT}/${BBLOGURL}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	BBLOGURL=${BBLOGURL} BBLOGDIR=${BBLOGDIR}
-PLIST_SUB=	WWWDOCROOT=${WWWDOCROOT} BBLOGURL=${BBLOGURL}
+PLIST_SUB=	WWWDOCROOT=${WWWDOCROOT} BBLOGURL=${BBLOGURL} \
+		WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 OPTIONS_DEFINE=	GD IMAGICK
 OPTIONS_DEFAULT=GD
 IMAGICK_DESC=	${IMAGEMAGICK_DESC}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGD}
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/gd.so:${PORTSDIR}/${gd_DEPENDS}
@@ -44,8 +45,6 @@ pre-patch:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}
-	@${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${BBLOGDIR}
-	@${CHGRP} -R ${WWWGRP} ${STAGEDIR}${PREFIX}/${BBLOGDIR}
 	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/${BBLOGDIR}
 .for f in archives.php documentation.txt htaccess-cleanurls index.php item rss.php search.php section
 	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/${BBLOGDIR}
@@ -57,7 +56,4 @@ do-install:
 	@${CHMOD} 775 ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/config.php
 	@${MV} ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/config.php ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/config.php.sample
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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