Remove NOPORTDOCS and NOPORTEXAMPLES.

10 files changed, 63 insertions, 63 deletions

diff --git a/lang/dmd2/Makefile b/lang/dmd2/Makefile
index 0b35a7eb14e7..681a171b7998 100644
--- a/lang/dmd2/Makefile
+++ b/lang/dmd2/Makefile
@@ -23,6 +23,8 @@ LICENSE_NAME_DMD=	Digital Mars license
 LICENSE_FILE_DMD=	${WRKSRC}/backendlicense.txt
 LICENSE_PERMS_DMD=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 800000
@@ -96,7 +98,6 @@ do-install:
 	cd ${WRKSRC}/../phobos && ${COPYTREE_SHARE} std ${STAGEDIR}${MODULEDIR}
 	${MKDIR} ${STAGEDIR}${MODULEDIR}/../druntime
 	cd ${WRKSRC}/../druntime && ${COPYTREE_SHARE} import ${STAGEDIR}${MODULEDIR}/../druntime
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR}/dmd2 && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
@@ -104,6 +105,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/../druntime/LICENSE ${STAGEDIR}${DOCSDIR}/druntime
 	${INSTALL_DATA} ${WRKSRC}/../druntime/README.md ${STAGEDIR}${DOCSDIR}/druntime
 	cd ${WRKSRC}/../druntime && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR}/druntime
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/elan/Makefile b/lang/elan/Makefile
index 4c48ae035622..74d75eefb604 100644
--- a/lang/elan/Makefile
+++ b/lang/elan/Makefile
@@ -18,16 +18,14 @@ USES=		gmake libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liberts.so.1.0.7
-.if !defined (NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/manuals/compiler/comp.ps \
 		${STAGEDIR}${DOCSDIR}/elan-compiler.ps
 	${INSTALL_DATA} ${WRKSRC}/manuals/language/elan.ps \
 		${STAGEDIR}${DOCSDIR}/elan-language.ps
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/ici/Makefile b/lang/ici/Makefile
index 28950f877899..3463c9a354da 100644
--- a/lang/ici/Makefile
+++ b/lang/ici/Makefile
@@ -16,6 +16,8 @@ ALL_TARGET=	all ici.h
 ICIHDRS=	ici.h icistr-setup.h
 ICIDOCS=	doc/ici.pdf
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ici ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/libici4.a ${STAGEDIR}${PREFIX}/lib
@@ -29,11 +31,9 @@ do-install:
 .for f in ${ICIHDRS}
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${PREFIX}/include
 .endfor
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ici4
 .for f in ${ICIDOCS}
 	${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${PREFIX}/share/doc/ici4
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index a38867a056a3..d245854723e1 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -20,6 +20,8 @@ ICONDIR=	${PREFIX}/lib/${PORTNAME}
 BINS=		icont iconx
 BINXS=		colrbook colrpick fontpick palette vib wevents xgamma
 
+OPTIONS_DEFINE=	DOCS
+
 .if defined(WITHOUT_X11)
 CONFIG_CMD=	Configure
 PLIST_SUB=	WITHOUT_X11="@comment "
@@ -64,10 +66,8 @@ do-install:
 .endfor
 	@${LN} -sf ${ICONDIR}/bin/vib ${STAGEDIR}${PREFIX}/bin/vib
 .endif
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.* ${STAGEDIR}${DOCSDIR}
-.endif
 
 .if defined(MAINTAINER_MODE)
 test:	install
diff --git a/lang/libhx/Makefile b/lang/libhx/Makefile
index 6de4104f8ec6..35f62154fef6 100644
--- a/lang/libhx/Makefile
+++ b/lang/libhx/Makefile
@@ -18,14 +18,16 @@ GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS+=--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:tl}
-.endif
+
+.include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's| -lrt||g' ${WRKSRC}/src/Makefile.in
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 	${REINPLACE_CMD} -e 's|libHX_Documentation.pdf||' \
 	   ${WRKSRC}/doc/Makefile.in ${WRKSRC}/doc/Makefile.am
 .endif
diff --git a/lang/nesasm/Makefile b/lang/nesasm/Makefile
index 4d6d873a83b3..fa15cf2113a6 100644
--- a/lang/nesasm/Makefile
+++ b/lang/nesasm/Makefile
@@ -11,9 +11,11 @@ DISTNAME=	nbasic_2004_03_14
 MAINTAINER=	ninjin@kth.se
 COMMENT=	The nesasm assembler is a 6502 assembler with specific NES support
 
-WRKSRC=	${WRKDIR}/nbasic_2004_03_14/source/${PORTNAME}/source/
+WRKSRC=		${WRKDIR}/nbasic_2004_03_14/source/${PORTNAME}/source/
 USES=		zip
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/^CC/s/=/?=/' \
 		-e '/^CFLAGS/{s/=/+=/;s/-O2//;}' \
@@ -21,11 +23,9 @@ post-patch:	.SILENT
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nesasm ${STAGEDIR}${PREFIX}/bin
-.ifndef(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}../documentation/*.txt ${STAGEDIR}${DOCSDIR}
 	# The next install will overwrite readme.txt with a newer readme.txt
 	${INSTALL_DATA} ${WRKSRC}../readme.txt ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/lang/ptoc/Makefile b/lang/ptoc/Makefile
index 5a65f628d8c3..3064b95b59ee 100644
--- a/lang/ptoc/Makefile
+++ b/lang/ptoc/Makefile
@@ -22,6 +22,8 @@ EXAMPLES=	arr.pas bgidemo.pas ccall.pas coord.txt dos.h dos.pas \
 		vibrkinp.pas vibrkinp.txt vibrtabl.pas war2.pas war2.txt \
 		xy2.txt xy2orig.txt
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 pre-build:
 	@${LN} -sf makefile.bsd ${WRKSRC}/Makefile
 	@${LN} -sf makefile.bsd ${WRKSRC}/Xbgi/Makefile
@@ -44,9 +46,7 @@ do-install:
 .for f in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Readme.htm ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/lang/ptoc/pkg-plist b/lang/ptoc/pkg-plist
index bdabdd6dbee7..46f2d45db906 100644
--- a/lang/ptoc/pkg-plist
+++ b/lang/ptoc/pkg-plist
@@ -10,44 +10,44 @@ include/ptoc/set.h
 lib/libXbgi.a
 lib/libptoc.a
 %%PORTDOCS%%%%DOCSDIR%%/Readme.htm
-%%EXAMPLESDIR%%/arr.pas
-%%EXAMPLESDIR%%/bgidemo.pas
-%%EXAMPLESDIR%%/ccall.pas
-%%EXAMPLESDIR%%/coord.txt
-%%EXAMPLESDIR%%/dos.h
-%%EXAMPLESDIR%%/dos.pas
-%%EXAMPLESDIR%%/func.pas
-%%EXAMPLESDIR%%/hello.pas
-%%EXAMPLESDIR%%/impact.pas
-%%EXAMPLESDIR%%/lister.pas
-%%EXAMPLESDIR%%/makefile.bsd
-%%EXAMPLESDIR%%/nested.pas
-%%EXAMPLESDIR%%/objpas.pas
-%%EXAMPLESDIR%%/polut2.pas
-%%EXAMPLESDIR%%/printer.pas
-%%EXAMPLESDIR%%/q2.txt
-%%EXAMPLESDIR%%/random.txt
-%%EXAMPLESDIR%%/rename.cxx
-%%EXAMPLESDIR%%/rename.pas
-%%EXAMPLESDIR%%/set.pas
-%%EXAMPLESDIR%%/str.pas
-%%EXAMPLESDIR%%/test.c
-%%EXAMPLESDIR%%/test.cxx
-%%EXAMPLESDIR%%/test.pas
-%%EXAMPLESDIR%%/test.txt
-%%EXAMPLESDIR%%/tpascal.pas
-%%EXAMPLESDIR%%/trinor.pas
-%%EXAMPLESDIR%%/vibrkinp.pas
-%%EXAMPLESDIR%%/vibrkinp.txt
-%%EXAMPLESDIR%%/vibrtabl.pas
-%%EXAMPLESDIR%%/war2.pas
-%%EXAMPLESDIR%%/war2.txt
-%%EXAMPLESDIR%%/xy2.txt
-%%EXAMPLESDIR%%/xy2orig.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arr.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgidemo.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ccall.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coord.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dos.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dos.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/func.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/impact.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lister.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile.bsd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nested.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/objpas.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/polut2.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printer.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/q2.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/random.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rename.cxx
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rename.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/set.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/str.pas
+%%PORTEXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.cxx
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tpascal.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trinor.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vibrkinp.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vibrkinp.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vibrtabl.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/war2.pas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/war2.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xy2.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xy2orig.txt
 %%DATADIR%%/graph.pas
 %%DATADIR%%/ptoc.pas
 %%DATADIR%%/tptoc.pas
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/ptoc
diff --git a/lang/spl/Makefile b/lang/spl/Makefile
index 4fc444690a61..2521788bc723 100644
--- a/lang/spl/Makefile
+++ b/lang/spl/Makefile
@@ -15,6 +15,8 @@ USES=		bison gmake
 ALL_EXAMPLES=	Makefile fibonacci.spl fibonacci2.spl guess.spl hello.spl \
 		primes.spl reverse.spl shakesbeer.spl
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-patch:
 .for f in . examples
 	${REINPLACE_CMD} -e 's,= gcc,?= gcc,' -e 's,^CCFLAGS.*,CFLAGS += -Wall,' \
@@ -25,9 +27,7 @@ post-patch:
 
 do-install:
 	${TAR} -C ${WRKSRC}/spl -cf - . | ${TAR} -C ${STAGEDIR}${PREFIX} -xf -
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${INSTALL_DATA} ${ALL_EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/lang/spl/pkg-plist b/lang/spl/pkg-plist
index 76ca78b69821..1f3b38088ffc 100644
--- a/lang/spl/pkg-plist
+++ b/lang/spl/pkg-plist
@@ -1,12 +1,12 @@
 bin/spl2c
 include/spl.h
 lib/libspl.a
-%%PORTDOCS%%share/examples/spl/Makefile
-%%PORTDOCS%%share/examples/spl/hello.spl
-%%PORTDOCS%%share/examples/spl/primes.spl
-%%PORTDOCS%%share/examples/spl/reverse.spl
-%%PORTDOCS%%share/examples/spl/fibonacci.spl
-%%PORTDOCS%%share/examples/spl/fibonacci2.spl
-%%PORTDOCS%%share/examples/spl/guess.spl
-%%PORTDOCS%%share/examples/spl/shakesbeer.spl
-%%PORTDOCS%%@dirrm share/examples/spl
+%%PORTEXAMPLES%%share/examples/spl/Makefile
+%%PORTEXAMPLES%%share/examples/spl/hello.spl
+%%PORTEXAMPLES%%share/examples/spl/primes.spl
+%%PORTEXAMPLES%%share/examples/spl/reverse.spl
+%%PORTEXAMPLES%%share/examples/spl/fibonacci.spl
+%%PORTEXAMPLES%%share/examples/spl/fibonacci2.spl
+%%PORTEXAMPLES%%share/examples/spl/guess.spl
+%%PORTEXAMPLES%%share/examples/spl/shakesbeer.spl
+%%PORTEXAMPLES%%@dirrm share/examples/spl