10 files changed, 26 insertions, 44 deletions

diff --git a/textproc/man2html/Makefile b/textproc/man2html/Makefile
index bee7de0a15e7..c8e5940fd9ce 100644
--- a/textproc/man2html/Makefile
+++ b/textproc/man2html/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   	man2html
-# Date created:				29 August 1998
-# Whom:                			Dima Sivachenko <demon@gpad.ac.ru>
-#
+# Created by: Dima Sivachenko <demon@gpad.ac.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	man2html
 PORTVERSION=	3.0.1
@@ -16,7 +12,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Convert nroff(1) man pages to HTML
 
-USE_PERL5=	yes
+USES=		perl5
+USE_PERL5=	run build patch
 NO_BUILD=	yes
 CGIDIR=		${PREFIX}/www/cgi-bin
 
diff --git a/textproc/p5-PerlPoint-Converters/Makefile b/textproc/p5-PerlPoint-Converters/Makefile
index 82339b6f5980..796673d2b53f 100644
--- a/textproc/p5-PerlPoint-Converters/Makefile
+++ b/textproc/p5-PerlPoint-Converters/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-PerlPoint-Converters
-# Date created:		8 Jun 2004
-# Whom:	      		mat
-#
+# Created by: mat
 # $FreeBSD$
-#
 
 PORTNAME=	PerlPoint-Converters
 PORTVERSION=	1.02.05
@@ -19,7 +15,8 @@ BUILD_DEPENDS=	p5-PerlPoint-Package>=0:${PORTSDIR}/textproc/p5-PerlPoint-Package
 		p5-Getopt-ArgvFile>=0:${PORTSDIR}/devel/p5-Getopt-ArgvFile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure patch
 
 MAN1=		pp2html.1 pp2latex.1
 MAN3=		Bundle::PerlPoint.3 \
diff --git a/textproc/p5-Spreadsheet-WriteExcel/Makefile b/textproc/p5-Spreadsheet-WriteExcel/Makefile
index 66ad67ccbcf5..94bc18bf9662 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel/Makefile
@@ -17,6 +17,8 @@ BUILD_DEPENDS=	p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
+USE_DOS2UNIX=	yes
+DOS2UNIX_REGEX=	"*.p[lm]"
 
 MAN1=		chartex.1
 MAN3=		Spreadsheet::WriteExcel.3 \
@@ -40,10 +42,6 @@ MAN3=		Spreadsheet::WriteExcel.3 \
 		Spreadsheet::WriteExcel::Workbook.3 \
 		Spreadsheet::WriteExcel::Worksheet.3
 
-post-patch:
-	@${FIND} ${WRKSRC} -name "*.p[lm]"| \
-	${XARGS} ${PERL} -pi -e 's/\x0D(?=\x0A)//g'
-
 post-install:
 .ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
diff --git a/textproc/p5-Text-FixedLength-Extra/Makefile b/textproc/p5-Text-FixedLength-Extra/Makefile
index 0424d8cced2b..77e7847291d1 100644
--- a/textproc/p5-Text-FixedLength-Extra/Makefile
+++ b/textproc/p5-Text-FixedLength-Extra/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	textproc/p5-Text-FixedLength-Extra
-# Date created:				30 December 2000
-# Whom:					Anton Berezin <tobez@tobez.org>
-#
+# Created by: Anton Berezin <tobez@tobez.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Text-FixedLength-Extra
 PORTVERSION=	1.1
@@ -17,7 +13,8 @@ COMMENT=	Various niceties for p5-Text-FixedLength lovers
 BUILD_DEPENDS=	p5-Text-FixedLength>=0:${PORTSDIR}/textproc/p5-Text-FixedLength
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure patch
 
 MAN3=		Text::FixedLength::Extra.3
 
diff --git a/textproc/p5-Text-Query/Makefile b/textproc/p5-Text-Query/Makefile
index f04199ba842d..eba4a42e59b3 100644
--- a/textproc/p5-Text-Query/Makefile
+++ b/textproc/p5-Text-Query/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	textproc/p5-Text-Query
-# Date created:				31 December 2000
-# Whom:					Anton Berezin <tobez@tobez.org>
-#
+# Created by: Anton Berezin <tobez@tobez.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Text-Query
 PORTVERSION=	0.07
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Query processing framework
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure patch
 
 MAN3=		Text::Query.3 Text::Query::Build.3 \
 		Text::Query::BuildAdvancedString.3 \
diff --git a/textproc/p5-Text-Tmpl/Makefile b/textproc/p5-Text-Tmpl/Makefile
index 3713bf465553..df31a5c13689 100644
--- a/textproc/p5-Text-Tmpl/Makefile
+++ b/textproc/p5-Text-Tmpl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	textproc/p5-Text-Tmpl
-# Date created:				31 December 2000
-# Whom:					Anton Berezin <tobez@tobez.org>
-#
+# Created by: Anton Berezin <tobez@tobez.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Text-Tmpl
 PORTVERSION=	0.33
@@ -14,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Templating system perl library
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure patch
 
 MAN3=		template_syntax.3 Text::Tmpl.3 template_extend.3
 
diff --git a/textproc/p5-XML-SAX-Expat/Makefile b/textproc/p5-XML-SAX-Expat/Makefile
index 069624088415..eadc505640b4 100644
--- a/textproc/p5-XML-SAX-Expat/Makefile
+++ b/textproc/p5-XML-SAX-Expat/Makefile
@@ -15,7 +15,8 @@ RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
 		p5-XML-NamespaceSupport>=0:${PORTSDIR}/textproc/p5-XML-NamespaceSupport
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure patch
 
 MAN3=		XML::SAX::Expat.3
 
diff --git a/textproc/p5-XML-STX/Makefile b/textproc/p5-XML-STX/Makefile
index 74115c53dfc0..fe25a3b1cf0c 100644
--- a/textproc/p5-XML-STX/Makefile
+++ b/textproc/p5-XML-STX/Makefile
@@ -15,7 +15,8 @@ BUILD_DEPENDS=	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
 		p5-XML-NamespaceSupport>=0:${PORTSDIR}/textproc/p5-XML-NamespaceSupport
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure patch
 
 MAN3=		XML::STX.3 XML::STX::Base.3 XML::STX::Buffer.3 \
 		XML::STX::Functions.3 XML::STX::Parser.3 XML::STX::Runtime.3 \
diff --git a/textproc/p5-XML-SimpleObject/Makefile b/textproc/p5-XML-SimpleObject/Makefile
index 29d54102d2b7..30ea0d691249 100644
--- a/textproc/p5-XML-SimpleObject/Makefile
+++ b/textproc/p5-XML-SimpleObject/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-XML-SimpleObject
-# Date created:				14 November 2001
-# Whom:	      				steve
-#
+# Created by: steve
 # $FreeBSD$
-#
 
 PORTNAME=	XML-SimpleObject
 PORTVERSION=	0.53
@@ -19,7 +15,8 @@ BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
 WRKSRC?=	${WRKDIR}/${PORTNAME}${PORTVERSION}
 
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure patch
 CONFIGURE_ARGS+=	DIR='Enhanced'
 
 MAN3=		XML::SimpleObject.3
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index c66e682e5dec..d9f18ff23d11 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -39,9 +39,9 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lexpat -liconv
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-USES=		iconv
+USES=		iconv perl5
 GNU_CONFIGURE=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build patch
 
 MAN1=	sabcmd.1