From 077a2ed61fbf3d68e8bfa9d9eb093997045275a0 Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Sun, 8 Jun 2014 09:07:34 +0000 Subject: [PATCH] Stagify, employ OPTIONS helpers and @sample keyword in pkg-plist. --- graphics/renrot/Makefile | 23 ++++++++--------------- graphics/renrot/pkg-plist | 9 +++++---- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/graphics/renrot/Makefile b/graphics/renrot/Makefile index b996cb21a076..8e02a0b37018 100644 --- a/graphics/renrot/Makefile +++ b/graphics/renrot/Makefile @@ -17,27 +17,20 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} jpegtran:${PORTSDIR}/graphics/jpeg USES= perl5 USE_PERL5= configure +PORTDOCS= AUTHORS README README.russian ChangeLog NEWS TODO + OPTIONS_DEFINE= IMAGEMAGICK DOCS IMAGEMAGICK_DESC= Image::Magick Perl module support -MAN1= ${PORTNAME}.1 -PORTDOCS= AUTHORS README README.russian ChangeLog NEWS TODO - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MIMAGEMAGICK} -RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick -.endif +IMAGEMAGICK_RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick post-install: - @${MKDIR} ${ETCDIR} + @${MKDIR} ${STAGEDIR}${ETCDIR} .for conf in colors.conf copyright.tag renrot.conf tags.conf - ${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${ETCDIR}/${conf}.sample + ${INSTALL_DATA} ${WRKSRC}/etc/${conf} \ + ${STAGEDIR}${ETCDIR}/${conf}.sample .endfor -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include diff --git a/graphics/renrot/pkg-plist b/graphics/renrot/pkg-plist index 0a8e446449bc..effbc0978e6b 100644 --- a/graphics/renrot/pkg-plist +++ b/graphics/renrot/pkg-plist @@ -1,9 +1,10 @@ bin/renrot -etc/renrot/colors.conf.sample -etc/renrot/copyright.tag.sample -etc/renrot/renrot.conf.sample -etc/renrot/tags.conf.sample +@sample etc/renrot/colors.conf.sample +@sample etc/renrot/copyright.tag.sample +@sample etc/renrot/renrot.conf.sample +@sample etc/renrot/tags.conf.sample @dirrm etc/renrot +man/man1/renrot.1.gz %%SITE_PERL%%/%%PERL_ARCH%%/auto/renrot/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/renrot %%SITE_PERL%%/Image/RenRot/Config.pm