From owner-svn-ports-head@FreeBSD.ORG Sun Jul 27 20:12:43 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 AC95EF8C; Sun, 27 Jul 2014 20:12:43 +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 997972189; Sun, 27 Jul 2014 20:12:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6RKChpK007136; Sun, 27 Jul 2014 20:12:43 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6RKChEn007134; Sun, 27 Jul 2014 20:12:43 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201407272012.s6RKChEn007134@svn.freebsd.org> From: William Grzybowski Date: Sun, 27 Jul 2014 20:12:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363099 - head/devel/cvsweb3 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.18 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: Sun, 27 Jul 2014 20:12:43 -0000 Author: wg Date: Sun Jul 27 20:12:42 2014 New Revision: 363099 URL: http://svnweb.freebsd.org/changeset/ports/363099 QAT: https://qat.redports.org/buildarchive/r363099/ Log: devel/cvsweb3: support stage PR: 191282 Submitted by: joe thrallingpenguin com Approved by: maintainer (timeout) Modified: head/devel/cvsweb3/Makefile head/devel/cvsweb3/pkg-plist Modified: head/devel/cvsweb3/Makefile ============================================================================== --- head/devel/cvsweb3/Makefile Sun Jul 27 19:52:16 2014 (r363098) +++ head/devel/cvsweb3/Makefile Sun Jul 27 20:12:42 2014 (r363099) @@ -8,6 +8,7 @@ CATEGORIES= devel www MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://people.FreeBSD.org/~scop/cvsweb/ MASTER_SITE_SUBDIR= scop +PKGNAMESUFFIX= 3 # For issues that are not specific to this port/package, please consult # the mailing list. @@ -27,13 +28,11 @@ RUN_DEPENDS+= p5-MIME-Types>=0:${PORTSDI PAPERSIZE?= letter RUN_DEPENDS+= enscript:${PORTSDIR}/print/enscript-${PAPERSIZE} -PKGNAMESUFFIX= 3 CONFLICTS= cvsweb-2.* USES= perl5 NO_BUILD= yes -NO_STAGE= yes .include # Specify where your repository belongs. @@ -51,9 +50,9 @@ CGIDIR?= www/cgi-bin ICONSDIR?= www/icons CSSDIR?= www/data/css .elif exists(${PREFIX}/www/apache22/cgi-bin) -CGIDIR?= www/apache22/cgi-bin -ICONSDIR?= www/apache22/icons -CSSDIR?= www/apache22/data/css +CGIDIR?= www/apache22/cgi-bin +ICONSDIR?= www/apache22/icons +CSSDIR?= www/apache22/data/css .elif exists(${PREFIX}/apache/cgi-bin) CGIDIR?= apache/cgi-bin ICONSDIR?= apache/icons @@ -85,31 +84,23 @@ post-patch: ${WRKSRC}/cvsweb.conf do-install: - ${MKDIR} ${PREFIX}/${CGIDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${PREFIX}/${CGIDIR}/ - ${MKDIR} ${PREFIX}/etc/cvsweb + @${MKDIR} ${STAGEDIR}${PREFIX}/${CGIDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${STAGEDIR}${PREFIX}/${CGIDIR}/ + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/cvsweb .for f in ${CONFFILES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/etc/cvsweb/${f}.dist + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/etc/cvsweb/${f}.dist .endfor - ${MKDIR} ${PREFIX}/${ICONSDIR}/cvsweb - ${INSTALL_DATA} ${WRKSRC}/icons/* ${PREFIX}/${ICONSDIR}/cvsweb/ - ${MKDIR} ${PREFIX}/${CSSDIR}/cvsweb - ${INSTALL_DATA} ${WRKSRC}/css/*.css ${PREFIX}/${CSSDIR}/cvsweb/ - ${MKDIR} ${PREFIX}/share/enscript/hl - ${INSTALL_DATA} ${WRKSRC}/enscript/*.st ${PREFIX}/share/enscript/hl/ -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${ICONSDIR}/cvsweb + ${INSTALL_DATA} ${WRKSRC}/icons/* ${STAGEDIR}${PREFIX}/${ICONSDIR}/cvsweb/ + @${MKDIR} ${STAGEDIR}${PREFIX}/${CSSDIR}/cvsweb + ${INSTALL_DATA} ${WRKSRC}/css/*.css ${STAGEDIR}${PREFIX}/${CSSDIR}/cvsweb/ + @${MKDIR} ${STAGEDIR}${PREFIX}/share/enscript/hl + ${INSTALL_DATA} ${WRKSRC}/enscript/*.st ${STAGEDIR}${PREFIX}/share/enscript/hl/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ChangeLog INSTALL NEWS README TODO - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/samples/* ${EXAMPLESDIR}/ -.endif - -post-install: -.if defined(PACKAGE_BUILDING) - ${ECHO_CMD} "@unexec rmdir -p %D/${CGIDIR} %D/${ICONSDIR} %D/${CSSDIR} 2>/dev/null || true" >> ${TMPPLIST} -.endif - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR}/ .include Modified: head/devel/cvsweb3/pkg-plist ============================================================================== --- head/devel/cvsweb3/pkg-plist Sun Jul 27 19:52:16 2014 (r363098) +++ head/devel/cvsweb3/pkg-plist Sun Jul 27 20:12:42 2014 (r363099) @@ -10,8 +10,7 @@ etc/cvsweb/cvsweb.conf-ruby.dist %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTDOCS%%%%EXAMPLESDIR%%/cvsweb-httpd.conf -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvsweb-httpd.conf %%CGIDIR%%/cvsweb.cgi %%ICONSDIR%%/cvsweb/back.gif %%ICONSDIR%%/cvsweb/binary.gif @@ -21,9 +20,14 @@ etc/cvsweb/cvsweb.conf-ruby.dist %%ICONSDIR%%/cvsweb/minigraph.png %%ICONSDIR%%/cvsweb/minitext.gif %%ICONSDIR%%/cvsweb/text.gif +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% @dirrm %%ICONSDIR%%/cvsweb %%CSSDIR%%/cvsweb/cvsweb.css @dirrm %%CSSDIR%%/cvsweb share/enscript/hl/lang_cvsweb.st share/enscript/hl/lang_cvsweb_diff.st -@dirrmtry share/enscript/hl +@dirrmtry %%CGIDIR%% +@dirrmtry %%CSSDIR%% +@dirrmtry share/apache/data +@dirrmtry %%ICONSDIR%% +@dirrmtry share/apache