Date: Tue, 20 May 2014 00:49:57 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189977: [patch] Add staging support to www/amphetadesk Message-ID: <201405200049.s4K0nvLL007453@cgiserv.freebsd.org> Resent-Message-ID: <201405200050.s4K0o00H094147@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189977
>Category: ports
>Synopsis: [patch] Add staging support to www/amphetadesk
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 20 00:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Joseph Benden
>Release: FreeBSD 11
>Organization:
>Environment:
FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014 root@lucy:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Adds staging support to www/amphetadesk.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/amphetadesk/Makefile b/www/amphetadesk/Makefile
index 2d6dc42..8a3d5d5 100644
--- a/www/amphetadesk/Makefile
+++ b/www/amphetadesk/Makefile
@@ -25,7 +25,7 @@ LICENSE_NAME= The Clarified Artistic License
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LICENSE_FILE= ${WRKSRC}/docs/LICENSE
-USE= perl5
+USES= perl5
USE_RC_SUBR= ${PORTNAME}
NO_BUILD= yes
@@ -40,7 +40,6 @@ PORTDOCS= \
*
.endif
-NO_STAGE= yes
.include <bsd.port.pre.mk>
post-patch:
@@ -71,49 +70,49 @@ post-configure:
do-install:
## create site_perl
# dirs
- @${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk
+ @${MKDIR} ${STAGEDIR}${SITE_PERL}/AmphetaDesk
@cd ${WRKSRC}/lib && \
${FIND} * -type d ! -empty -print0 | \
${XARGS} -0 -x -n 10 -I {} \
- ${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk/{}
+ ${MKDIR} ${STAGEDIR}/${SITE_PERL}/AmphetaDesk/{}
# files
@cd ${WRKSRC}/lib && \
${FIND} * -type f -name "*pm" -print0 | \
${XARGS} -0 -x -n 10 -I {} \
- ${INSTALL_DATA} {} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk/{}
+ ${INSTALL_DATA} {} ${STAGEDIR}/${SITE_PERL}/AmphetaDesk/{}
# script
@${INSTALL_DATA} ${WRKSRC}/AmphetaDesk.pl \
- ${PREFIX}/bin/AmphetaDesk-real
+ ${STAGEDIR}${PREFIX}/bin/AmphetaDesk-real
@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
- ${PREFIX}/bin/AmphetaDesk
+ ${STAGEDIR}${PREFIX}/bin/AmphetaDesk
## docs
.ifndef(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
.for ext in html txt xml
- @${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${STAGEDIR}${DOCSDIR}
.endfor
- @${MKDIR} ${DOCSDIR}/images
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/images
.for ext in gif jpg
@${INSTALL_DATA} ${WRKSRC}/docs/images/*.${ext} \
- ${DOCSDIR}/images
+ ${STAGEDIR}${DOCSDIR}/images
.endfor
.endif
## lists
- @${MKDIR} ${DATADIR}/lists
+ @${MKDIR} ${STAGEDIR}${DATADIR}/lists
@${INSTALL_DATA} ${WRKSRC}/data/lists/services-channels-recent.xml \
- ${DATADIR}/lists
+ ${STAGEDIR}${DATADIR}/lists
## templates
# dirs
@cd ${WRKSRC} && \
${FIND} templates -type d ! -empty -print0 | \
${XARGS} -0 -x -n 10 -I {} \
- ${MKDIR} ${DATADIR}/{}
+ ${MKDIR} ${STAGEDIR}${DATADIR}/{}
# files
.for ext in gif html ico png pict
@cd ${WRKSRC} && \
${FIND} templates -type f -name "*.${ext}" -print0 | \
${XARGS} -0 -x -n 10 -I {} \
- ${INSTALL_DATA} {} ${DATADIR}/{}
+ ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{}
.endfor
.include <bsd.port.post.mk>
diff --git a/www/amphetadesk/pkg-plist b/www/amphetadesk/pkg-plist
index aea8688..23b5254 100644
--- a/www/amphetadesk/pkg-plist
+++ b/www/amphetadesk/pkg-plist
@@ -51,6 +51,3 @@ bin/AmphetaDesk-real
@dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk/OS
@dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk
@dirrm %%SITE_PERL%%/AmphetaDesk
-@dirrmtry %%SITE_PERL%%
-@dirrmtry lib/perl5/site_perl
-@dirrmtry lib/perl5
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405200049.s4K0nvLL007453>