10 files changed, 34 insertions, 19 deletions

diff --git a/cad/atlc/Makefile b/cad/atlc/Makefile
index 6133233b91e2..c6e1efc78379 100644
--- a/cad/atlc/Makefile
+++ b/cad/atlc/Makefile
@@ -44,6 +44,9 @@ PLIST_FILES=	bin/atlc bin/coax bin/create_any_bitmap \
 		bin/locatediff bin/myfilelength bin/mymd5sum bin/readbin
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-patch:
 .for file in Makefile.in
 	@${REINPLACE_CMD} -e \
@@ -51,7 +54,7 @@ post-patch:
 .endfor
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@(${TAR} -C ${WRKSRC}/docs --exclude "*Makefile*" -cf - . | \
 		${TAR} -C ${DOCSDIR} --unlink -xf -)
@@ -59,7 +62,7 @@ post-install:
 	@${FIND} ${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	@${FIND} ${DOCDIR} | ${XARGS} ${CHOWN} ${SHHAREOWN}:${SHAREGRP}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@(${TAR} -C ${WRKSRC}/examples --exclude "*Makefile*" -cf - . | \
 		${TAR} -C ${EXAMPLESDIR} --unlink -xf -)
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 1af77d935ae9..0962e2838402 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -126,7 +126,7 @@ do-install:
 	  ${PREFIX}/bin/ccx
 	@${INSTALL_PROGRAM} ${WRKSRC}/${CGX_VER}/src/cgx \
 	  ${PREFIX}/bin/cgx
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/ccx
 	@${INSTALL_DATA} ${WRKSRC}/${CCX_VER}/doc/ccx/* \
@@ -139,7 +139,7 @@ do-install:
 	  ${DOCSDIR}
 	@${GZIP_CMD} ${DOCSDIR}/*.ps
 .endif
-.ifdef WITH_EXAMPLES
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@${TAR} cf - -C ${WRKSRC}/${CGX_VER}/examples . | ${TAR} xf - -C ${EXAMPLESDIR}
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
diff --git a/cad/cascade/Makefile b/cad/cascade/Makefile
index c4c3e908fc90..382ecbb0b2a0 100644
--- a/cad/cascade/Makefile
+++ b/cad/cascade/Makefile
@@ -18,15 +18,18 @@ PLIST_FILES=	bin/cascade
 MAN1=		cascade.1
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 do-install:
 		@${INSTALL_SCRIPT} ${WRKSRC}/cascade ${PREFIX}/bin
 		@${INSTALL_MAN} ${WRKSRC}/cascade.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 		@${MKDIR} ${EXAMPLESDIR}
 		@${INSTALL_DATA} ${WRKSRC}/examples/* \
 			${WRKSRC}/cascade-mode.el ${EXAMPLESDIR}
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 		@${MKDIR} ${DOCSDIR}
 		@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
diff --git a/cad/cider/Makefile b/cad/cider/Makefile
index 1be8085742d7..8de3a3f5c266 100644
--- a/cad/cider/Makefile
+++ b/cad/cider/Makefile
@@ -21,6 +21,9 @@ MLINKS=		spice.1 spice3.1
 USE_XORG=	xt xaw xmu
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 pre-patch:
 	@${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt ${WRKSRC}/cider/common/lib/helpdir/spice.txt
 
@@ -41,7 +44,7 @@ do-install:
 	@(cd ${WRKSRC}/cider/common && ${SETENV} ${MAKE_ENV} ${MAKE} install)
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${PREFIX}/share/examples/spice3
 	@${INSTALL_DATA} ${WRKSRC}/spice/common/examples/*.cir ${PREFIX}/share/examples/spice3
 	@${MKDIR} ${PREFIX}/share/examples/cider
diff --git a/cad/gdsreader/Makefile b/cad/gdsreader/Makefile
index 973721157427..ceca6fa8424d 100644
--- a/cad/gdsreader/Makefile
+++ b/cad/gdsreader/Makefile
@@ -19,9 +19,12 @@ PLIST_FILES=	bin/gdsreader bin/maptolayer \
 PLIST_DIRS=	${EXAMPLESDIR_REL}
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-install:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} install-data
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} install-docs
 .endif
 
diff --git a/cad/mars/Makefile b/cad/mars/Makefile
index 913cef80bff0..4e80208e95f9 100644
--- a/cad/mars/Makefile
+++ b/cad/mars/Makefile
@@ -7,9 +7,6 @@ PORTREVISION=	3
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/sdag/MaRS/
 DISTNAME=	MaRS-${PORTVERSION}
-.if !defined(NOPORTDOCS)
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MaRS-2-doc${EXTRACT_SUFX}
-.endif
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	gahr@FreeBSD.org
@@ -18,6 +15,8 @@ COMMENT=	Maryland Routing Simulator
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
+DOCS_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MaRS-2-doc${EXTRACT_SUFX}
+
 MAKE_JOBS_UNSAFE=	yes
 NO_WRKSUBDIR=	yes
 
@@ -45,7 +44,7 @@ post-configure:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mars ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/man1/mars.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${PREFIX}/share/doc/mars
 	@${CHMOD} a+rx ${PREFIX}/share/doc/mars
 	@(cd ${PREFIX}/share/doc ; \
diff --git a/cad/sceptre/Makefile b/cad/sceptre/Makefile
index 0bae521f9219..f66f78a916bd 100644
--- a/cad/sceptre/Makefile
+++ b/cad/sceptre/Makefile
@@ -22,9 +22,7 @@ NO_STAGE=	yes
 
 FFLAGS+=	-fno-automatic
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	doc_en.pdf doc_ger.pdf install.pdf
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -E \
@@ -50,7 +48,7 @@ post-patch:
 				${WRKSRC}/bin/sceptre
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/install.pdf ${DOCSDIR}
 	cd ${WRKSRC}/doc ; ${INSTALL_DATA} ${PORTDOCS:Mdoc_*} ${DOCSDIR}
diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index 53263032c79b..962eed11c7bc 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -98,12 +98,12 @@ do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${LICDOCS:S|^|${WRKSRC}/doc/|} ${DATADIR}
 	${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/man/man1/|} ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}/grf ${EXAMPLESDIR}/tgt
 	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/examples/|} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/grf/* ${EXAMPLESDIR}/grf
diff --git a/cad/varkon/Makefile b/cad/varkon/Makefile
index 7d24a189aa13..f846b2376163 100644
--- a/cad/varkon/Makefile
+++ b/cad/varkon/Makefile
@@ -27,6 +27,9 @@ MAKE_JOBS_UNSAFE=	yes
 VARKON_PREFIX=	${PREFIX}/lib/${PORTNAME}
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.o" -delete
 
@@ -58,7 +61,7 @@ do-install:
 	@${MKDIR} ${VARKON_PREFIX}/cnf/ini
 	(cd ${WRKSRC}/cnf/ini/english && ${INSTALL_DATA} linux \
 		${VARKON_PREFIX}/cnf/ini/freebsd)
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}	#Varkon Manual
 	@(cd ${WRKSRC}/man && ${COPYTREE_SHARE} . ${DOCSDIR})
 .endif
diff --git a/cad/z88/Makefile b/cad/z88/Makefile
index cfce3f1906c5..4f78086fecea 100644
--- a/cad/z88/Makefile
+++ b/cad/z88/Makefile
@@ -29,6 +29,9 @@ Z88_BINS=	z88f z88i1 z88i2 z88com z88d z88e z88g z88h z88n z88o	\
 Z88_DATA=	z88.fcd z88.dyn *.dxf *.txt
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${CP} ${WRKSRC}/z88.fcd.linux ${WRKSRC}/z88.fcd
 	@${CP} ${WRKSRC}/z88.mk.kernel.gcc32 ${WRKSRC}/z88.kernel.mk
@@ -65,7 +68,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/*.htm ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/*.gif ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/*.jpg ${DOCSDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/z88mane.pdf ${DOCSDIR}
 .endif