From owner-svn-ports-all@FreeBSD.ORG Fri Dec 27 09:54:24 2013 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 01ED429E; Fri, 27 Dec 2013 09:54:24 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E113A114D; Fri, 27 Dec 2013 09:54:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBR9sNFJ063487; Fri, 27 Dec 2013 09:54:23 GMT (envelope-from jadawin@svn.freebsd.org) Received: (from jadawin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBR9sMF6063482; Fri, 27 Dec 2013 09:54:22 GMT (envelope-from jadawin@svn.freebsd.org) Message-Id: <201312270954.rBR9sMF6063482@svn.freebsd.org> From: Philippe Audeoud Date: Fri, 27 Dec 2013 09:54:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337673 - in head: archivers/makeself audio/ampache deskutils/remind devel/perlconsole 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.17 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, 27 Dec 2013 09:54:24 -0000 Author: jadawin Date: Fri Dec 27 09:54:22 2013 New Revision: 337673 URL: http://svnweb.freebsd.org/changeset/ports/337673 Log: - Support stage and options Modified: head/archivers/makeself/Makefile (contents, props changed) head/audio/ampache/Makefile head/audio/ampache/pkg-plist (contents, props changed) head/deskutils/remind/Makefile (contents, props changed) head/devel/perlconsole/Makefile Modified: head/archivers/makeself/Makefile ============================================================================== --- head/archivers/makeself/Makefile Fri Dec 27 09:52:53 2013 (r337672) +++ head/archivers/makeself/Makefile Fri Dec 27 09:54:22 2013 (r337673) @@ -18,25 +18,27 @@ EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= --nox11 --target ${WRKSRC} NO_BUILD= yes -NO_STAGE= yes PLIST_FILES= bin/makeself bin/makeself-header \ bin/makeself-header.sh bin/makeself.sh PORTDOCS= README +.include + post-patch: @${REINPLACE_CMD} -e \ 's|#!/bin/sh|#!${LOCALBASE}/bin/bash|g' ${WRKSRC}/makeself.sh do-install: .for i in makeself makeself-header - ${INSTALL_SCRIPT} ${WRKSRC}/${i}.sh ${PREFIX}/bin - @${LN} -sf ${i}.sh ${PREFIX}/bin/${i} + ${INSTALL_SCRIPT} ${WRKSRC}/${i}.sh ${STAGEDIR}${PREFIX}/bin + @${LN} -sf ${i}.sh ${STAGEDIR}${PREFIX}/bin/${i} .endfor -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif .include Modified: head/audio/ampache/Makefile ============================================================================== --- head/audio/ampache/Makefile Fri Dec 27 09:52:53 2013 (r337672) +++ head/audio/ampache/Makefile Fri Dec 27 09:54:22 2013 (r337673) @@ -14,7 +14,6 @@ USE_PHP= mysql pcre session iconv hash g WANT_PHP_WEB= yes NO_BUILD= yes -NO_STAGE= yes USES= gettext PKGDEINSTALL= ${WRKDIR}/pkg-deinstall @@ -25,25 +24,20 @@ SUB_LIST= PORTNAME=${PORTNAME} \ WWWOWN=${WWWOWN} \ WWWGROUP=${WWWGROUP} -MAN1= ampache.1 -MANCOMPRESSED= no - PORTDOCS= CHANGELOG README MIGRATION INSTALL +.include + do-install: - @${MKDIR} ${WWWDIR} - ${INSTALL_MAN} ${WRKSRC}/docs/man/man1/ampache.1 ${MAN1PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${WWWDIR} + ${INSTALL_MAN} ${WRKSRC}/docs/man/man1/ampache.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/docs/${doc} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/${doc} ${STAGEDIR}${DOCSDIR} .endfor .endif ${RM} -rf ${WRKSRC}/docs/man - (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${WWWDIR}) - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - -post-install: - @${CAT} ${PKGMESSAGE} + (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR} "! -name *.orig") .include Modified: head/audio/ampache/pkg-plist ============================================================================== --- head/audio/ampache/pkg-plist Fri Dec 27 09:52:53 2013 (r337672) +++ head/audio/ampache/pkg-plist Fri Dec 27 09:54:22 2013 (r337673) @@ -1,3 +1,7 @@ +@owner %%WWWOWN%% +@group %%WWWGROUP%% +@owner %%WWWOWN%% +@group %%WWWGROUP%% %%WWWDIR%%/admin/access.php %%WWWDIR%%/admin/catalog.php %%WWWDIR%%/admin/duplicates.php @@ -583,6 +587,7 @@ %%WWWDIR%%/themes/penguin/theme.cfg.php %%WWWDIR%%/update.php %%WWWDIR%%/util.php +man/man1/ampache.1.gz @dirrm %%WWWDIR%%/themes/penguin/templates @dirrm %%WWWDIR%%/themes/penguin/images/ratings @dirrm %%WWWDIR%%/themes/penguin/images/icons Modified: head/deskutils/remind/Makefile ============================================================================== --- head/deskutils/remind/Makefile Fri Dec 27 09:52:53 2013 (r337672) +++ head/deskutils/remind/Makefile Fri Dec 27 09:54:22 2013 (r337673) @@ -18,17 +18,18 @@ OPTIONS_DEFINE= TCLTK GNU_CONFIGURE= yes MAKE_ARGS= INSTALL_SCRIPT="${INSTALL_SCRIPT}" -MAN1= rem.1 rem2ps.1 remind.1 +PLIST_FILES= bin/rem \ + bin/rem2ps \ + bin/remind \ + man/man1/rem.1.gz \ + man/man1/rem2ps.1.gz \ + man/man1/remind.1.gz -PLIST_FILES= bin/rem bin/rem2ps bin/remind - -NO_STAGE= yes .include .if ${PORT_OPTIONS:MTCLTK} USE_TK= yes RUN_DEPENDS+= dtplite:${PORTSDIR}/devel/tcllib -MAN1+= cm2rem.1 tkremind.1 PLIST_FILES+= bin/cm2rem.tcl bin/tkremind .endif @@ -65,16 +66,16 @@ post-patch: do-install: .for i in rem2ps remind - ${INSTALL_PROGRAM} ${WRKSRC}/src/${i} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/${i}.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/src/${i} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/${i}.1 ${STAGEDIR}${PREFIX}/man/man1 .endfor - ${INSTALL_MAN} ${WRKSRC}/man/rem.1 ${PREFIX}/man/man1 - ${LN} -sf ${PREFIX}/bin/remind ${PREFIX}/bin/rem + ${INSTALL_MAN} ${WRKSRC}/man/rem.1 ${STAGEDIR}${PREFIX}/man/man1 + ${LN} -sf ${PREFIX}/bin/remind ${STAGEDIR}${PREFIX}/bin/rem .if ${PORT_OPTIONS:MTCLTK} - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/cm2rem.tcl ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/tkremind ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/cm2rem.tcl ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/tkremind ${STAGEDIR}${PREFIX}/bin .for i in cm2rem tkremind - ${INSTALL_MAN} ${WRKSRC}/man/${i}.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/${i}.1 ${STAGEDIR}${PREFIX}/man/man1 .endfor .endif Modified: head/devel/perlconsole/Makefile ============================================================================== --- head/devel/perlconsole/Makefile Fri Dec 27 09:52:53 2013 (r337672) +++ head/devel/perlconsole/Makefile Fri Dec 27 09:54:22 2013 (r337673) @@ -32,19 +32,20 @@ PLIST_FILES= bin/perlconsole \ PLIST_DIRS= ${SITE_PERL_REL}/PerlConsole -NO_STAGE= yes +.include + do-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README AUTHORS CHANGES - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif - ${MKDIR} ${PREFIX}/${SITE_PERL_REL}/PerlConsole/ + ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/PerlConsole/ ${CP} -R ${WRKSRC}/lib/PerlConsole/ \ - ${PREFIX}/${SITE_PERL_REL}/PerlConsole/ + ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/PerlConsole/ ${CP} ${WRKSRC}/lib/PerlConsole.pm \ - ${PREFIX}/${SITE_PERL_REL}/PerlConsole.pm - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ + ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/PerlConsole.pm + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ .include