From owner-svn-ports-all@FreeBSD.ORG Thu Sep 11 21:53:52 2014 Return-Path: Delivered-To: svn-ports-all@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 2654EFAA; Thu, 11 Sep 2014 21:53:52 +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 ED47AB00; Thu, 11 Sep 2014 21:53:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8BLrptu079789; Thu, 11 Sep 2014 21:53:51 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8BLrpxx079787; Thu, 11 Sep 2014 21:53:51 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201409112153.s8BLrpxx079787@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 11 Sep 2014 21:53:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367989 - head/www/wikindx 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-1 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: Thu, 11 Sep 2014 21:53:52 -0000 Author: antoine Date: Thu Sep 11 21:53:51 2014 New Revision: 367989 URL: http://svnweb.freebsd.org/changeset/ports/367989 QAT: https://qat.redports.org/buildarchive/r367989/ Log: - Allow staging as a regular user - Bump portrevision as files were not packaged with intended owner Modified: head/www/wikindx/Makefile head/www/wikindx/pkg-plist Modified: head/www/wikindx/Makefile ============================================================================== --- head/www/wikindx/Makefile Thu Sep 11 21:34:14 2014 (r367988) +++ head/www/wikindx/Makefile Thu Sep 11 21:53:51 2014 (r367989) @@ -3,6 +3,7 @@ PORTNAME= wikindx PORTVERSION= 3.8.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}3_8_2 DISTNAME= ${PORTNAME}${PORTVERSION:S/./_/g} @@ -14,7 +15,7 @@ USE_PHP= session mysql xml ctype NO_BUILD= YES WRKSRC= ${WRKDIR}/wikindx3 -WWWDIR?= www/wikindx +PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" ROOTFILES= config.php index.php rss.php ROOTDIRS= attachments core docs files languages modules \ papers styles templates update @@ -23,15 +24,11 @@ DOCFILES= CHANGELOG CUSTOMIZATION DISCLA OPTIONS_DEFINE= DOCS -pre-install: - @${ECHO} ${WWWDIR} - do-install: - -${MKDIR} ${STAGEDIR}${PREFIX}/${WWWDIR} - (cd ${WRKSRC} && ${CP} ${ROOTFILES} ${STAGEDIR}${PREFIX}/${WWWDIR}/ ) - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${WWWDIR} + ${MKDIR} ${STAGEDIR}${WWWDIR} + (cd ${WRKSRC} && ${CP} ${ROOTFILES} ${STAGEDIR}${WWWDIR}/ ) .for i in ${ROOTDIRS} - @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${PREFIX}/${WWWDIR}/ ) + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR}/ ) .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCFILES} Modified: head/www/wikindx/pkg-plist ============================================================================== --- head/www/wikindx/pkg-plist Thu Sep 11 21:34:14 2014 (r367988) +++ head/www/wikindx/pkg-plist Thu Sep 11 21:53:51 2014 (r367989) @@ -7,6 +7,8 @@ %%PORTDOCS%%%%DOCSDIR%%/README_CMS %%PORTDOCS%%%%DOCSDIR%%/README_RSS %%PORTDOCS%%%%DOCSDIR%%/UPGRADE +@owner %%WWWOWN%% +@group %%WWWGRP%% %%WWWDIR%%/attachments/ATTACHMENTS %%WWWDIR%%/config.php %%WWWDIR%%/core/admin/ADMIN.php @@ -845,4 +847,6 @@ @dirrm %%WWWDIR%%/core @dirrm %%WWWDIR%%/attachments @dirrm %%WWWDIR%% +@owner root +@group wheel @dirrm %%DOCSDIR%%