Update to 2.19:

* Allow use of Config::General variables in tainted code.
* Add a search-path feature for include files.

Tidy up pkg-plist.

PR:		ports/51838
Submitted by:	Mathieu Arnold <m@absolight.net>

4 files changed, 20 insertions, 12 deletions

diff --git a/devel/p5-Config-General/Makefile b/devel/p5-Config-General/Makefile
index 9343ab656a02..ca6a8aff256a 100644
--- a/devel/p5-Config-General/Makefile
+++ b/devel/p5-Config-General/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Config-General
-PORTVERSION=	2.15
+PORTVERSION=	2.19
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Config
@@ -17,8 +17,14 @@ COMMENT=	Perl5 module for handling Apache-style configuration files
 
 PERL_CONFIGURE=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Config::General::Extended.3 Config::General::Interpolated.3 \
 		Config::General.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} <= 500600
+BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Config-General/distinfo b/devel/p5-Config-General/distinfo
index 18f0c71a0198..3c041e3ee12a 100644
--- a/devel/p5-Config-General/distinfo
+++ b/devel/p5-Config-General/distinfo
@@ -1 +1 @@
-MD5 (Config-General-2.15.tar.gz) = bacd6f23edb4a45b78129ed5485f415a
+MD5 (Config-General-2.19.tar.gz) = 53d56dd9a23f062001721d78ec77e6b3
diff --git a/devel/p5-Config-General/pkg-descr b/devel/p5-Config-General/pkg-descr
index 3b41aa491d3b..65f4963fa576 100644
--- a/devel/p5-Config-General/pkg-descr
+++ b/devel/p5-Config-General/pkg-descr
@@ -2,3 +2,5 @@ Config::General handles configuration files of a format inspired by
 Apache's httpd.conf file format.  It features some enhancements such
 as here-documents, C-style commends and multiline options.  Both
 reading and writing of configuration files is supported.
+
+WWW: http://search.cpan.org/dist/Config-General/
diff --git a/devel/p5-Config-General/pkg-plist b/devel/p5-Config-General/pkg-plist
index 8ebadc457c03..7f6d80d5711f 100644
--- a/devel/p5-Config-General/pkg-plist
+++ b/devel/p5-Config-General/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Config/General.pm
-lib/perl5/site_perl/%%PERL_VER%%/Config/General/Extended.pm
-lib/perl5/site_perl/%%PERL_VER%%/Config/General/Interpolated.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Config/General/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Config/General
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Config/General 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Config 2>/dev/null || true
+%%SITE_PERL%%/Config/General.pm
+%%SITE_PERL%%/Config/General/Extended.pm
+%%SITE_PERL%%/Config/General/Interpolated.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/General/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/General
+@dirrm %%SITE_PERL%%/Config/General
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Config 2>/dev/null || true