- convert to the new perl5 framework

- convert USE_GMAKE to Uses

Approved by:	portmgr (bapt@, blanket)

19 files changed, 26 insertions, 41 deletions

diff --git a/finance/sql-ledger/Makefile b/finance/sql-ledger/Makefile
index 6317027aab8a..4539f1c64c64 100644
--- a/finance/sql-ledger/Makefile
+++ b/finance/sql-ledger/Makefile
@@ -15,10 +15,9 @@ BUILD_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
-USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SUB_FILES=	pkg-message sql-ledger-httpd.conf
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	*.pl locale/*/*.pl bin/*/*.pl
 
 do-install:
diff --git a/ftp/ftplocate/Makefile b/ftp/ftplocate/Makefile
index e2f1c423c875..0d28ad0a5f33 100644
--- a/ftp/ftplocate/Makefile
+++ b/ftp/ftplocate/Makefile
@@ -12,10 +12,8 @@ COMMENT=	A ftp search engine supporting filename and description search
 RUN_DEPENDS=	glimpse:${PORTSDIR}/textproc/glimpse \
 		unzip:${PORTSDIR}/archivers/unzip
 
-USE_PERL5=	yes
+USES=		shebangfix perl5
 NO_BUILD=	yes
-
-USES=		shebangfix
 SHEBANG_FILES=	bin/*.pl template/ftplocate
 
 post-extract:
diff --git a/mail/delatt/Makefile b/mail/delatt/Makefile
index 7ec92b8ad741..681cbffdbda4 100644
--- a/mail/delatt/Makefile
+++ b/mail/delatt/Makefile
@@ -14,8 +14,8 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
 
-USES=		shebangfix
-USE_PERL5_RUN=	yes
+USES=		shebangfix perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
 SHEBANG_FILES=	delatt
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index b3a2918fa494..fc224c396908 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -15,9 +15,9 @@ CONFLICTS=	elmo-devel-[0-9]*
 OPTIONS_DEFINE=	NLS
 
 GNU_CONFIGURE=	yes
-USES=		iconv shebangfix
+USES=		iconv shebangfix perl5
 USE_OPENSSL=	yes
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 SHEBANG_FILES=	src/elmoconf.pl
 
 LICENSE=	GPLv2
diff --git a/mail/imaptools/Makefile b/mail/imaptools/Makefile
index b1e1d96b446c..c514f4968f6f 100644
--- a/mail/imaptools/Makefile
+++ b/mail/imaptools/Makefile
@@ -17,9 +17,9 @@ CONFLICTS=	imaputils-[0-9]*
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	*.pl
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/*.pl ${PREFIX}/bin
diff --git a/mail/msgconvert/Makefile b/mail/msgconvert/Makefile
index 049ac8a7358a..3e6514951808 100644
--- a/mail/msgconvert/Makefile
+++ b/mail/msgconvert/Makefile
@@ -19,9 +19,8 @@ RUN_DEPENDS=	p5-OLE-Storage_Lite>=0:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-USES=		shebangfix
+USES=		shebangfix perl5
 USE_BZIP2=	yes
-USE_PERL5=	yes
 EXTRACT_CMD=	${BZCAT}
 EXTRACT_BEFORE_ARGS=	
 EXTRACT_AFTER_ARGS=	> ${PORTNAME}.pl
diff --git a/mail/premail/Makefile b/mail/premail/Makefile
index 878375faeb2e..0392be838f13 100644
--- a/mail/premail/Makefile
+++ b/mail/premail/Makefile
@@ -14,9 +14,8 @@ COMMENT=	E-mail privacy package, support anon remailers, PGP, nyms
 BUILD_DEPENDS+=	pgp:${PORTSDIR}/security/pgp
 
 WRKSRC=		${WRKDIR}/premail
-USE_PERL5=	yes
 NO_BUILD=	yes
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	premail
 
 do-install:
diff --git a/mail/qmail-scanner1/Makefile b/mail/qmail-scanner1/Makefile
index 7627c9618b42..d64b6132ef3a 100644
--- a/mail/qmail-scanner1/Makefile
+++ b/mail/qmail-scanner1/Makefile
@@ -23,11 +23,10 @@ SUB_LIST=	SPOOLDIR=${SPOOLDIR}
 NO_LATEST_LINK=	yes
 CONFLICTS=	qmail-scanner-2.*
 
-USES=		qmail
+USES=		qmail perl5
 
 QMAIL_QUEUE=	${QMAIL_PREFIX}/bin/qmail-queue
 
-USE_PERL5=	yes
 NO_BUILD=	yes
 
 # Barely optionnal
diff --git a/mail/tlb/Makefile b/mail/tlb/Makefile
index 55707c2d0d4c..a280c3fc7a03 100644
--- a/mail/tlb/Makefile
+++ b/mail/tlb/Makefile
@@ -17,13 +17,12 @@ RUN_DEPENDS=	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
 		p5-Net>=0:${PORTSDIR}/net/p5-Net
 
 NO_BUILD=	yes
-USE_PERL5=	yes
 
 DOCS=	FAQ INSTALL README README.loglevels README.mungelist TIPS TODO \
 	complete.tlb mj.tlb simple.tlb
 FIXPREFIX=	tlb mungelist complete.tlb mj.tlb simple.tlb
 
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	${FIXPREFIX}
 perl_OLD_CMD=	/usr/local/bin/perl5
 
diff --git a/misc/chord2html/Makefile b/misc/chord2html/Makefile
index cbc7ceaf3fe4..4de90797c34a 100644
--- a/misc/chord2html/Makefile
+++ b/misc/chord2html/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Convert CHORD input files to HTML
 
 RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
 
-USE_PERL5=	yes
+USES=		shebangfix perl5
 NO_BUILD=	yes
-USES=		shebangfix
 SHEBANG_FILES=	chord2html
 
 MAN1=	chord2html.1
diff --git a/misc/qlas/Makefile b/misc/qlas/Makefile
index 8cad2a84f39d..4913ff42f7dc 100644
--- a/misc/qlas/Makefile
+++ b/misc/qlas/Makefile
@@ -9,10 +9,9 @@ MASTER_SITES=	http://lev.serebryakov.spb.ru/download/qlas/
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	Qico FIDO mailer log analyzer and statistic builder
 
-USE_PERL5=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	qlas
 USE_DOS2UNIX=	qlas qlas.conf.default
 
diff --git a/net-mgmt/yaf/Makefile b/net-mgmt/yaf/Makefile
index a0caf14d8c34..4ba29de193d5 100644
--- a/net-mgmt/yaf/Makefile
+++ b/net-mgmt/yaf/Makefile
@@ -17,10 +17,9 @@ LIB_DEPENDS=	fixbuf:${PORTSDIR}/net/libfixbuf \
 		pcre.3:${PORTSDIR}/devel/pcre
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		pkgconfig perl5
 USE_GNOME=	glib20 gnomehack
 USE_LDCONFIG=	yes
-USE_PERL5=	yes
 CONFIOGURE_ARGS+=	--disable-doxygen
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index fd190f326cd1..88f21b34fb9e 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -26,10 +26,8 @@ PLIST_SUB=	VERSION=${PORTVERSION}
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
-USES=		gettext
+USES=		gettext gmake perl5
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 0984de354e19..aa652df6ec9e 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -14,9 +14,8 @@ LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_XORG=	xpm ice sm xext xmu x11
 USE_GHOSTSCRIPT=	yes
-USE_GMAKE=	yes
-USES=		iconv
-USE_PERL5_BUILD=	yes
+USES=		iconv gmake perl5
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/print/p5-Font-FreeType/Makefile b/print/p5-Font-FreeType/Makefile
index fb192cd7ce25..ad28a138f432 100644
--- a/print/p5-Font-FreeType/Makefile
+++ b/print/p5-Font-FreeType/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Perl extension to read font files and render glyphs using FreeType2
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
-PERL_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		pkgconfig perl5
+USE_PERL5=	configure
 
 MAN3=	Font::FreeType.3 \
 	Font::FreeType::Face.3 \
diff --git a/www/bannerfilter/Makefile b/www/bannerfilter/Makefile
index 7e355a685e46..2bc453719a21 100644
--- a/www/bannerfilter/Makefile
+++ b/www/bannerfilter/Makefile
@@ -14,8 +14,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	squid:${PORTSDIR}/www/squid
 
-USES=		shebangfix
-USE_PERL5=	yes
+USES=		shebangfix perl5
 NO_BUILD=	yes
 
 WWW_ROOT?=	www
diff --git a/www/calamaris/Makefile b/www/calamaris/Makefile
index df888f6dac42..63bcc94e8846 100644
--- a/www/calamaris/Makefile
+++ b/www/calamaris/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	http://cord.de/tools/squid/calamaris/
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A perl script to produce statistics out of Squid log files
 
-USE_PERL5=	yes
+USES=		shebangfix perl5
 NO_BUILD=	yes
-USES=		shebangfix
 SHEBANG_FILES=	calamaris
 
 MAN1=		calamaris.1
diff --git a/www/linklint/Makefile b/www/linklint/Makefile
index 3997367c8d14..fee43a547ddd 100644
--- a/www/linklint/Makefile
+++ b/www/linklint/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.linklint.org/download/ \
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Perl script that checks links on web sites
 
-USES=		shebangfix
-USE_PERL5_RUN=	yes
+USES=		shebangfix perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
 SHEBANG_FILES=	${DISTNAME}
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index db036ce0e802..7fd1f7ed115b 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -12,9 +12,9 @@ COMMENT=	GUI binding for using Open Inventor with Xt/Motif
 
 LIB_DEPENDS=	Coin.61:${PORTSDIR}/graphics/Coin
 
-USES=		motif pathfix
+USES=		motif pathfix perl5
 USE_GL=		yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 USE_XORG=	xi
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"