From owner-svn-ports-all@FreeBSD.ORG Fri Jun 6 13:01:48 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 694BFC5C; Fri, 6 Jun 2014 13:01:48 +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 55ED62E1C; Fri, 6 Jun 2014 13:01:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s56D1msp025435; Fri, 6 Jun 2014 13:01:48 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s56D1lDT025433; Fri, 6 Jun 2014 13:01:47 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201406061301.s56D1lDT025433@svn.freebsd.org> From: Martin Wilke Date: Fri, 6 Jun 2014 13:01:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356775 - head/www/crp 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 13:01:48 -0000 Author: miwi Date: Fri Jun 6 13:01:47 2014 New Revision: 356775 URL: http://svnweb.freebsd.org/changeset/ports/356775 QAT: https://qat.redports.org/buildarchive/r356775/ Log: - Stage support PR: 190025 Modified: head/www/crp/Makefile head/www/crp/pkg-plist Modified: head/www/crp/Makefile ============================================================================== --- head/www/crp/Makefile Fri Jun 6 13:01:17 2014 (r356774) +++ head/www/crp/Makefile Fri Jun 6 13:01:47 2014 (r356775) @@ -19,17 +19,15 @@ SPOOLDIR?= /var/spool/conference PKGMESSAGE= ${WRKDIR}/pkg-message -NO_STAGE= yes post-patch: @${SED} -e 's|%%WWWDIR%%|${WWWDIR}|g; s|%%DISTNAME%%|${DISTNAME}|g' \ ${MASTERDIR}/pkg-message > ${PKGMESSAGE} do-install: - @${MKDIR} -m 755 ${WWWDIR} ${SPOOLDIR} - @${CP} -R ${WRKSRC}/ ${WWWDIR}/ + @${MKDIR} -m 755 ${STAGEDIR}${WWWDIR} ${STAGEDIR}${SPOOLDIR} + @${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/ @${SED} -e 's#/var/www/html#${WWWDIR}#' \ - ${WRKSRC}/Code/confHeader.inc > ${WWWDIR}/Code/confHeader.inc - @${CHOWN} -R ${WWWOWN}:${WWWGROUP} ${WWWDIR} ${SPOOLDIR} - @${CAT} ${PKGMESSAGE} + ${WRKSRC}/Code/confHeader.inc > ${STAGEDIR}${WWWDIR}/Code/confHeader.inc + @${CHOWN} -R ${WWWOWN}:${WWWGROUP} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${SPOOLDIR} .include Modified: head/www/crp/pkg-plist ============================================================================== --- head/www/crp/pkg-plist Fri Jun 6 13:01:17 2014 (r356774) +++ head/www/crp/pkg-plist Fri Jun 6 13:01:47 2014 (r356775) @@ -237,3 +237,4 @@ @dirrm %%WWWDIR%%/Assistant @dirrm %%WWWDIR%%/All @dirrm %%WWWDIR%% +@dirrmtry /var/spool/conference