Remove NOPORTDOCS and NOPORTEXAMPLES from unstaged ports. Stage a couple while

we're here. Remove any other references to NOPORT*.

Approved by:	portmgr (blanket for modernization)

4 files changed, 35 insertions, 48 deletions

diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile
index 89594e834fe7..e1cf7b6c7bc8 100644
--- a/korean/eterm/Makefile
+++ b/korean/eterm/Makefile
@@ -28,6 +28,8 @@ LIBS+=		-L${LOCALBASE}/lib
 MAN1=		Eterm.1
 MAKE_JOBS_UNSAFE=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
@@ -40,7 +42,7 @@ pre-patch:
 		${WRKSRC}/libmej/debug.c ${WRKSRC}/libmej/strings.c
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ReleaseNotes \
 		${WRKSRC}/doc/Eterm_reference.html \
diff --git a/korean/ko.TeX-fonts-base/Makefile b/korean/ko.TeX-fonts-base/Makefile
index ebdd48b1e8d5..8d1c6ba77ce7 100644
--- a/korean/ko.TeX-fonts-base/Makefile
+++ b/korean/ko.TeX-fonts-base/Makefile
@@ -28,17 +28,12 @@ PLIST_SUB+=	MKTEXLSR=${MKTEXLSR} \
 		UPDMAP_SYS=${UPDMAP_SYS}
 DOCS=		COPYING LICENSE MANIFEST
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 do-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
-.endif
-	(cd ${WRKDIR}/fonts/ && ${COPYTREE_SHARE} \* ${TEXMF_FONTS})
-	(cd ${WRKDIR}/tex/ && ${COPYTREE_SHARE} \* ${TEXMF_TEX})
-
-post-install:
-	${MKTEXLSR}
-	${UPDMAP_SYS} --enable Map=kotex-base.map
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKDIR}/fonts && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_FONTS})
+	(cd ${WRKDIR}/tex && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_TEX})
 
 .include <bsd.port.mk>
diff --git a/korean/ko.TeX-fonts-extra/Makefile b/korean/ko.TeX-fonts-extra/Makefile
index c6481ee2cccd..fea8d433dd20 100644
--- a/korean/ko.TeX-fonts-extra/Makefile
+++ b/korean/ko.TeX-fonts-extra/Makefile
@@ -27,18 +27,12 @@ UPDMAP_SYS=	${PREFIX}/bin/updmap-sys
 PLIST_SUB+=	MKTEXLSR=${MKTEXLSR} \
 		UPDMAP_SYS=${UPDMAP_SYS}
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 do-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	(cd ${WRKDIR}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
-.endif
-	(cd ${WRKDIR}/fonts/ && ${COPYTREE_SHARE} \* ${TEXMF_FONTS})
-	(cd ${WRKDIR}/tex/ && ${COPYTREE_SHARE} \* ${TEXMF_TEX})
-
-post-install:
-	${MKTEXLSR}
-	${UPDMAP_SYS} --enable Map=kotex-extra-hlfont.map
-	${UPDMAP_SYS} --enable Map=kotex-extra.map
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKDIR}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKDIR}/fonts && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_FONTS})
+	(cd ${WRKDIR}/tex && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_TEX})
 
 .include <bsd.port.mk>
diff --git a/korean/ko.TeX/Makefile b/korean/ko.TeX/Makefile
index 11895c399f26..1668a5f1f968 100644
--- a/korean/ko.TeX/Makefile
+++ b/korean/ko.TeX/Makefile
@@ -34,7 +34,8 @@ PLIST_SUB+=	TEXHASH=${TEXHASH}
 DOCS=		ChangLog INSTALL LICENSE VERSION manifest.txt news-0.1.0.txt \
 		news-0.1.1.txt
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 do-build:
 	@${MKDIR} ${WRKDIR}/build
 	@${CC} ${CFLAGS} -o ${WRKDIR}/build/hbibtex \
@@ -46,36 +47,31 @@ do-build:
 	@${RM} -rf ${WRKDIR}/latex/utf/unfonts
 
 do-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
-	@${MKDIR} ${KOTEX_DOC}
-	(cd ${WRKDIR}/doc/ && ${COPYTREE_SHARE} \* ${KOTEX_DOC})
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${KOTEX_DOC}
+	(cd ${WRKDIR}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_DOC})
 
-	@${MKDIR} ${KOTEX_BIBTEX}
-	(cd ${WRKDIR}/bibtex/ && ${COPYTREE_SHARE} \* ${KOTEX_BIBTEX})
+	@${MKDIR} ${STAGEDIR}${KOTEX_BIBTEX}
+	(cd ${WRKDIR}/bibtex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_BIBTEX})
 
-	@${MKDIR} ${KOTEX_LATEX}
-	(cd ${WRKDIR}/latex/ && ${COPYTREE_SHARE} \* ${KOTEX_LATEX})
+	@${MKDIR} ${STAGEDIR}${KOTEX_LATEX}
+	(cd ${WRKDIR}/latex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_LATEX})
 
-	@${MKDIR} ${KOTEX_MKIDX}
-	(cd ${WRKDIR}/makeindex/ && ${COPYTREE_SHARE} \* ${KOTEX_MKIDX})
+	@${MKDIR} ${STAGEDIR}${KOTEX_MKIDX}
+	(cd ${WRKDIR}/makeindex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_MKIDX})
 
-	@${MKDIR} ${KOTEX_PLAIN}
-	(cd ${WRKDIR}/plain/ && ${COPYTREE_SHARE} \* ${KOTEX_PLAIN})
+	@${MKDIR} ${STAGEDIR}${KOTEX_PLAIN}
+	(cd ${WRKDIR}/plain && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_PLAIN})
 
-	@${MKDIR} ${KOTEX_SFD}
-	(cd ${WRKDIR}/sfd/ && ${COPYTREE_SHARE} \* ${KOTEX_SFD})
+	@${MKDIR} ${STAGEDIR}${KOTEX_SFD}
+	(cd ${WRKDIR}/sfd && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_SFD})
 
-	@${MKDIR} ${KOTEX_UTIL}
-	@${INSTALL_SCRIPT} ${WRKDIR}/util/*.pl ${KOTEX_UTIL}
-	@${INSTALL_PROGRAM} ${WRKDIR}/build/* ${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${KOTEX_UTIL}
+	@${INSTALL_SCRIPT} ${WRKDIR}/util/*.pl ${STAGEDIR}${KOTEX_UTIL}
+	@${INSTALL_PROGRAM} ${WRKDIR}/build/* ${STAGEDIR}${PREFIX}/bin
 
 	@${CHMOD} a+x ${WRKDIR}/util/*.pl
-	@${INSTALL_SCRIPT} ${WRKDIR}/util/*.pl ${PREFIX}/bin
-
-post-install:
-	${TEXHASH}
+	@${INSTALL_SCRIPT} ${WRKDIR}/util/*.pl ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>