8 files changed, 10 insertions, 20 deletions

diff --git a/textproc/colordiff/Makefile b/textproc/colordiff/Makefile
index 4dac6b2d861c..4313be9ae495 100644
--- a/textproc/colordiff/Makefile
+++ b/textproc/colordiff/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Tool to colorize diff output
 
 LICENSE=	GPLv2
 
-USES=		shebangfix
-USE_PERL5=	yes
+USES=		shebangfix perl5
 NO_BUILD=	yes
 
 SHEBANG_FILES=	colordiff.pl
diff --git a/textproc/docbook2X/Makefile b/textproc/docbook2X/Makefile
index 590c27bec358..53a6d67ded9a 100644
--- a/textproc/docbook2X/Makefile
+++ b/textproc/docbook2X/Makefile
@@ -27,9 +27,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 CONFLICTS=	docbook-utils-*
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
-USES=		iconv
+USES=		iconv gmake perl5
 
 .if defined(NOPORTDOCS)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-doc__Makefile.in
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 50fe9a355e10..c6374755be6b 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -15,10 +15,8 @@ COMMENT=	A GNOME/Bonobo component for spell checking
 LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell
 
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig perl5
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 41a381d64af0..27bd589726cc 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -26,9 +26,8 @@ XMLCATMGR=		${LOCALBASE}/bin/xmlcatmgr
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
 USE_XZ=		yes
-USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig shebangfix
+USES=		gmake pathfix pkgconfig shebangfix perl5
 USE_GNOME=	gnomeprefix libxslt gnomedocutils
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index d386a4afc8a9..93fdc90acfbc 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -14,9 +14,7 @@ COMMENT=	Tools to internationalize various kinds of data files
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
-USE_GMAKE=	yes
-USES=		iconv
-USE_PERL5=	yes
+USES=		iconv gmake perl5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir="${PREFIX}/libdata"
 
diff --git a/textproc/markdown/Makefile b/textproc/markdown/Makefile
index 170741971fe6..e89eedb1a8f6 100644
--- a/textproc/markdown/Makefile
+++ b/textproc/markdown/Makefile
@@ -12,9 +12,8 @@ MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	A text-to-HTML conversion tool for web writers
 
 USE_ZIP=	yes
-USE_PERL5=	yes
 NO_BUILD=	yes
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	Markdown.pl
 
 .if !defined(NOPORTDOCS)
diff --git a/textproc/p5-XML-TinyXML/Makefile b/textproc/p5-XML-TinyXML/Makefile
index 91796083e94a..75d29d040706 100644
--- a/textproc/p5-XML-TinyXML/Makefile
+++ b/textproc/p5-XML-TinyXML/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	info@rickvanderzwet.nl
 COMMENT=	Little and efficient Perl module to manage xml data
 
-USES=		iconv
+USES=		iconv perl5
+USE_PERL5=	configure
 
 MAKE_ARGS+=	LIBS='-L${LOCALBASE}/lib' INC='-I. -I${LOCALBASE}/include'
-PERL_CONFIGURE=	yes
 
 MAN3=		XML::TinyXML.3 \
 		XML::TinyXML::Node.3 \
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 1182ebb25add..2aeef24bcf37 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -19,10 +19,9 @@ CONFLICTS?=	uim-el-xemacs21-mule-[0-9]* \
 RUN_DEPENDS=	uim-el-agent:${PORTSDIR}/textproc/uim
 
 USE_BZIP2=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 USE_GNOME=	intltool
-USE_GMAKE=	yes
-USES=		iconv
+USES=		iconv gmake perl5
 USE_EMACS=	yes
 GNU_CONFIGURE=	yes