From owner-svn-ports-all@FreeBSD.ORG Fri Jun 6 18:56:41 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BCBAB8A8; Fri, 6 Jun 2014 18:56:41 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A972922CE; Fri, 6 Jun 2014 18:56:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s56Iufma089105; Fri, 6 Jun 2014 18:56:41 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s56IuffV089099; Fri, 6 Jun 2014 18:56:41 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201406061856.s56IuffV089099@svn.freebsd.org> From: John Marino Date: Fri, 6 Jun 2014 18:56:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356833 - head/www/lionwiki X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jun 2014 18:56:41 -0000 Author: marino Date: Fri Jun 6 18:56:40 2014 New Revision: 356833 URL: http://svnweb.freebsd.org/changeset/ports/356833 QAT: https://qat.redports.org/buildarchive/r356833/ Log: www/lionwiki: Stage support, reset maintainer There were modifications made to the PR patch that was submitted to stage this port: * Use @owner, @group pkg-list keywords instead of $CHOWN in stagedir * Use @sample keyword instead of old-style conf file handling * post-patch target unnecessary; file doesn't need to be MV'd twice * post-install target unnecessary with stage (pkg-message handled is automatically) * pet portlint with WWW whitespace fix * Reset MIA maintainer PR: ports/190225 Submitted by: Joe Benden Modified by: marino Modified: head/www/lionwiki/Makefile head/www/lionwiki/pkg-descr head/www/lionwiki/pkg-plist Modified: head/www/lionwiki/Makefile ============================================================================== --- head/www/lionwiki/Makefile Fri Jun 6 18:56:28 2014 (r356832) +++ head/www/lionwiki/Makefile Fri Jun 6 18:56:40 2014 (r356833) @@ -6,33 +6,24 @@ PORTVERSION= 3.2.7 CATEGORIES= www MASTER_SITES= http://lionwiki.0o.cz/download/${PORTVERSION}/ -MAINTAINER= sylvio@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Minimalis wiki, extensible, templatable and file based USE_PHP= session ctype -#NO_WRKSUBDIR= yes NO_BUILD= yes ROOTFILES= config.php index.php ROOTDIRS= lang plugins templates var SUB_FILES= pkg-message - -NO_STAGE= yes -post-patch: - (cd ${WRKSRC} && ${MV} config.php config.php.sample) +PLIST_SUB= OWNER=${WWWOWN} GROUP=${WWWGRP} do-install: - ${MKDIR} ${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/config.php.sample ${WWWDIR}/ - if [ ! -f ${WWWDIR}/config.php ]; then \ - ${CP} -p ${WWWDIR}/config.php.sample ${WWWDIR}/config.php; \ - fi - ${INSTALL_DATA} ${WRKSRC}/index.php ${WWWDIR}/ + ${MKDIR} ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/config.php \ + ${STAGEDIR}${WWWDIR}/config.php.sample + ${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${WWWDIR}/ .for dirs in ${ROOTDIRS} - (cd ${WRKSRC} && ${COPYTREE_SHARE} ${dirs} ${WWWDIR}/ ) + cd ${WRKSRC} && ${COPYTREE_SHARE} ${dirs} ${STAGEDIR}${WWWDIR}/ .endfor - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} -post-install: - ${CAT} ${PKGMESSAGE} .include Modified: head/www/lionwiki/pkg-descr ============================================================================== --- head/www/lionwiki/pkg-descr Fri Jun 6 18:56:28 2014 (r356832) +++ head/www/lionwiki/pkg-descr Fri Jun 6 18:56:40 2014 (r356833) @@ -3,4 +3,4 @@ templatable, file based (it doesn't need just one file to function. It's suitable for small websites, personal notebooks or journals. -WWW: http://lionwiki.0o.cz +WWW: http://lionwiki.0o.cz Modified: head/www/lionwiki/pkg-plist ============================================================================== --- head/www/lionwiki/pkg-plist Fri Jun 6 18:56:28 2014 (r356832) +++ head/www/lionwiki/pkg-plist Fri Jun 6 18:56:40 2014 (r356833) @@ -1,6 +1,6 @@ -@unexec if cmp -s %D/%%WWWDIR%%/config.php %D/%%WWWDIR%%/config.php.sample; then rm -f %D/%%WWWDIR%%/config.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/config.php has not been removed"; fi -%%WWWDIR%%/config.php.sample -@exec if [ ! -f %D/%%WWWDIR%%/config.php ] ; then cp -p %D/%F %B/config.php; fi +@owner %%OWNER%% +@group %%GROUP%% +@sample %%WWWDIR%%/config.php.sample %%WWWDIR%%/index.php %%WWWDIR%%/lang/ar.php %%WWWDIR%%/lang/cs.php @@ -68,6 +68,8 @@ %%WWWDIR%%/templates/red.html %%WWWDIR%%/templates/terminal.html %%WWWDIR%%/templates/wikiss.html +@owner +@group @dirrm %%WWWDIR%%/var @dirrm %%WWWDIR%%/templates @dirrm %%WWWDIR%%/plugins/Menu