5 files changed, 11 insertions, 34 deletions

diff --git a/converters/iconv/Makefile b/converters/iconv/Makefile
index a8449f5f4f67..acc89e82dc9e 100644
--- a/converters/iconv/Makefile
+++ b/converters/iconv/Makefile
@@ -22,13 +22,8 @@ OPTIONS_SUB=	yes
 
 CCSUTIL_DESC=	Install Coded character set (CCS) util
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCCSUTIL}
-USE_PERL5+=	run
-.else
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-ccs_Makefile
-.endif
+CCSUTIL_USE=	PERL5=run
+CCSUTIL_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-ccs_Makefile
 
 .if defined(NO_PROFILE)
 PLIST_SUB+=	PROFILE="@comment "
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index b23318638e55..ac6c4baf32c4 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -26,18 +26,11 @@ OPTIONS_DEFAULT=ENCODINGS
 ENCODINGS_DESC=	Include extra character sets
 PATCHES_DESC=	Apply patches to fix CP932, add EUCJP-MS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MENCODINGS}
-CONFIGURE_ARGS+=	--enable-extra-encodings
-.endif
-
-.if ${PORT_OPTIONS:MPATCHES}
-PATCH_SITES+=	http://apolloron.org/software/libiconv-1.14-ja/
-PATCH_SITES+=	LOCAL/kwm
-PATCHFILES+=	${DISTNAME}-ja-1.patch.gz
-PATCH_DIST_STRIP+=	-p1
-.endif
+ENCODINGS_CONFIGURE_ENABLE=	extra-encodings
+
+PATCHES_PATCH_SITES=	http://apolloron.org/software/libiconv-1.14-ja/ \
+			LOCAL/kwm
+PATCHES_PATCHFILES=	${DISTNAME}-ja-1.patch.gz:-p1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
diff --git a/converters/p5-LaTeXML/Makefile b/converters/p5-LaTeXML/Makefile
index ee0966d8e326..9b7b72d8ee19 100644
--- a/converters/p5-LaTeXML/Makefile
+++ b/converters/p5-LaTeXML/Makefile
@@ -38,16 +38,13 @@ PORTDOCS=		Changes INSTALL MANIFEST README manual.pdf
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
 	${FIND} ${STAGEDIR}/${PREFIX} -name .packlist | \
 		${XARGS} ${REINPLACE_CMD} -e 's|^${STAGEDIR}||'
 	${RM} ${STAGEDIR}${PREFIX}/share/texmf-local/tex/latex/latexml/.packlist.bak
 
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/converters/py-zfec/Makefile b/converters/py-zfec/Makefile
index 881207fe88e9..957d660ae3ee 100644
--- a/converters/py-zfec/Makefile
+++ b/converters/py-zfec/Makefile
@@ -25,18 +25,14 @@ DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/doc|${DOCSDIR}|g ; \
 		s#(doc_loc, data_fnames)##g' ${WRKSRC}/setup.py
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for DOC in COPYING.GPL COPYING.TGPPL.html README.rst TODO changelog
 	${INSTALL_DATA} ${WRKSRC}/${DOC} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/converters/tnef/Makefile b/converters/tnef/Makefile
index 3adb8cfeffaf..5d78af3cf6a7 100644
--- a/converters/tnef/Makefile
+++ b/converters/tnef/Makefile
@@ -19,13 +19,9 @@ PORTDOCS=	AUTHORS NEWS README THANKS TODO
 PLIST_FILES=	bin/tnef \
 		man/man1/tnef.1.gz
 
-.include <bsd.port.pre.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 # This target is intended to be run by the port maintainer.
 x-test: build
@@ -33,4 +29,4 @@ x-test: build
 	@cd ${WRKSRC}/tests/${dir} && ${MAKE} check-TESTS
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>