- Sort OPTIONS and PLIST

- Use bsd.port.options.mk
- Use REINPLACE_CMD
- Pet portlint
- Add CPAN as primary WWW
- Cosmetic change

3 files changed, 29 insertions, 22 deletions

diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index f54a016a4c61..59b5e0384526 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -9,44 +9,50 @@ PORTNAME=	Template-Toolkit
 PORTVERSION=	2.22
 PORTREVISION=	1
 CATEGORIES=	www textproc perl5
-MASTER_SITES=	CPAN
+MASTER_SITES=	CPAN \
+		http://www.template-toolkit.org/download/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensive Toolkit for template processing
 
-BUILD_DEPENDS=	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	p5-AppConfig>=1.56:${PORTSDIR}/devel/p5-AppConfig
+RUN_DEPENDS=	p5-AppConfig>=1.56:${PORTSDIR}/devel/p5-AppConfig
 
-OPTIONS=IMAGE_INFO	"With Image::Info Plugin"		off \
-	IMAGE_SIZE	"With Image::Size Plugin"		off \
-	DATE_CALC	"With Date::Calc Plugin"		off \
-	POD_POM		"With Pod::POM Plugin"			off
+OPTIONS=	DATE_CALC	"With Date::Calc Plugin"	off \
+		IMAGE_INFO	"With Image::Info Plugin"	off \
+		IMAGE_SIZE	"With Image::Size Plugin"	off \
+		POD_POM		"With Pod::POM Plugin"		off
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS+=	TT_ACCEPT=y
+CONFIGURE_ARGS=	TT_ACCEPT=y
 
-MASTER_SITE_BACKUP+=	http://www.template-toolkit.org/download/
+.include "Makefile.man"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+
+.if defined(WITH_DATE_CALC)
+BUILD_DEPENDS+=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
+RUN_DEPENDS+=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
+.endif
 
 .if defined(WITH_IMAGE_INFO)
-BUILD_DEPENDS+=${SITE_PERL}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info
+BUILD_DEPENDS+=	p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info
+RUN_DEPENDS+=	p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info
 .endif
+
 .if defined(WITH_IMAGE_SIZE)
-BUILD_DEPENDS+=${SITE_PERL}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size
-.endif
-.if defined(WITH_DATE_CALC)
-BUILD_DEPENDS+=p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
+BUILD_DEPENDS+=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size
+RUN_DEPENDS+=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size
 .endif
+
 .if defined(WITH_POD_POM)
-BUILD_DEPENDS+=${SITE_PERL}/Pod/POM.pm:${PORTSDIR}/textproc/p5-Pod-POM
+BUILD_DEPENDS+=	p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM
+RUN_DEPENDS+=	p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM
 .endif
 
-.include "Makefile.man"
-
 post-patch:
-	${PERL} -pi -e 's,/usr/local/tt2,${PREFIX}/share/tt2,g' \
+	@${REINPLACE_CMD} -e '/PREFIX/ s|/usr/local|${PREFIX}/share|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-Template-Toolkit/pkg-descr b/www/p5-Template-Toolkit/pkg-descr
index fc9b790c80f9..a52fce622ef9 100644
--- a/www/p5-Template-Toolkit/pkg-descr
+++ b/www/p5-Template-Toolkit/pkg-descr
@@ -1,3 +1,4 @@
 Extensive Toolkit for template processing.
 
+WWW: http://search.cpan.org/dist/Template-Toolkit/
 WWW: http://www.template-toolkit.org/
diff --git a/www/p5-Template-Toolkit/pkg-plist b/www/p5-Template-Toolkit/pkg-plist
index 5e607120ae00..8b245a63a2da 100644
--- a/www/p5-Template-Toolkit/pkg-plist
+++ b/www/p5-Template-Toolkit/pkg-plist
@@ -1,3 +1,5 @@
+bin/tpage
+bin/ttree
 %%SITE_PERL%%/%%PERL_ARCH%%/Template.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Base.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Config.pm
@@ -66,8 +68,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.so
-bin/tpage
-bin/ttree
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template