This package installs stuff in the vendor_perl directory and knows

about the Perl version. Instead of baking the version number into the
PLIST, control it from the Makefile. Also, depend on the current
major/minor version of Perl. Ideally this version should come from
something in lang/perl5, but there isn't any obvious way to do that.
But at least now this only has to be updated in one place when Perl
changes.

Bump PKGREVISION because of the depends changes.

2 files changed, 63 insertions, 55 deletions

diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile
index e166e4cac8d..b4797c2c6b0 100644
--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2012/10/08 09:57:19 asau Exp $
+# $NetBSD: Makefile,v 1.26 2012/12/21 04:55:10 dholland Exp $
 #
 
 DISTNAME=	dpkg_1.16.3
 PKGNAME=	dpkg-1.16.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/}
 EXTRACT_SUFX=	.tar.bz2
@@ -29,6 +29,14 @@ REPLACE_PERL+=		dselect/methods/ftp/install
 REPLACE_PERL+=		dselect/methods/ftp/setup
 REPLACE_PERL+=		dselect/methods/ftp/update
 
+# XXX this is probably not the best way to do this but it'll have to
+# serve for the moment.
+THIS_PERL_VERSION=	5.16.0
+NEXT_PERL_VERSION=	5.18.0
+PLIST_SUBST+=		PERL=${THIS_PERL_VERSION}
+PERL_DEP=		perl>=${THIS_PERL_VERSION}<${NEXT_PERL_VERSION}
+DEPENDS+=		${PERL_DEP}:../../lang/perl5
+
 CONFIGURE_ARGS+=	--with-zlib
 CONFIGURE_ARGS+=	--disable-start-stop-daemon
 CONFIGURE_ARGS+=	--with-admindir=${VARBASE}/db/dpkg
diff --git a/misc/dpkg/PLIST b/misc/dpkg/PLIST
index 4b62ebdbc87..c186e7513ee 100644
--- a/misc/dpkg/PLIST
+++ b/misc/dpkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/05/26 14:27:20 christos Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/12/21 04:55:10 dholland Exp $
 bin/dpkg
 bin/dpkg-architecture
 bin/dpkg-buildflags
@@ -90,58 +90,58 @@ lib/dpkg/methods/multicd/setup
 lib/dpkg/methods/multicd/update
 lib/dpkg/parsechangelog/debian
 lib/libdpkg.a
-lib/perl5/vendor_perl/5.14.0/Debian/Dselect/Ftp.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Arch.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/BuildFlags.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/BuildOptions.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Changelog.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Changelog/Debian.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Changelog/Entry.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Changelog/Entry/Debian.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Changelog/Parse.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Checksums.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Compression.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Compression/FileHandle.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Compression/Process.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Conf.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Control.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Control/Changelog.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Control/Fields.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Control/Hash.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Control/Info.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Control/Types.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Deps.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/ErrorHandling.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Exit.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Gettext.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/IPC.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Index.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Interface/Storable.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Path.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Shlibs.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Shlibs/Cppfilt.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Shlibs/Objdump.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Shlibs/Symbol.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Shlibs/SymbolFile.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Archive.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Functions.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V1.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V2.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V3/bzr.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V3/custom.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V3/git.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V3/native.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V3/quilt.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Patch.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Substvars.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Vars.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Vendor.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Vendor/Debian.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Vendor/Default.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Vendor/Ubuntu.pm
-lib/perl5/vendor_perl/5.14.0/Dpkg/Version.pm
+lib/perl5/vendor_perl/${PERL}/Debian/Dselect/Ftp.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Arch.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/BuildFlags.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/BuildOptions.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Changelog.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Changelog/Debian.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Changelog/Entry.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Changelog/Entry/Debian.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Changelog/Parse.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Checksums.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Compression.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Compression/FileHandle.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Compression/Process.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Conf.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Control.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Control/Changelog.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Control/Fields.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Control/Hash.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Control/Info.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Control/Types.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Deps.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/ErrorHandling.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Exit.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Gettext.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/IPC.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Index.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Interface/Storable.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Path.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Shlibs.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Shlibs/Cppfilt.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Shlibs/Objdump.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Shlibs/Symbol.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Shlibs/SymbolFile.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Archive.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Functions.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V1.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V2.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V3/bzr.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V3/custom.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V3/git.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V3/native.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V3/quilt.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Patch.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Substvars.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Vars.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Vendor.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Vendor/Debian.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Vendor/Default.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Vendor/Ubuntu.pm
+lib/perl5/vendor_perl/${PERL}/Dpkg/Version.pm
 lib/pkgconfig/libdpkg.pc
 man/de/man1/dpkg-architecture.1
 man/de/man1/dpkg-buildflags.1