- Convert to new perl framework

Approved by:	bapt@ (office@)

9 files changed, 18 insertions, 16 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 8af61646512a..91db39695d99 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -27,9 +27,9 @@ USE_GSTREAMER=	yes
 #USE_GCC=	4.6+
 USE_GMAKE=	yes
 USE_PYTHON=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 USE_BZIP2=	yes
-USES+=		bison
+USES+=		bison perl5
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
 
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 9fb5b0170075..03151a89e105 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -28,9 +28,9 @@ USE_GSTREAMER=	yes
 #WITH_GCC=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
-USE_PERL5_BUILD=	yes
 USE_BZIP2=	yes
-USES+=		bison
+USES+=		bison perl5
+USE_PERL5=	build
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
 
diff --git a/german/hunspell/Makefile b/german/hunspell/Makefile
index fc5f6b2cec6b..8a5c3088ab17 100644
--- a/german/hunspell/Makefile
+++ b/german/hunspell/Makefile
@@ -13,11 +13,11 @@ COMMENT=	German hunspell dictionaries
 BUILD_DEPENDS=	buildhash:${PORTSDIR}/textproc/ispell \
 		hunspell:${PORTSDIR}/textproc/hunspell
 
-USES=		shebangfix
+USES=		shebangfix perl5
 USE_BZIP2=	yes
 ALL_TARGET=	hunspell-all
 USE_GMAKE=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 SHEBANG_FILES=	bin/*.pl
 
 PLIST_FILES=	%%DATADIR%%/de_AT.aff \
diff --git a/hebrew/hunspell/Makefile b/hebrew/hunspell/Makefile
index db95e719a467..c6ff7a3e3738 100644
--- a/hebrew/hunspell/Makefile
+++ b/hebrew/hunspell/Makefile
@@ -18,11 +18,12 @@ COMMENT=	Hebrew hunspell dictionaries
 
 BUILD_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 
+USES=		perl5
 ALL_TARGET=	hunspell
 CONFIGURE_ARGS=	--enable-fatverb
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 
 PLIST_FILES=	%%DATADIR%%/he.aff \
 		%%DATADIR%%/he.dic
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index b63ebf0b6c9c..c20b021c4bf5 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -24,8 +24,8 @@ CONFIGURE_ARGS=		--enable-dict-dir=${DATADIR}	\
 			--enable-static
 
 USE_GMAKE=		yes
-USES=			iconv
-USE_PERL5_BUILD=	yes
+USES=			iconv perl5
+USE_PERL5=		build
 USE_LDCONFIG=		yes
 
 MAKE_ARGS=		NOPORTDOCS=${NOPORTDOCS}
diff --git a/textproc/hyphen/Makefile b/textproc/hyphen/Makefile
index 375cdbb36664..f1af69bc3128 100644
--- a/textproc/hyphen/Makefile
+++ b/textproc/hyphen/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Library for high quality hyphenation and justification
 BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
 
 GNU_CONFIGURE=	yes
-USES=	pathfix
+USES=	pathfix perl5
+USE_PERL5=	build
 USE_LDCONFIG=	yes
-USE_PERL5_BUILD=	yes
 
 CONFIGURE_ENV+=	ac_cv_prog_AWK=gawk
 
diff --git a/textproc/libvisio/Makefile b/textproc/libvisio/Makefile
index 24ada0f67391..c08f7bcbb0f5 100644
--- a/textproc/libvisio/Makefile
+++ b/textproc/libvisio/Makefile
@@ -20,9 +20,9 @@ CONFIGURE_ARGS=	--disable-werror
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 USE_XZ=		yes
-USES=		gmake pathfix pkgconfig
+USES=		gmake pathfix pkgconfig perl5
 
 .include <bsd.port.pre.mk>
 
diff --git a/ukrainian/hunspell/Makefile b/ukrainian/hunspell/Makefile
index 34c04f14f46d..7fa73eb0a5d2 100644
--- a/ukrainian/hunspell/Makefile
+++ b/ukrainian/hunspell/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Ukrainian hunspell dictionaries
 
 BUILD_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 
-USES=		shebangfix
+USES=		shebangfix perl5
 ALL_TARGET=	myspell
 USE_GMAKE=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 SHEBANG_FILES=	bin/*.pl
 
 PLIST_FILES=	%%DATADIR%%/uk_UA.aff \
diff --git a/ukrainian/mythes/Makefile b/ukrainian/mythes/Makefile
index 59bcb89bb5da..1edeb881b6df 100644
--- a/ukrainian/mythes/Makefile
+++ b/ukrainian/mythes/Makefile
@@ -20,7 +20,8 @@ COMMENT=	Ukrainian thesaurus
 LICENSE=	LGPL21 GPLv2
 LICENSE_COMB=	dual
 
-USE_PERL5_BUILD=	yes
+USES=		perl5
+USE_PERL5=	build
 
 PLIST_FILES=	%%DATADIR%%/th_uk_UA.dat \
 		%%DATADIR%%/th_uk_UA.idx