Remove NOPORTDOCS and NOPORTEXAMPLES.

17 files changed, 46 insertions, 53 deletions

diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile
index c78cc20899f2..aa3769232df5 100644
--- a/graphics/SciPlot/Makefile
+++ b/graphics/SciPlot/Makefile
@@ -26,6 +26,8 @@ PORTDOCS=	README SciPlot.html SciPlotDemo.html SciPlotProg.html
 EXDATA=		data.txt
 EXBINS=		realtime sciplot
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	${INSTALL_DATA} ${INCLUDES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
@@ -34,14 +36,10 @@ do-install:
 	${LN} -sf ${LIBNAME}.so.0 ${STAGEDIR}${PREFIX}/lib/${LIBNAME}.so
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${EXDATA:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${EXBINS:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index c2242e4ba2ba..d07ece4e0476 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -22,10 +22,13 @@ CONFIGURE_ENV=	AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(NOPORTDOCS)
-CONFIGURE_ARGS+=	--disable-documentation
+OPTIONS_DEFINE=	DOCS
 
-.else
+DOCS_CONFIGURE_ARGS_OFF=	--disable-documentation
+
+.include <bsd.port.options.mk>
+
+.if empty(PORT_OPTIONS:MDOCS)
 post-configure:
 	@${TOUCH} -f ${WRKSRC}/docs/reference/html/index.html
 .endif
diff --git a/graphics/cfdg/Makefile b/graphics/cfdg/Makefile
index 87a629c3f3e9..5b5eda6057d6 100644
--- a/graphics/cfdg/Makefile
+++ b/graphics/cfdg/Makefile
@@ -24,15 +24,13 @@ USES=		gmake
 NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/cfdg
 
-.if !defined(NOPORTEXAMPLES)
 PORTEXAMPLES=	*
-.endif
+
+OPTIONS_DEFINE=	EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cfdg ${STAGEDIR}${PREFIX}/bin
-.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/input/* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index a5b23df1456e..5657efb1e1e7 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -33,7 +33,11 @@ MAKE_ENV=	X11PATH=${LOCALBASE} LOCALBASE=${LOCALBASE}
 CPPFLAGS+=	${CFLAGS} ${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 USES+=		gmake
 REINPLACE_ARGS=	-i ""
 LIB_DEPENDS+=	libboard.so:${PORTSDIR}/graphics/libboard
@@ -83,7 +87,7 @@ NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 . if !defined(WITHOUT_LAPACK)
 .  if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
 WITH_ATLAS=	yes
@@ -100,7 +104,7 @@ LAPACK_LIB=	-L${LOCALBASE}/lib -llapack -lblas
 .endif
 
 pre-configure:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|make|${MAKE_CMD}|' ${BUILD_WRKSRC}/Makefile
 .else
 	${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|' ${BUILD_WRKSRC}/Makefile
@@ -121,13 +125,13 @@ pre-configure:
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/CImg.h ${STAGEDIR}${PREFIX}/include
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${INSTALL_PROGRAM} ${PROGS:C|^|${BUILD_WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCBASE:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/html && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${STAGEDIR}${EXAMPLESDIR} && ${MAKE_CMD} clean)
diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile
index 6023bd43bd9f..498eb374b2b3 100644
--- a/graphics/epstool/Makefile
+++ b/graphics/epstool/Makefile
@@ -24,17 +24,15 @@ MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/epstool man/man1/epstool.1.gz
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	epstool.htm gsview.css
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/epstool ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/epstool.1 ${STAGEDIR}${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/epstool.htm ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/gsview.css ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/gimpfx-foundry/Makefile b/graphics/gimpfx-foundry/Makefile
index 131f4b4c3868..b7b373eb8b92 100644
--- a/graphics/gimpfx-foundry/Makefile
+++ b/graphics/gimpfx-foundry/Makefile
@@ -20,14 +20,14 @@ NO_WRKSUBDIR=	yes
 
 PORTDOCS=	release-notes.txt
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/gimp/scripts/
 	${INSTALL_DATA} ${WRKSRC}/*.scm ${STAGEDIR}${PREFIX}/share/gimp/scripts/
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/release-notes.txt ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/glexcess/Makefile b/graphics/glexcess/Makefile
index 577655dd6fd3..1b1f6626de41 100644
--- a/graphics/glexcess/Makefile
+++ b/graphics/glexcess/Makefile
@@ -16,6 +16,8 @@ USE_GL=		glut
 MAKE_ARGS=	'CXXFLAGS=${CXXFLAGS} -I${LOCALBASE}/include -pipe -s -O2' \
 		'LDFLAGS=-L${LOCALBASE}/lib -lGL -lGLU -lglut'
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/scene*.cpp
 	@${REINPLACE_CMD} -e 's|k_InitGL(GLvoid)|k_InitGL(void)|' ${WRKSRC}/scene12.cpp
@@ -26,9 +28,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/glxs ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/data/*.raw ${STAGEDIR}${DATADIR}
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 3d0029c61b4a..d48a0051b554 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -41,15 +41,13 @@ post-patch:
 		${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e 's| -r %F||' \
 		${WRKSRC}/gqview.desktop
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} -e 's|doc$$||' ${WRKSRC}/Makefile.in
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gqview.png ${STAGEDIR}${PREFIX}/share/pixmaps
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 24d34a2e697c..c38ea43c44f8 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -28,7 +28,7 @@ DOS2UNIX_GLOB=	*.def
 SUB_FILES=	run-nip2.sh
 # This port has no man-pages. It installs a number of HTML files,
 # which are available through the GUI's Help. For this reason, they
-# are always installed, regardless of the NOPORTDOCS setting.
+# are always installed, regardless of the DOCS setting.
 # Somehow vendor's configure misses these:
 MAKE_ENV+=	UPDATE_MIME_DATABASE=update-mime-database	\
 		UPDATE_DESKTOP_DATABASE=update-desktop-database
@@ -51,10 +51,10 @@ test check: build
 	#
 	${GMAKE} -C ${WRKSRC} check
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ! ${PORT_OPTIONS:MDOCS}
+.if empty(PORT_OPTIONS:MDOCS)
 EXTRACT_AFTER_ARGS+=	--exclude nipguide.pdf --exclude pdf
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/p5-Image-IPTCInfo/Makefile b/graphics/p5-Image-IPTCInfo/Makefile
index 387e428801bc..e79a82e3208a 100644
--- a/graphics/p5-Image-IPTCInfo/Makefile
+++ b/graphics/p5-Image-IPTCInfo/Makefile
@@ -14,13 +14,13 @@ USES=		perl5 shebangfix
 USE_PERL5=	configure
 SHEBANG_FILES=	demo.pl
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${RM} -f ${WRKSRC}/._*
 
-.if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/demo_images/* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index b43f74ad5af3..70a26c0c2dde 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -17,7 +17,8 @@ USES=		perl5
 USE_PERL5=	modbuild
 USE_EFL=	imlib2
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 PORTDOCS=	CHANGES
 EXAMPLES=	examples/benchmark.pl examples/benchmark.txt examples/maeda.pl
 
@@ -28,6 +29,5 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index 24e1a6e43c8c..ff4cc68ec6c0 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -19,11 +19,11 @@ INSTALL_TARGET=	pure_install
 SCRIPTS_ENV=	PERL=${PERL}
 USES=		fortran perl5
 
-.if !defined(NOPORTEXAMPLES)
+OPTIONS_DEFINE=	EXAMPLES
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} LICENSE test* ${STAGEDIR}${EXAMPLESDIR})
-.endif
 
 .if defined(MAINTAINER_MODE) && !defined(BATCH)
 check regression-test test: build
diff --git a/graphics/pngnq/Makefile b/graphics/pngnq/Makefile
index 55e817b475f3..13afad055801 100644
--- a/graphics/pngnq/Makefile
+++ b/graphics/pngnq/Makefile
@@ -24,12 +24,12 @@ USES=		pkgconfig
 PORTDOCS=	README COPYING
 PLIST_FILES=	bin/pngcomp bin/pngnq man/man1/pngnq.1.gz
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/py-graphy/Makefile b/graphics/py-graphy/Makefile
index 9222b07d5147..7077c7b9b234 100644
--- a/graphics/py-graphy/Makefile
+++ b/graphics/py-graphy/Makefile
@@ -20,7 +20,7 @@ PORTEXAMPLES=	*
 NO_BUILD=	yes
 NO_INSTALL_MANPAGES=	yes
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|python2.4|${PYTHON_VERSION}|' \
@@ -33,13 +33,9 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}
 	@(cd ${WRKSRC}/${PORTNAME}/ && \
 	     ${COPYTREE_SHARE} \* ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME})
-.if !defined(NOPORTDOCS)
 	@${INSTALL} -o ${DOCOWN} -g ${DOCGRP} -m 555 -d ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
 	@${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 -d ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/ruby-tgif/Makefile b/graphics/ruby-tgif/Makefile
index 2bb1bc884323..5646100fd529 100644
--- a/graphics/ruby-tgif/Makefile
+++ b/graphics/ruby-tgif/Makefile
@@ -35,6 +35,8 @@ INSTALL_TARGET=	site-install
 DOCS_EN=	README
 DOCS_JA=	ChangeLog.ja	README.ja
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
@@ -48,7 +50,6 @@ post-patch:
 	${RUBY} -i -pe 'gsub %r|\.\./|, "tgif/"' ${WRKSRC}/extconf.rb ${WRKSRC}/*.c
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}/ja
 	${INSTALL_DATA} ${WRKSRC}/examples/test??.rb ${RUBY_MODEXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/examples/test??_ja.rb ${RUBY_MODEXAMPLESDIR}/ja/
@@ -59,6 +60,5 @@ post-install:
 .for f in ${DOCS_JA}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
 .endfor
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/wmicons/Makefile b/graphics/wmicons/Makefile
index b9a6e56e7efd..e0d2da437114 100644
--- a/graphics/wmicons/Makefile
+++ b/graphics/wmicons/Makefile
@@ -26,6 +26,8 @@ PORTDOCS=	*
 WRKSRC=		${WRKDIR}/WindowMaker-extra-0.1
 WMICONDIR=	${STAGEDIR}${PREFIX}/share/WindowMaker/Pixmaps
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	${MKDIR} ${WRKDIR}/isiconpack4
 	${TAR} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/isiconpack4.tgz \
@@ -52,7 +54,6 @@ post-install:
 	cd ${WRKDIR}/vf_tif; \
 	${INSTALL_DATA} *.tif ${WMICONDIR}
 
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/IconFest-1.2/README \
 		${STAGEDIR}${DOCSDIR}/README.IconFest
@@ -70,6 +71,5 @@ post-install:
 		${STAGEDIR}${DOCSDIR}/README.vf_png
 	${INSTALL_DATA} ${WRKDIR}/vf_tif/README \
 		${STAGEDIR}${DOCSDIR}/README.vf_tif
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile
index 0f897167af2d..90023abdb523 100644
--- a/graphics/xd3d/Makefile
+++ b/graphics/xd3d/Makefile
@@ -26,6 +26,8 @@ LICENSE=	GPLv2
 # - FFLAGS		:	fortran compiler's flags (-O by default).
 #--------------------------------------------------------------------------
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 .if !defined(WITHOUT_IMAGEMAGICK)
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .endif
@@ -76,15 +78,11 @@ pre-configure:
 		${WRKSRC}/RULES
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 . for FILE in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
 . endfor
-.endif
-.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -Rp ${WRKSRC}/Examples/* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.post.mk>