From owner-svn-ports-head@FreeBSD.ORG Wed Feb 5 20:03:56 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8493E101; Wed, 5 Feb 2014 20:03:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5529312F6; Wed, 5 Feb 2014 20:03:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15K3u8F018401; Wed, 5 Feb 2014 20:03:56 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15K3tUY018399; Wed, 5 Feb 2014 20:03:55 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201402052003.s15K3tUY018399@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Wed, 5 Feb 2014 20:03:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342836 - head/www/zenphoto X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Feb 2014 20:03:56 -0000 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