Switch to OptionsNg

8 files changed, 25 insertions, 13 deletions

diff --git a/archivers/par2cmdline/Makefile b/archivers/par2cmdline/Makefile
index 191d75b5f607..3b3db7000d31 100644
--- a/archivers/par2cmdline/Makefile
+++ b/archivers/par2cmdline/Makefile
@@ -22,8 +22,10 @@ PORTDOCS=	README
 CONFLICTS=	par2cmdline-tbb-[0-9]*
 PLIST_FILES=	bin/par2 bin/par2create bin/par2repair bin/par2verify
 
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}/
 .endif
diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile
index 92df69247447..0f3b6d8fa0be 100644
--- a/benchmarks/bonnie++/Makefile
+++ b/benchmarks/bonnie++/Makefile
@@ -25,12 +25,14 @@ MAN8=	bonnie++.8 getc_putc.8 zcav.8
 
 PORTDOCS=	readme.html
 
+.include <bsd.port.options.mk>
+
 pre-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/share/|${PREFIX}/share/|g' ${WRKSRC}/bonnie++.8
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/readme.html ${DOCSDIR}
 .endif
diff --git a/deskutils/notecase/Makefile b/deskutils/notecase/Makefile
index d570e6b200ea..d4d879b0594a 100644
--- a/deskutils/notecase/Makefile
+++ b/deskutils/notecase/Makefile
@@ -23,7 +23,9 @@ USE_GETTEXT=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	help.ncd
 INSTALL_TARGET=	install docinstall
 .endif
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index 749af2562868..93d63ffb39dc 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -69,7 +69,7 @@ do-install:
 	@${LN} ${PREFIX}/lib/libraknet.so.0 ${PREFIX}/lib/libraknet.so
 	@${INSTALL_LIB} ${WRKSRC}/Lib/LibStatic/libRakNetStatic.a \
 		${PREFIX}/lib/libraknet.a
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}/Help
 	@(cd ${WRKSRC}/Help/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/Help)
 	@${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}/
diff --git a/games/belooted/Makefile b/games/belooted/Makefile
index ff9e89cf438a..5f3f7ab9a3e9 100644
--- a/games/belooted/Makefile
+++ b/games/belooted/Makefile
@@ -26,8 +26,10 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index 6cb510bc7c12..19ffe9d0e4bb 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -38,6 +38,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
 PLIST_FILES=	bin/pencil
 PORTDOCS=	README TODO
 
+.include <bsd.port.options.mk>
+
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} -unix PREFIX=${PREFIX} \
@@ -51,7 +53,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Pencil ${PREFIX}/bin/pencil
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
diff --git a/net/grsync/Makefile b/net/grsync/Makefile
index d2b360997e12..d5d8207b4113 100644
--- a/net/grsync/Makefile
+++ b/net/grsync/Makefile
@@ -30,19 +30,21 @@ INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if !defined(WITHOUT_NLS)
+MAN1=		grsync.1 grsync-batch.1
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-MAN1=		grsync.1 grsync-batch.1
-
 post-patch:
 	@${REINPLACE_CMD} 's|/bin/bash|${LOCALBASE}/bin/bash|' \
 		${WRKSRC}/src/grsync-batch
-.if defined(WITHOUT_NLS)
+.if empty(PORT_OPTIONS:MNLS)
 	@${REINPLACE_CMD} 's/^ALL_LINGUAS=.*/ALL_LINGUAS=""/' \
 		${WRKSRC}/configure
 .endif
diff --git a/sysutils/fpart/Makefile b/sysutils/fpart/Makefile
index 3417b43becdd..26bd0fee2f82 100644
--- a/sysutils/fpart/Makefile
+++ b/sysutils/fpart/Makefile
@@ -22,14 +22,14 @@ MAN1=		fpart.1
 PLIST_FILES=	bin/fpart
 PORTDOCS=	Changelog README TODO
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>