Convert ports to use the options helpers in categories [abc]*, and minor fixes.

Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3412?

7 files changed, 17 insertions, 41 deletions

diff --git a/biology/avida/Makefile b/biology/avida/Makefile
index 7ad734e2cce8..eabcb09fb2d8 100644
--- a/biology/avida/Makefile
+++ b/biology/avida/Makefile
@@ -34,8 +34,6 @@ BROKEN_ia64=	Does not compile: invokes i386 asm
 BROKEN_powerpc=	Does not compile: invokes i386 asm
 BROKEN_sparc64=	Does not compile: invokes i386 asm
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "CMakeLists.txt" | ${XARGS} \
 		${REINPLACE_CMD} -e \
@@ -63,10 +61,9 @@ do-install:
 	(cd ${WRKSRC}/avida-core/support/config && ${INSTALL_DATA} *.org \
 		${STAGEDIR}${PREFIX}/lib/${PORTNAME})
 
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/avida-core/documentation && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/biology/gff2ps/Makefile b/biology/gff2ps/Makefile
index b0db3c3c8e92..f591aa5ae66f 100644
--- a/biology/gff2ps/Makefile
+++ b/biology/gff2ps/Makefile
@@ -35,9 +35,8 @@ do-extract:
 	@${MKDIR} ${WRKDIR}
 	@${GZCAT} ${DISTDIR}/${PORTNAME}_v${PORTVERSION}.gz \
 		> ${WRKDIR}/${PORTNAME}
-.if ${PORT_OPTIONS:MDOCS}
+do-extract-DOCS-on:
 	@${GZCAT} ${DISTDIR}/${GFF2PS_MAN}.gz > ${WRKDIR}/${GFF2PS_MAN}
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -46,9 +45,8 @@ post-patch:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/gff2ps ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${GFF2PS_MAN} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/biology/ortep3/Makefile b/biology/ortep3/Makefile
index 32205a5491a3..d0c8216c79bd 100644
--- a/biology/ortep3/Makefile
+++ b/biology/ortep3/Makefile
@@ -30,11 +30,7 @@ PORTEXAMPLES=	*
 OPTIONS_DEFINE=	DOCS EXAMPLES PGPLOT
 PGPLOT_DESC=	Fortran subroutine package for drawing graphs
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPGPLOT}
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-aa
-.endif
+PGPLOT_EXTRA_PATCHES=	${FILESDIR}/extra-patch-aa
 
 post-extract:
 	${MV} ${WRKSRC}/ortep.f ${WRKSRC}/ortep.f-1.0
@@ -45,15 +41,13 @@ pre-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ortep3 ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/src
 	${INSTALL_DATA} ${WRKSRC}/../README.1st ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../man/* ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/000readme.txt ${STAGEDIR}${DOCSDIR}/src
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/../examples/* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/biology/platon/Makefile b/biology/platon/Makefile
index 143a65c90517..3a08dbb96aae 100644
--- a/biology/platon/Makefile
+++ b/biology/platon/Makefile
@@ -28,8 +28,6 @@ OPTIONS_DEFINE=	DOCS
 
 MAKEFILE=	${FILESDIR}/Makefile
 
-.include <bsd.port.pre.mk>
-
 pre-patch:
 	${GUNZIP_CMD} ${WRKSRC}/platon.f.gz ${WRKSRC}/xdrvr.c.gz
 
@@ -37,7 +35,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/platon \
 		${STAGEDIR}${PREFIX}/bin
 	${LN} -fs platon ${STAGEDIR}${PREFIX}/bin/pluton
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MV} ${WRKDIR}/${DISTNAME}/README* ${STAGEDIR}${DOCSDIR}/
 	${MV} ${SAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
@@ -46,6 +44,5 @@ do-install:
 	${MV} ${WRKSRC}/TEST ${STAGEDIR}${DOCSDIR}/
 	${FIND} ${STAGEDIR}${DOCSDIR} -type f -print0 |	\
 		${XARGS} -0 ${CHMOD} ${_SHAREMODE}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile
index b6c722f081fa..5710363231cf 100644
--- a/biology/protomol/Makefile
+++ b/biology/protomol/Makefile
@@ -37,20 +37,16 @@ CXXFLAGS+=	-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS_DEFINE=	GLUT
+OPTIONS_DEFINE=	GLUT EXAMPLES
 OPTIONS_DEFAULT=	GLUT
 
 GLUT_CONFIGURE_ON=	--with-glut=yes
 GLUT_USE=	GL=glut
 GLUT_CONFIGURE_OFF=	--with-glut=no
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-post-install:
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples ; \
 		${COPYTREE_SHARE} .  ${STAGEDIR}${EXAMPLESDIR} "! -name .cvsignore"
-.endif
 
 .include <bsd.port.mk>
diff --git a/biology/tinker/Makefile b/biology/tinker/Makefile
index 91e799ac0f5c..43163dff6f82 100644
--- a/biology/tinker/Makefile
+++ b/biology/tinker/Makefile
@@ -57,15 +57,13 @@ post-install:
 	(cd ${WRKSRC}/params && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/params)
 	${MKDIR} ${STAGEDIR}${DATADIR}/test
 	(cd ${WRKSRC}/test && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/test)
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} 0README *.pdf *.txt ${STAGEDIR}${DOCSDIR})
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/example && ${INSTALL_DATA} \
 		0README *.make *.dyn *.int *.frac *.key *.seq *.pdb *.xyz \
 		${STAGEDIR}${EXAMPLESDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/biology/xmolwt/Makefile b/biology/xmolwt/Makefile
index ae96c0cee4cd..d31361cea49e 100644
--- a/biology/xmolwt/Makefile
+++ b/biology/xmolwt/Makefile
@@ -19,15 +19,11 @@ ALL_TARGET=	gmolwt
 PORTDOCS=	*
 PLIST_FILES=	bin/gmolwt bin/molwt
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK2}
-USES+=		pkgconfig
-USE_GNOME=	gtk20
-MAKE_ENV+=	GTKCONFIG="pkg-config gtk+-2.0"
-.else
-USE_GNOME=	gtk12
-MAKE_ENV+=	GTKCONFIG="${GTK_CONFIG}"
+GTK2_USES=		pkgconfig
+GTK2_USE=	GNOME=gtk20
+GTK2_MAKE_ENV=	GTKCONFIG="pkg-config gtk+-2.0"
+GTK2_USE_OFF=	GNOME=gtk12
+GTK2_MAKE_ENV_OFF=	GTKCONFIG="${GTK_CONFIG}"
 .endif
 
 post-patch: