From owner-svn-ports-all@FreeBSD.ORG Sun Jun 15 08:36:20 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 1585FBE6; Sun, 15 Jun 2014 08:36:20 +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 EB02A2E99; Sun, 15 Jun 2014 08:36:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5F8aJqm006217; Sun, 15 Jun 2014 08:36:19 GMT (envelope-from sbz@svn.freebsd.org) Received: (from sbz@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5F8aJBa006215; Sun, 15 Jun 2014 08:36:19 GMT (envelope-from sbz@svn.freebsd.org) Message-Id: <201406150836.s5F8aJBa006215@svn.freebsd.org> From: Sofian Brabez Date: Sun, 15 Jun 2014 08:36:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357840 - head/www/roundup 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: Sun, 15 Jun 2014 08:36:20 -0000 Author: sbz Date: Sun Jun 15 08:36:19 2014 New Revision: 357840 URL: http://svnweb.freebsd.org/changeset/ports/357840 QAT: https://qat.redports.org/buildarchive/r357840/ Log: - Support STAGEDIR Modified: head/www/roundup/Makefile head/www/roundup/pkg-plist Modified: head/www/roundup/Makefile ============================================================================== --- head/www/roundup/Makefile Sun Jun 15 08:35:09 2014 (r357839) +++ head/www/roundup/Makefile Sun Jun 15 08:36:19 2014 (r357840) @@ -18,7 +18,6 @@ USE_PYDISTUTILS=yes OPTIONS_DEFINE= SQLITE PGSQL MYSQL NLS OPTIONS_DEFAULT=SQLITE NLS -NO_STAGE= yes .include .if ${PORT_OPTIONS:MSQLITE} @@ -39,22 +38,16 @@ PLIST_SUB+= NLS="" PLIST_SUB+= NLS="@comment " .endif -.if !defined(NO_INSTALL_MANPAGES) -MAN1= roundup-admin.1 roundup-demo.1 roundup-mailgw.1 \ - roundup-server.1 -MANCOMPRESSED= no -.endif - SCRIPTS= roundup-admin roundup-demo roundup-gettext roundup-mailgw \ roundup-server roundup-xmlrpc-server post-install: - @${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/build/scripts-${PYTHON_VER}/,} ${PREFIX}/bin -.if !defined(NO_INSTALL_MANPAGES) - @${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/share/man/man1/,} ${MAN1PREFIX}/man/man1 -.endif + ${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/build/scripts-${PYTHON_VER}/,} ${STAGEDIR}${PREFIX}/bin +.for f in roundup-admin roundup-demo roundup-mailgw roundup-server + ${INSTALL_MAN} ${WRKSRC}/share/man/man1/${f}.1 ${STAGEDIR}${PREFIX}/man/man1 +.endfor .if ${PORT_OPTIONS:MNLS} - @(cd ${WRKSRC}/build/share/locale/ && ${COPYTREE_SHARE} \* ${PREFIX}/share/locale/) + @(cd ${WRKSRC}/build/share/locale/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share/locale/) .endif .include Modified: head/www/roundup/pkg-plist ============================================================================== --- head/www/roundup/pkg-plist Sun Jun 15 08:35:09 2014 (r357839) +++ head/www/roundup/pkg-plist Sun Jun 15 08:36:19 2014 (r357840) @@ -4,6 +4,10 @@ bin/roundup-gettext bin/roundup-mailgw bin/roundup-server bin/roundup-xmlrpc-server +man/man1/roundup-admin.1.gz +man/man1/roundup-demo.1.gz +man/man1/roundup-mailgw.1.gz +man/man1/roundup-server.1.gz %%PYTHON_SITELIBDIR%%/roundup/__init__.py %%PYTHON_SITELIBDIR%%/roundup/__init__.pyc %%PYTHON_SITELIBDIR%%/roundup/__init__.pyo @@ -498,17 +502,17 @@ bin/roundup-xmlrpc-server @dirrm %%DATADIR%%/templates/responsive/extensions @dirrm %%DATADIR%%/templates/responsive/detectors @dirrm %%DATADIR%%/templates/responsive -@dirrm %%DATADIR%%/templates/minimal/static +@dirrmtry %%DATADIR%%/templates/minimal/static @dirrm %%DATADIR%%/templates/minimal/html @dirrm %%DATADIR%%/templates/minimal/extensions @dirrm %%DATADIR%%/templates/minimal/detectors @dirrm %%DATADIR%%/templates/minimal -@dirrm %%DATADIR%%/templates/devel/static +@dirrmtry %%DATADIR%%/templates/devel/static @dirrm %%DATADIR%%/templates/devel/html @dirrm %%DATADIR%%/templates/devel/detectors @dirrm %%DATADIR%%/templates/devel/extensions @dirrm %%DATADIR%%/templates/devel -@dirrm %%DATADIR%%/templates/classic/static +@dirrmtry %%DATADIR%%/templates/classic/static @dirrm %%DATADIR%%/templates/classic/html @dirrm %%DATADIR%%/templates/classic/extensions @dirrm %%DATADIR%%/templates/classic/detectors