12 files changed, 32 insertions, 14 deletions

diff --git a/chinese/cless/Makefile b/chinese/cless/Makefile
index 27851ee9a409..ecde71fd0f2b 100644
--- a/chinese/cless/Makefile
+++ b/chinese/cless/Makefile
@@ -15,8 +15,11 @@ CPP=		#
 MAN1=		cless.1 clesskey.1
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${PREFIX}/share/doc/cless
 	${INSTALL_DATA} ${WRKSRC}/README.CLESS ${PREFIX}/share/doc/cless
 .endif
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index eb08e57b9b04..1acc6905af7e 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -93,9 +93,7 @@ EXTRA_PATCHES+=	${FILESDIR}/tpunc-data_punc.mb.zh_CN
 CMAKE_ARGS+=	-DENABLE_DEBUG=ON
 .endif
 
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES+=	${FILESDIR}/nodocs-doc_CMakeLists.txt
-.endif
+DOCS_EXTRA_PATCHES=	${FILESDIR}/nodocs-doc_CMakeLists.txt
 
 .if defined(NOPORTDATA)
 IGNORE=		code tables are required, undefine NOPORTDATA
diff --git a/chinese/gb2ps/Makefile b/chinese/gb2ps/Makefile
index 4132c056ff68..6b4fb0867644 100644
--- a/chinese/gb2ps/Makefile
+++ b/chinese/gb2ps/Makefile
@@ -17,6 +17,8 @@ COMMENT=	Converts Chinese GB (simple) encoded text to PostScript
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=		${WRKDIR}/GB2PS
 
+.include <bsd.port.options.mk>
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/chinese/gb
 	${INSTALL_PROGRAM} ${WRKSRC}/gb2ps ${STAGEDIR}${PREFIX}/bin
@@ -24,7 +26,7 @@ do-install:
 .for font in csong24.ccf ckai24.ccf cfang24.ccf chei24.ccf cfan24.ccf
 	${GUNZIP_CMD} -c ${DISTDIR}/${font}.gz > ${STAGEDIR}${PREFIX}/share/chinese/gb/${font}
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/gb2ps
 	${INSTALL_DATA} ${WRKSRC}/gb2ps.help ${STAGEDIR}${PREFIX}/share/doc/gb2ps
 .endif
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index f1aca1c98b47..285163114a08 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -106,7 +106,7 @@ post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/${f}
 .endfor
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for f in Changelog.html README.html
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
diff --git a/chinese/hanzim/Makefile b/chinese/hanzim/Makefile
index 7b06b9b7985a..1783e6d26e76 100644
--- a/chinese/hanzim/Makefile
+++ b/chinese/hanzim/Makefile
@@ -24,6 +24,9 @@ ALL_TARGET=	${PORTNAME}
 MAN1=		hanzim.1
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hanzim.c
 
@@ -32,7 +35,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/hanzim.man ${PREFIX}/man/man1/hanzim.1
 	@${MKDIR} ${PREFIX}/lib/hanzim
 	${INSTALL_DATA} ${WRKSRC}/Data/* ${PREFIX}/lib/hanzim
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/hanzim.doc ${DOCSDIR}
 .endif
diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile
index 07e6cfe0db98..312b9eb6f490 100644
--- a/chinese/libtabe/Makefile
+++ b/chinese/libtabe/Makefile
@@ -55,7 +55,7 @@ post-patch:
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/tsi-src/README ${DOCSDIR}/README.tsi
 .if !defined(WITHOUT_X11)
diff --git a/chinese/muni/Makefile b/chinese/muni/Makefile
index 4d898edb8d9a..4ebc6379ec85 100644
--- a/chinese/muni/Makefile
+++ b/chinese/muni/Makefile
@@ -9,10 +9,12 @@ MASTER_SITES=	http://www.whizkidtech.redprince.net/i18n/muni/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Find Unicode values for Chinese characters
 
+.include <bsd.port.options.mk>
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/muni ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/m7773 ${STAGEDIR}${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/muni
 	${INSTALL_DATA} ${WRKSRC}/index.html ${STAGEDIR}${PREFIX}/share/doc/muni
 	${INSTALL_DATA} ${WRKSRC}/yung.gif ${STAGEDIR}${PREFIX}/share/doc/muni
diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile
index c11cb5e23071..c04245777223 100644
--- a/chinese/phpbb-tw/Makefile
+++ b/chinese/phpbb-tw/Makefile
@@ -53,6 +53,8 @@ EXCEPTFILES=	${PREFIX}/${PHPBBDIR}/install/install.php \
 		${PREFIX}/${PHPBBDIR}/install/upgrade.php \
 		${PREFIX}/${PHPBBDIR}/install/update_to_latest.php
 
+.include <bsd.port.options.mk>
+
 options:
 	@ ${ECHO_MSG} "===>  Build options for ${PKGNAME}:"
 	@ ${CAT} ${PKGOPTS}
@@ -85,7 +87,7 @@ do-install:
 post-install:
 #	@ cd ${DATADIR} && ${INSTALL} -c -o ${WWWOWN} -g ${WWWGRP} \
 #	  ${EXCEPTFILES} ${PREFIX}/${PHPBBDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@ ${MKDIR} ${DOCSDIR}
 	@ cd ${WRKSRC}/docs && ${FIND} * -type f -maxdepth 0 \! -name \*.bak \
 	  \! -name COPYING -exec ${INSTALL_DATA} {} ${DOCSDIR} \;
diff --git a/chinese/phpbb3-tw/Makefile b/chinese/phpbb3-tw/Makefile
index cf36200fa491..61f2d570c4e2 100644
--- a/chinese/phpbb3-tw/Makefile
+++ b/chinese/phpbb3-tw/Makefile
@@ -41,6 +41,8 @@ NO_STAGE=	yes
 PHPBBDIR=	${WWWDOCROOT}/${PHPBBURL}
 PKGOPTS=	${FILESDIR}/pkg-opts
 
+.include <bsd.port.options.mk>
+
 options:
 	@ ${ECHO_MSG} "===>  Build options for ${PKGNAME}:"
 	@ ${CAT} ${PKGOPTS}
@@ -63,7 +65,7 @@ do-install:
 	@ ${ECHO_CMD} '@exec ${CHMOD} -R 0755 ${PREFIX}/${PHPBBDIR}' >> ${TMPPLIST}
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@ ${MKDIR} ${DOCSDIR}
 	@ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
 
diff --git a/chinese/pine4/Makefile b/chinese/pine4/Makefile
index 202ed2efe8b2..50ab39692db4 100644
--- a/chinese/pine4/Makefile
+++ b/chinese/pine4/Makefile
@@ -28,6 +28,9 @@ NO_LATEST_LINK=	yes
 MAN1=		pine.1 pico.1 pilot.1
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 pre-fetch:
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 	${SH} pkg-install
@@ -82,7 +85,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1/pico.1
 	${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1/pilot.1
 	${INSTALL_MAN} ${WRKSRC}/doc/pine.1 ${PREFIX}/man/man1/pine.1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
 			${PREFIX}/share/doc/pine \
 			${PREFIX}/share/doc/pine/tech-notes
diff --git a/chinese/reciteword/Makefile b/chinese/reciteword/Makefile
index 6abb3f62cb3a..909aac1ef0aa 100644
--- a/chinese/reciteword/Makefile
+++ b/chinese/reciteword/Makefile
@@ -36,7 +36,7 @@ post-patch:
 post-install:
 	@${MKDIR} ${DATADIR}
 	(cd ${WRKDIR}/ && ${COPYTREE_SHARE} "books dicts" ${DATADIR})
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
diff --git a/chinese/ttfm/Makefile b/chinese/ttfm/Makefile
index 0e771821185d..ab07baf0d791 100644
--- a/chinese/ttfm/Makefile
+++ b/chinese/ttfm/Makefile
@@ -20,6 +20,9 @@ PORTDOCS=	README USAGE
 MAN1=		ttfm.sh.1
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \
 		-e 's,%%PREFIX%%,${PREFIX},' \
@@ -30,7 +33,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ttfinfo ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/ttfm.sh ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}/