4 files changed, 20 insertions, 17 deletions

diff --git a/devel/p5-Locale-Maketext-Lexicon/Makefile b/devel/p5-Locale-Maketext-Lexicon/Makefile
index 7ddf619d40c7..c915f941eb47 100644
--- a/devel/p5-Locale-Maketext-Lexicon/Makefile
+++ b/devel/p5-Locale-Maketext-Lexicon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Locale-Maketext-Lexicon
-PORTVERSION=	0.21
+PORTVERSION=	0.26
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Locale
@@ -23,10 +23,6 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
 
-SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
 MAN3=		Locale::Maketext::Lexicon::Auto.3 \
 		Locale::Maketext::Lexicon::Gettext.3 \
 		Locale::Maketext::Lexicon::Msgcat.3 \
@@ -35,7 +31,14 @@ MAN3=		Locale::Maketext::Lexicon::Auto.3 \
 
 MAN1=		xgettext.pl.1
 
-pre-configure:
-	@${FIND} ${WRKSRC} -name \*.orig -delete
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} <= 500601
+.if ${PERL_LEVEL} == 500601
+BUILD_DEPENDS+=	${SITE_PERL}/Encode/compat.pm:${PORTSDIR}/devel/p5-Encode-compat
+.else
+IGNORE="Need at least perl 5.6.1 to build"
+.endif
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Locale-Maketext-Lexicon/distinfo b/devel/p5-Locale-Maketext-Lexicon/distinfo
index 5dcc8e93f2b0..204e6a83314c 100644
--- a/devel/p5-Locale-Maketext-Lexicon/distinfo
+++ b/devel/p5-Locale-Maketext-Lexicon/distinfo
@@ -1 +1 @@
-MD5 (Locale-Maketext-Lexicon-0.21.tar.gz) = a11d59a6e99f53ae1672ab8801ac0159
+MD5 (Locale-Maketext-Lexicon-0.26.tar.gz) = b3738bb0872d3d768c1d39d90242a4db
diff --git a/devel/p5-Locale-Maketext-Lexicon/pkg-descr b/devel/p5-Locale-Maketext-Lexicon/pkg-descr
index fb856fa6ff7d..b282c7bd89bd 100644
--- a/devel/p5-Locale-Maketext-Lexicon/pkg-descr
+++ b/devel/p5-Locale-Maketext-Lexicon/pkg-descr
@@ -1,4 +1,4 @@
 This module provides lexicon-handling modules to read from other localization
 formats, such as Gettext, Msgcat, and so on. 
 
-WWW: http://search.cpan.org/author/AUTRIJUS/Locale-Maketext-Lexicon/
+WWW: http://search.cpan.org/dist/Locale-Maketext-Lexicon/
diff --git a/devel/p5-Locale-Maketext-Lexicon/pkg-plist b/devel/p5-Locale-Maketext-Lexicon/pkg-plist
index 44d907e43fa7..53b01a0e982f 100644
--- a/devel/p5-Locale-Maketext-Lexicon/pkg-plist
+++ b/devel/p5-Locale-Maketext-Lexicon/pkg-plist
@@ -1,8 +1,8 @@
 bin/xgettext.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/Maketext/Lexicon/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Maketext/Lexicon.pm
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Maketext/Lexicon/Gettext.pm
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Maketext/Lexicon/Auto.pm
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Maketext/Lexicon/Msgcat.pm
-lib/perl5/site_perl/%%PERL_VER%%/Locale/Maketext/Lexicon/Tie.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/Maketext/Lexicon
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Lexicon/.packlist
+%%SITE_PERL%%/Locale/Maketext/Lexicon.pm
+%%SITE_PERL%%/Locale/Maketext/Lexicon/Gettext.pm
+%%SITE_PERL%%/Locale/Maketext/Lexicon/Auto.pm
+%%SITE_PERL%%/Locale/Maketext/Lexicon/Msgcat.pm
+%%SITE_PERL%%/Locale/Maketext/Lexicon/Tie.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Lexicon