Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Feb 2014 20:03:55 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342836 - head/www/zenphoto
Message-ID:  <201402052003.s15K3tUY018399@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Wed Feb  5 20:03:55 2014
New Revision: 342836
URL: http://svnweb.freebsd.org/changeset/ports/342836
QAT: https://qat.redports.org/buildarchive/r342836/

Log:
  - Support STAGEDIR
  - Update maintainer section

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

Modified: head/www/zenphoto/Makefile
==============================================================================
--- head/www/zenphoto/Makefile	Wed Feb  5 20:03:50 2014	(r342835)
+++ head/www/zenphoto/Makefile	Wed Feb  5 20:03:55 2014	(r342836)
@@ -22,17 +22,12 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	PORTNAME=${PORTNAME}
 
-NO_STAGE=	yes
 post-extract:
 	@${RM} ${WRKSRC}/doc_files/Zenphoto\ license.txt ${WRKSRC}/doc_files/README.html ${WRKSRC}/zp-core/Zenphoto.package
 
 do-install:
-	${MKDIR} ${WWWDIR}/
-	cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${WWWDIR}/
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${WWWDIR}/
+	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/
 
 # maintainer section:
 
@@ -40,11 +35,14 @@ MS_DIRRMTRY=	albums cache themes zp-core
 MS_PLIST=	${WRKDIR}/.ms-pkg-plist
 
 genplist: do-clean extract
-	cd ${WRKSRC}/ && \
-		${MKDIR} ${MS_DIRRMTRY} && \
-		${FIND} -s * -type f | ${SED} 's|^|%%WWWDIR%%/|' > ${MS_PLIST} && \
-		${FIND} -s * -type d | ${TAIL} -r | ${SED} 's|^|@dirrm %%WWWDIR%%/|' >> ${MS_PLIST} && \
-		${ECHO} '@dirrmtry %%WWWDIR%%' >> ${MS_PLIST}
+	cd ${WRKSRC}/ && ${MKDIR} ${MS_DIRRMTRY}
+	${ECHO} "@owner www" > ${MS_PLIST}
+	${ECHO} "@group www" >> ${MS_PLIST}
+	cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} 's|^|%%WWWDIR%%/|' >> ${MS_PLIST}
+	cd ${WRKSRC}/ && ${FIND} -s * -type d | ${TAIL} -r | ${SED} 's|^|@dirrm %%WWWDIR%%/|' >> ${MS_PLIST}
+	${ECHO} '@dirrmtry %%WWWDIR%%' >> ${MS_PLIST}
+	${ECHO} "@owner" >> ${MS_PLIST}
+	${ECHO} "@group" >> ${MS_PLIST}
 .for dir in ${MS_DIRRMTRY}
 	${REINPLACE_CMD} '/^@dirrm %%WWWDIR%%\/${dir:C/\//\\\//g}$$/ s|@dirrm|&try|' ${MS_PLIST}
 .endfor

Modified: head/www/zenphoto/pkg-plist
==============================================================================
--- head/www/zenphoto/pkg-plist	Wed Feb  5 20:03:50 2014	(r342835)
+++ head/www/zenphoto/pkg-plist	Wed Feb  5 20:03:55 2014	(r342836)
@@ -1,3 +1,5 @@
+@owner www
+@group www
 %%WWWDIR%%/CHANGELOG.md
 %%WWWDIR%%/README.md
 %%WWWDIR%%/albums/.gitignore
@@ -1830,3 +1832,5 @@
 @dirrmtry %%WWWDIR%%/cache
 @dirrmtry %%WWWDIR%%/albums
 @dirrmtry %%WWWDIR%%
+@owner
+@group



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