From 38c1ceb6758e436499344aa9691116d20fafe4a0 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Fri, 4 Jul 2014 00:56:57 +0000 Subject: [PATCH] Remove NOPORTDOCS and NOPORTEXAMPLES. --- misc/colortail/Makefile | 4 ++-- misc/colortail/pkg-plist | 12 ++++++------ misc/elscreen/Makefile | 4 ++-- misc/lr/Makefile | 4 ++-- misc/p5-Business-UPS/Makefile | 4 ++-- misc/p5-Business-UPS/pkg-plist | 4 ++-- misc/pipe/Makefile | 6 ++---- misc/py-osd/Makefile | 4 ++-- 8 files changed, 20 insertions(+), 22 deletions(-) diff --git a/misc/colortail/Makefile b/misc/colortail/Makefile index 748d315b6a09..77ffebaa8dad 100644 --- a/misc/colortail/Makefile +++ b/misc/colortail/Makefile @@ -13,12 +13,12 @@ LICENCE= GPLv2 GNU_CONFIGURE= yes +OPTIONS_DEFINE= EXAMPLES + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/colortail ${STAGEDIR}${PREFIX}/bin -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/example-conf/conf* ${STAGEDIR}${EXAMPLESDIR} -.endif .include diff --git a/misc/colortail/pkg-plist b/misc/colortail/pkg-plist index 07c68256a952..560eda7b8ca7 100644 --- a/misc/colortail/pkg-plist +++ b/misc/colortail/pkg-plist @@ -1,7 +1,7 @@ bin/colortail -%%PORTDOCS%%%%EXAMPLESDIR%%/conf.daemon -%%PORTDOCS%%%%EXAMPLESDIR%%/conf.kernel -%%PORTDOCS%%%%EXAMPLESDIR%%/conf.messages -%%PORTDOCS%%%%EXAMPLESDIR%%/conf.secure -%%PORTDOCS%%%%EXAMPLESDIR%%/conf.xferlog -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf.daemon +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf.kernel +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf.messages +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf.secure +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf.xferlog +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile index ee31af8f99b4..c961dfbf45e6 100644 --- a/misc/elscreen/Makefile +++ b/misc/elscreen/Makefile @@ -24,12 +24,12 @@ RUN_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/e EMACS_NO_BUILD_DEPENDS= YES NO_BUILD= YES +OPTIONS_DEFINE= DOCS + do-install: ${INSTALL_DATA} ${WRKSRC}/elscreen.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ChangeLog README ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include diff --git a/misc/lr/Makefile b/misc/lr/Makefile index 4fa28607f883..b5be4e34fc7f 100644 --- a/misc/lr/Makefile +++ b/misc/lr/Makefile @@ -10,6 +10,8 @@ DISTNAME= lazyread-${PORTVERSION} MAINTAINER= mich@FreeBSD.org COMMENT= Lazyread can auto-scroll files on your screen in movie credit fashion +OPTIONS_DEFINE= DOCS + .include .if exists(/usr/bin/lesspipe.sh) @@ -42,9 +44,7 @@ do-install: ${INSTALL_SCRIPT} ${FILESDIR}/lesspipe.sh ${STAGEDIR}${PREFIX}/bin .endif -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/misc/p5-Business-UPS/Makefile b/misc/p5-Business-UPS/Makefile index 4733d8992658..d1fc21236e7d 100644 --- a/misc/p5-Business-UPS/Makefile +++ b/misc/p5-Business-UPS/Makefile @@ -17,10 +17,10 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 USE_PERL5= configure +OPTIONS_DEFINE= EXAMPLES + post-install: -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} -.endif .include diff --git a/misc/p5-Business-UPS/pkg-plist b/misc/p5-Business-UPS/pkg-plist index aff34c4aec1c..b76615118285 100644 --- a/misc/p5-Business-UPS/pkg-plist +++ b/misc/p5-Business-UPS/pkg-plist @@ -2,8 +2,8 @@ %%SITE_PERL%%/Business/UPS.pm %%SITE_PERL%%/auto/Business/UPS/autosplit.ix %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/UPS/.packlist -%%PORTDOCS%%%%EXAMPLESDIR%%/test.pl -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.pl +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/UPS @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business @dirrmtry %%SITE_PERL%%/auto/Business/UPS diff --git a/misc/pipe/Makefile b/misc/pipe/Makefile index 34bd868d7988..6f9bf034372a 100644 --- a/misc/pipe/Makefile +++ b/misc/pipe/Makefile @@ -18,9 +18,9 @@ JAVA_VERSION= 1.6+ SUB_FILES= pipe.sh -.if !defined(NOPORTDOCS) +OPTIONS_DEFINE= DOCS + PORTDOCS=* -.endif do-install: ${INSTALL_SCRIPT} ${WRKDIR}/pipe.sh ${STAGEDIR}${PREFIX}/bin/pipe @@ -29,11 +29,9 @@ do-install: ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} \; cd ${WRKSRC} && \ ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \; -.if !defined(NOPORTDOCS) cd ${WRKSRC}/Docs && \ ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/javadoc/{} \; cd ${WRKSRC}/Docs && \ ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/javadoc/{} \; -.endif .include diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile index ee379347ba45..a143d443e3c0 100644 --- a/misc/py-osd/Makefile +++ b/misc/py-osd/Makefile @@ -22,15 +22,15 @@ PYDISTUTILS_AUTOPLIST= yes PORTDOCS= AUTHORS ChangeLog ChangeLog.old README README.daemon pyosd.html DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} +OPTIONS_DEFINE= DOCS + post-patch: @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/setup.py post-install: -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include