8 files changed, 16 insertions, 26 deletions

diff --git a/textproc/confetti/Makefile b/textproc/confetti/Makefile
index bad2448a838f..0d50f4cb6ef0 100644
--- a/textproc/confetti/Makefile
+++ b/textproc/confetti/Makefile
@@ -13,8 +13,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		bison
-USE_PERL5=	yes
+USES=		bison perl5
 DATE=		20120801
 MAKE_ARGS+=	FLEX=${LOCALBASE}/bin/flex
 MAKE_JOBS_UNSAFE=yes
diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile
index 6045ea9ce61a..92098873a112 100644
--- a/textproc/docproj/Makefile
+++ b/textproc/docproj/Makefile
@@ -12,7 +12,8 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	The "meta-port" for the FreeBSD Documentation Project
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 # This dependency list should be kept in sync with the list of
 # required ports in src/release/Makefile.inc.docports.
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 8b6f2b47ffa2..d3acfc73509e 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	 latex2html
-# Date created:		3 May 1998
-# Whom:			brett@peloton.physics.montana.edu
-#
+# Created by: brett@peloton.physics.montana.edu
 # $FreeBSD$
-#
 
 PORTNAME=	latex2html
 PORTVERSION=	2008
@@ -21,7 +17,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	ja-latex2html-[0-9]*
 
-USE_PERL5=		yes
+USES=			perl5
 USE_GHOSTSCRIPT=	yes
 USE_TEX=		latex dvipsk
 GNU_CONFIGURE=		yes
diff --git a/textproc/openfts/Makefile b/textproc/openfts/Makefile
index ae3354de6922..38de1c42aca5 100644
--- a/textproc/openfts/Makefile
+++ b/textproc/openfts/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	OpenFTS
-# Date Created:				15 Aug, 2003
-# Whom:					Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	openfts
 PORTVERSION=	0.40
@@ -19,7 +15,8 @@ RUN_DEPENDS=	${LOCALBASE}/lib/postgresql/tsearch2.so:${PORTSDIR}/databases/postg
 		p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 
 USE_PGSQL=	yes
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/p5-FormValidator-Lite/Makefile b/textproc/p5-FormValidator-Lite/Makefile
index 7354efccd7e5..16a92cadbbd8 100644
--- a/textproc/p5-FormValidator-Lite/Makefile
+++ b/textproc/p5-FormValidator-Lite/Makefile
@@ -24,7 +24,8 @@ TEST_DEPENDS=	p5-Text-TestBase>0:${PORTSDIR}/textproc/p5-Text-TestBase \
 		p5-Test-Requires>=0.05:${PORTSDIR}/devel/p5-Test-Requires \
 		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		FormValidator::Lite.3 \
 		FormValidator::Lite::Constraint.3 \
diff --git a/textproc/p5-Text-VimColor/Makefile b/textproc/p5-Text-VimColor/Makefile
index 55dd7f4bef31..623a523516bc 100644
--- a/textproc/p5-Text-VimColor/Makefile
+++ b/textproc/p5-Text-VimColor/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
 		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
 		${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		text-vimcolor.1
 MAN3=		Text::VimColor.3
diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index 111325b42298..ce2d33e0817e 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	texi2html
-# Date created:				5 Nov 1997
-# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
-#
+# Created by: Ian Vaudrey <i.vaudrey@bigfoot.com>
 # $FreeBSD$
-#
 
 PORTNAME=	texi2html
 PORTVERSION=	5.0
@@ -18,9 +14,8 @@ COMMENT=	Texinfo to HTML converter
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL=${PERL}
 CONFIGURE_ARGS=	--disable-multiplatform
+USES=		gmake perl5
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_GMAKE=	yes
 
 OPTIONS_DEFINE=	NLS DOCS
 
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index ae87c430ca58..ef8063433280 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -17,8 +17,8 @@ USE_LDCONFIG=	yes
 WANT_GNOME=	yes
 USE_GNOME+=	glib20 intltool
 USE_AUTOTOOLS=	libtool
-USES=		gettext gmake iconv pkgconfig
-USE_PERL5_BUILD=yes
+USES=		gettext gmake iconv pkgconfig perl5
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_X11)