Index: audio/alsa-utils/Makefile
===================================================================
--- audio/alsa-utils/Makefile
+++ audio/alsa-utils/Makefile
@@ -32,14 +32,15 @@
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=nls
-NLS_LDFLAGS=	-lintl
+NLS_LIBS=	-lintl
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/LIBS/s/-ldl//g; /LIBRT/s/-lrt//g;' \
 		${WRKSRC}/configure
 	${FIND} -E ${WRKSRC} -type f -regex \
 		'.*\.([[:digit:]]|spec\.in|csv|xml)' -exec \
-		${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
+		${REINPLACE_CMD} -i .pathfix.bak \
+		-e 's|/usr/share|${PREFIX}/share|g' \
 		-e 's|/etc/asound\.conf|${LOCALBASE}&|g' {} +
 
 .include <bsd.port.mk>
Index: devel/onscripter/Makefile
===================================================================
--- devel/onscripter/Makefile
+++ devel/onscripter/Makefile
@@ -53,7 +53,6 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/www && ${COPYTREE_SHARE} \
 		. ${STAGEDIR}${DOCSDIR} \
 		"! -name *.orig ! -name *.bak")
Index: devel/ponscripter-sekai/Makefile
===================================================================
--- devel/ponscripter-sekai/Makefile
+++ devel/ponscripter-sekai/Makefile
@@ -54,7 +54,8 @@
 	@${REINPLACE_CMD} -e 's/$$(LIBS)/$$(LDFLAGS) &/' \
 		${WRKSRC}/src/Makefile.ponscripter
 .if ! ${PORT_OPTIONS:MMANPAGES}
-	@${REINPLACE_CMD} -e '/install-man/d' \
+	@${REINPLACE_CMD} -i .manpages.bak \
+		-e '/install-man/d' \
 		-e 's/xmlto/${FALSE}/' \
 		${WRKSRC}/configure
 .endif
@@ -71,9 +72,7 @@
 		${STAGEDIR}${PREFIX}/share/emacs/site-lisp
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-. for f in ${PORTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-. endfor
+	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: devel/renpy/Makefile
===================================================================
--- devel/renpy/Makefile
+++ devel/renpy/Makefile
@@ -68,14 +68,12 @@
 		-exec ${STRIP_CMD} {} +
 	${LN} -fs ${DATADIR}/renpy.py \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDATA}" ${STAGEDIR}${DATADIR} \
 		"! -name *.orig ! -name *.bak")
 	${CHMOD} +x ${STAGEDIR}${DATADIR}/renpy.py
 	${CHMOD} -R u+w ${STAGEDIR}${DATADIR}/templates
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \
 		. ${STAGEDIR}${DOCSDIR} \
 		"! -name *.orig ! -name *.bak")
Index: devel/rlvm/Makefile
===================================================================
--- devel/rlvm/Makefile
+++ devel/rlvm/Makefile
@@ -97,12 +97,10 @@
 		. ${STAGEDIR}${PREFIX}/share/locale)
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-. for f in ${PORTDOCS:Nnotes}
-	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-. endfor
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \
 		notes ${STAGEDIR}${DOCSDIR})
+	${INSTALL_MAN} ${PORTDOCS:Nnotes:S,^,${WRKSRC}/,} \
+		${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: emulators/xsystem35/Makefile
===================================================================
--- emulators/xsystem35/Makefile
+++ emulators/xsystem35/Makefile
@@ -68,14 +68,10 @@
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/instgame ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/doc;\
-		${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR})
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} \
+		"*.*" ${STAGEDIR}${EXAMPLESDIR})
+	${INSTALL_DATA} ${WRKSRC}/patch/pastel.diff ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/xsys35rc.sample ${STAGEDIR}${EXAMPLESDIR}
-	@(cd ${WRKSRC}/contrib; \
-		${INSTALL_DATA} *.* ${STAGEDIR}${EXAMPLESDIR})
-	@(cd ${WRKSRC}/patch; \
-		${INSTALL_DATA} pastel.diff ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: games/katawa-shoujo/Makefile
===================================================================
--- games/katawa-shoujo/Makefile
+++ games/katawa-shoujo/Makefile
@@ -27,7 +27,7 @@
 INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/Katawa\ Shoujo-linux-x86
 PORTDATA=	*
-PORTDOCS=	*
+PORTDOCS=	*.pdf
 PLIST_FILES=	bin/${PORTNAME} \
 		share/icons/hicolor/48x48/apps/${PORTNAME}.png \
 		share/icons/hicolor/256x256/apps/${PORTNAME}.png
@@ -43,8 +43,6 @@
 
 MANUAL_PACKAGE_BUILD=	huge (470MiB)
 
-.include <bsd.port.options.mk>
-
 pre-install:
 	${PRINTF} '#! /bin/sh\nrenpy ${DATADIR} "$$@"\n' \
 		>${WRKDIR}/${PORTNAME}
@@ -56,11 +54,8 @@
 	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-${i}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/${PORTNAME}.png
 .endfor
-	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/game && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/*.pdf ${STAGEDIR}${DOCSDIR}
-.endif
+	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: games/openra/Makefile
===================================================================
--- games/openra/Makefile
+++ games/openra/Makefile
@@ -28,7 +28,7 @@
 INSTALL_TARGET=	install-all install-linux-shortcuts
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 PORTDATA=	*
-PORTDOCS=	*
+PORTDOCS=	*.html
 
 OPTIONS_DEFINE=	DOCS TEST ZENITY
 OPTIONS_DEFAULT=ZENITY
@@ -72,7 +72,7 @@
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: net-p2p/transmission-cli/Makefile
===================================================================
--- net-p2p/transmission-cli/Makefile
+++ net-p2p/transmission-cli/Makefile
@@ -113,9 +113,7 @@
 
 general-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
+	${INSTALL_MAN} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 post-install: general-install
 
Index: sysutils/fusefs-simple-mtpfs/Makefile
===================================================================
--- sysutils/fusefs-simple-mtpfs/Makefile
+++ sysutils/fusefs-simple-mtpfs/Makefile
@@ -42,7 +42,7 @@
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${PORTDOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .if exists(/etc/autofs)
 	@${MKDIR} ${STAGEDIR}/etc/autofs
 	${INSTALL_SCRIPT} ${WRKDIR}/special_${PORTNAME} \