From ae661403ff9958aceb444717c4fcb759370fffae Mon Sep 17 00:00:00 2001 From: jadawin Date: Fri, 27 Dec 2013 09:54:22 +0000 Subject: - Support stage and options --- archivers/makeself/Makefile | 14 ++++++++------ audio/ampache/Makefile | 22 ++++++++-------------- audio/ampache/pkg-plist | 5 +++++ deskutils/remind/Makefile | 25 +++++++++++++------------ devel/perlconsole/Makefile | 17 +++++++++-------- 5 files changed, 43 insertions(+), 40 deletions(-) diff --git a/archivers/makeself/Makefile b/archivers/makeself/Makefile index e49d064..f0d9a48 100644 --- a/archivers/makeself/Makefile +++ b/archivers/makeself/Makefile @@ -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 diff --git a/audio/ampache/Makefile b/audio/ampache/Makefile index 550771a..1a1f056 100644 --- a/audio/ampache/Makefile +++ b/audio/ampache/Makefile @@ -14,7 +14,6 @@ USE_PHP= mysql pcre session iconv hash gettext mbstring 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 diff --git a/audio/ampache/pkg-plist b/audio/ampache/pkg-plist index 3f65b1c..c5da936 100644 --- a/audio/ampache/pkg-plist +++ b/audio/ampache/pkg-plist @@ -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 diff --git a/deskutils/remind/Makefile b/deskutils/remind/Makefile index d16037d..681052b 100644 --- a/deskutils/remind/Makefile +++ b/deskutils/remind/Makefile @@ -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 diff --git a/devel/perlconsole/Makefile b/devel/perlconsole/Makefile index eeb9cc6..d050941 100644 --- a/devel/perlconsole/Makefile +++ b/devel/perlconsole/Makefile @@ -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 -- cgit v1.1