From 1ac725f15c8bca25eb9a0024a802d8d20b1dd601 Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sat, 3 Sep 2011 20:30:03 +0000
Subject: [PATCH] - Fix minimal required perl version - Add conditional
 BUILD_DEPENDS - Sort PLIST

---
 textproc/p5-CSS-Minifier-XS/Makefile         | 10 ++++++++--
 textproc/p5-CSS-Minifier-XS/pkg-plist        |  6 +++---
 textproc/p5-JavaScript-Minifier-XS/Makefile  | 10 ++++++++--
 textproc/p5-JavaScript-Minifier-XS/pkg-plist |  6 +++---
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/textproc/p5-CSS-Minifier-XS/Makefile b/textproc/p5-CSS-Minifier-XS/Makefile
index 24052f210a94..0d58c2d339bb 100644
--- a/textproc/p5-CSS-Minifier-XS/Makefile
+++ b/textproc/p5-CSS-Minifier-XS/Makefile
@@ -14,8 +14,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	XS based CSS minifier
 
-PERL_CONFIGURE=	yes
+PERL_CONFIGURE=	5.8.8+
 
 MAN3=		CSS::Minifier::XS.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501200
+BUILD_DEPENDS+=	p5-Module-Build>=0.3500:${PORTSDIR}/devel/p5-Module-Build
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/p5-CSS-Minifier-XS/pkg-plist b/textproc/p5-CSS-Minifier-XS/pkg-plist
index f4faacd089ba..ad2778b7d1d9 100644
--- a/textproc/p5-CSS-Minifier-XS/pkg-plist
+++ b/textproc/p5-CSS-Minifier-XS/pkg-plist
@@ -1,9 +1,9 @@
+%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Minifier/XS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Minifier/XS/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Minifier/XS/XS.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Minifier/XS/XS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/CSS/Minifier/XS.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/CSS/Minifier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CSS
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Minifier/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Minifier
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/CSS/Minifier
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CSS
diff --git a/textproc/p5-JavaScript-Minifier-XS/Makefile b/textproc/p5-JavaScript-Minifier-XS/Makefile
index 9955782c6d6b..2fd9603814bd 100644
--- a/textproc/p5-JavaScript-Minifier-XS/Makefile
+++ b/textproc/p5-JavaScript-Minifier-XS/Makefile
@@ -14,8 +14,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	XS based JavaScript minifier
 
-PERL_CONFIGURE=	yes
+PERL_CONFIGURE=	5.8.8+
 
 MAN3=		JavaScript::Minifier::XS.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501200
+BUILD_DEPENDS+=	p5-Module-Build>=0.3500:${PORTSDIR}/devel/p5-Module-Build
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/p5-JavaScript-Minifier-XS/pkg-plist b/textproc/p5-JavaScript-Minifier-XS/pkg-plist
index f260f9fcbff1..0d1074093212 100644
--- a/textproc/p5-JavaScript-Minifier-XS/pkg-plist
+++ b/textproc/p5-JavaScript-Minifier-XS/pkg-plist
@@ -1,9 +1,9 @@
+%%SITE_PERL%%/%%PERL_ARCH%%/JavaScript/Minifier/XS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Minifier/XS/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Minifier/XS/XS.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Minifier/XS/XS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/JavaScript/Minifier/XS.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/JavaScript/Minifier
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JavaScript
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Minifier/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Minifier
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/JavaScript/Minifier
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JavaScript