Before bsd.port.pre.mk, set either USE_PERL5 or WANT_PERL, depending on

whether the perl dependency is unconditional or conditional.  This will
be needed for the conditional inclusion of bsd.perl.mk.

18 files changed, 19 insertions, 0 deletions

diff --git a/audio/mp3riot/Makefile b/audio/mp3riot/Makefile
index 041b3cdeaf24..4bc916f7d58e 100644
--- a/audio/mp3riot/Makefile
+++ b/audio/mp3riot/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Mp3riot creates mp3 playlists, HTML files, etc
 RUN_DEPENDS=	${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info
 
 NO_BUILD=	yes
+USE_PERL5=	yes
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/databases/wfb2sql/Makefile b/databases/wfb2sql/Makefile
index bc4f0a54e10e..21f86109bfab 100644
--- a/databases/wfb2sql/Makefile
+++ b/databases/wfb2sql/Makefile
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 NO_BUILD=	YES
+USE_PERL5=	YES
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/wfb2sql ${PREFIX}/bin/wfb2sql
diff --git a/graphics/cbview/Makefile b/graphics/cbview/Makefile
index 2263739cea8d..686963640475 100644
--- a/graphics/cbview/Makefile
+++ b/graphics/cbview/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
 		${SITE_PERL}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote
 
 NO_BUILD=	yes
+USE_PERL5=	yes
 USE_X_PREFIX=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/graphics/cthumb/Makefile b/graphics/cthumb/Makefile
index 46f52d1fa51a..742863361874 100644
--- a/graphics/cthumb/Makefile
+++ b/graphics/cthumb/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/pnmscale:${PORTSDIR}/graphics/netpbm \
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-themedir=${DATADIR}
+USE_PERL5=	yes
 
 MAN1=		cthumb.1
 
diff --git a/graphics/orca/Makefile b/graphics/orca/Makefile
index bc12a4b7e8d8..d8324ade97fc 100644
--- a/graphics/orca/Makefile
+++ b/graphics/orca/Makefile
@@ -28,6 +28,7 @@ BUILD_DEPENDS=	\
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-html-dir=${PREFIX}/www/data/orca
+USE_PERL5=	yes
 
 MAN1=		orca.1
 
diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile
index 5fb7700a4a09..f0337b4d4e60 100644
--- a/japanese/namazu2/Makefile
+++ b/japanese/namazu2/Makefile
@@ -32,6 +32,7 @@ RUN_DEPENDS+=	${PM_BASE}/${PERL_ARCH}/MeCab.pm:${PORTSDIR}/japanese/p5-MeCab
 .endif
 
 NO_BUILD=	yes
+USE_PERL5=	yes
 
 do-install:
 	@${DO_NADA}
diff --git a/misc/callid/Makefile b/misc/callid/Makefile
index 2d0c0239854d..be45e6fbce49 100644
--- a/misc/callid/Makefile
+++ b/misc/callid/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility to log incoming calls using ISDN and output to mysql/php
 
 USE_MYSQL=	yes
+USE_PERL5=	yes
 USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
diff --git a/net-mgmt/flowscan/Makefile b/net-mgmt/flowscan/Makefile
index 708a1934efab..de39e52fba56 100644
--- a/net-mgmt/flowscan/Makefile
+++ b/net-mgmt/flowscan/Makefile
@@ -28,6 +28,7 @@ RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
 CFLOWD_FLOWSCAN_PATCH=	yes
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/var/db/flows
+USE_PERL5=		yes
 WRKSRC=			${WRKDIR}/FlowScan-${PORTVERSION}
 
 pre-install:
diff --git a/net-mgmt/nsc/Makefile b/net-mgmt/nsc/Makefile
index e855087f42d3..62974faf3b98 100644
--- a/net-mgmt/nsc/Makefile
+++ b/net-mgmt/nsc/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+USE_PERL5=	yes
 PLIST_FILES=	bin/nsc
 
 do-install:
diff --git a/net-mgmt/p5-Altoids/Makefile b/net-mgmt/p5-Altoids/Makefile
index a03e0bd7f560..0ce5a0afd6a2 100644
--- a/net-mgmt/p5-Altoids/Makefile
+++ b/net-mgmt/p5-Altoids/Makefile
@@ -19,6 +19,7 @@ BUILD_DEPENDS=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
+USE_PERL5=	yes
 
 CONFIGURE_ARGS+=	--with-perllib=${SITE_PERL} \
 			--with-oids=${LOCALBASE}/share/${PORTNAME:L}
diff --git a/net/ctrace/Makefile b/net/ctrace/Makefile
index 63b09e0e2819..ed366bd8fa69 100644
--- a/net/ctrace/Makefile
+++ b/net/ctrace/Makefile
@@ -18,6 +18,7 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP
 		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
 
 NO_BUILD=	yes
+USE_PERL5=	yes
 
 MAN1=		ctrace.1
 PLIST_FILES=	sbin/ctrace
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index ead721f74987..b0ecea6d6f0c 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -23,6 +23,7 @@ USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+USE_PERL5=	yes
 
 CONFLICTS=	xmlrpc-epi-0.*
 
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index ead721f74987..b0ecea6d6f0c 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -23,6 +23,7 @@ USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+USE_PERL5=	yes
 
 CONFLICTS=	xmlrpc-epi-0.*
 
diff --git a/print/ifhp/Makefile b/print/ifhp/Makefile
index 11ae5f20e986..623a90d8e858 100644
--- a/print/ifhp/Makefile
+++ b/print/ifhp/Makefile
@@ -23,6 +23,7 @@ COMMENT=	IFHP - A highly configurable print filter for LPRng
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GHOSTSCRIPT=	yes
+WANT_PERL=	yes
 
 MAN8=		ifhp.8 textps.8
 
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index c4f45738944d..867876c4ca18 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Generate HTML report summaries from snort incident alerts
 RUN_DEPENDS=	${SITE_PERL}/Time/JulianDay.pm:${PORTSDIR}/devel/p5-Time-modules
 
 NO_BUILD=	yes
+USE_PERL5=	yes
 
 do-install:
 	${SED} s,%LOCALBASE%,${LOCALBASE}, < ${WRKSRC}/snortsnarf.pl > ${WRKSRC}/snortsnarf
diff --git a/textproc/ascii2pdf/Makefile b/textproc/ascii2pdf/Makefile
index 1a4586f768a5..435c5af6ca91 100644
--- a/textproc/ascii2pdf/Makefile
+++ b/textproc/ascii2pdf/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A perl script to convert text files to PDF files
 RUN_DEPENDS=    ${SITE_PERL}/PDF/Create.pm:${PORTSDIR}/textproc/p5-PDF-Create
 
 NO_BUILD=	yes
+USE_PERL5=	yes
 PLIST_FILES=	bin/ascii2pdf
 
 .include <bsd.port.pre.mk>
diff --git a/textproc/ruby-xmlparser/Makefile b/textproc/ruby-xmlparser/Makefile
index b2e80491df63..da8d9053d568 100644
--- a/textproc/ruby-xmlparser/Makefile
+++ b/textproc/ruby-xmlparser/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv \
 		${PERL_ARCHLIB}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
 # to utilize encoding maps included in p5-XML-Parser
 
+USE_PERL5=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/www/slash/Makefile b/www/slash/Makefile
index 38743933bc93..8ecbf991df03 100644
--- a/www/slash/Makefile
+++ b/www/slash/Makefile
@@ -22,6 +22,8 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-D
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
 
+USE_PERL5=	yes
+
 MAKE_ARGS+=	SLASH_PREFIX=${PREFIX}/slash
 
 DOCS=		README INSTALL