Fri Dec 21 04:55:11 2012 UTC ()
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.


(dholland)
diff -r1.25 -r1.26 pkgsrc/misc/dpkg/Makefile
diff -r1.6 -r1.7 pkgsrc/misc/dpkg/PLIST
cvs diff -r1.25 -r1.26 pkgsrc/misc/dpkg/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/dpkg/Makefile 2012/10/08 09:57:19 1.25
+++ pkgsrc/misc/dpkg/Makefile 2012/12/21 04:55:10 1.26
@@ -1,44 +1,52 @@ @@ -1,44 +1,52 @@
1# $NetBSD: Makefile,v 1.25 2012/10/08 09:57:19 asau Exp $ 1# $NetBSD: Makefile,v 1.26 2012/12/21 04:55:10 dholland Exp $
2# 2#
3 3
4DISTNAME= dpkg_1.16.3 4DISTNAME= dpkg_1.16.3
5PKGNAME= dpkg-1.16.3 5PKGNAME= dpkg-1.16.3
6PKGREVISION= 2 6PKGREVISION= 3
7CATEGORIES= misc 7CATEGORIES= misc
8MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/} 8MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://wiki.debian.org/Teams/Dpkg 12HOMEPAGE= http://wiki.debian.org/Teams/Dpkg
13COMMENT= Package maintenance system for Debian 13COMMENT= Package maintenance system for Debian
14 14
15BUILD_DEPENDS+= po4a>=0:../../textproc/po4a 15BUILD_DEPENDS+= po4a>=0:../../textproc/po4a
16BUILD_DEPENDS+= gtar>=1.26:../../archivers/gtar 16BUILD_DEPENDS+= gtar>=1.26:../../archivers/gtar
17 17
18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
19BUILD_DEFS+= VARBASE 19BUILD_DEFS+= VARBASE
20 20
21USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
24USE_TOOLS+= gmake msgfmt perl:run 24USE_TOOLS+= gmake msgfmt perl:run
25USE_NCURSES= yes # needs tigetstr() 25USE_NCURSES= yes # needs tigetstr()
26 26
27REPLACE_PERL= scripts/*.pl 27REPLACE_PERL= scripts/*.pl
28REPLACE_PERL+= dselect/methods/ftp/install 28REPLACE_PERL+= dselect/methods/ftp/install
29REPLACE_PERL+= dselect/methods/ftp/setup 29REPLACE_PERL+= dselect/methods/ftp/setup
30REPLACE_PERL+= dselect/methods/ftp/update 30REPLACE_PERL+= dselect/methods/ftp/update
31 31
 32# XXX this is probably not the best way to do this but it'll have to
 33# serve for the moment.
 34THIS_PERL_VERSION= 5.16.0
 35NEXT_PERL_VERSION= 5.18.0
 36PLIST_SUBST+= PERL=${THIS_PERL_VERSION}
 37PERL_DEP= perl>=${THIS_PERL_VERSION}<${NEXT_PERL_VERSION}
 38DEPENDS+= ${PERL_DEP}:../../lang/perl5
 39
32CONFIGURE_ARGS+= --with-zlib 40CONFIGURE_ARGS+= --with-zlib
33CONFIGURE_ARGS+= --disable-start-stop-daemon 41CONFIGURE_ARGS+= --disable-start-stop-daemon
34CONFIGURE_ARGS+= --with-admindir=${VARBASE}/db/dpkg 42CONFIGURE_ARGS+= --with-admindir=${VARBASE}/db/dpkg
35CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/share/dpkg 43CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/share/dpkg
36 44
37.include "../../mk/bsd.prefs.mk" 45.include "../../mk/bsd.prefs.mk"
38 46
39.if ${OPSYS} == "Darwin" 47.if ${OPSYS} == "Darwin"
40CONFIGURE_ARGS+= --enable-linker-optimisations=no 48CONFIGURE_ARGS+= --enable-linker-optimisations=no
41.endif 49.endif
42 50
43.include "../../archivers/bzip2/buildlink3.mk" 51.include "../../archivers/bzip2/buildlink3.mk"
44.include "../../converters/libiconv/buildlink3.mk" 52.include "../../converters/libiconv/buildlink3.mk"
cvs diff -r1.6 -r1.7 pkgsrc/misc/dpkg/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/dpkg/PLIST 2012/05/26 14:27:20 1.6
+++ pkgsrc/misc/dpkg/PLIST 2012/12/21 04:55:10 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2012/05/26 14:27:20 christos Exp $ 1@comment $NetBSD: PLIST,v 1.7 2012/12/21 04:55:10 dholland Exp $
2bin/dpkg 2bin/dpkg
3bin/dpkg-architecture 3bin/dpkg-architecture
4bin/dpkg-buildflags 4bin/dpkg-buildflags
5bin/dpkg-buildpackage 5bin/dpkg-buildpackage
6bin/dpkg-checkbuilddeps 6bin/dpkg-checkbuilddeps
7bin/dpkg-deb 7bin/dpkg-deb
8bin/dpkg-distaddfile 8bin/dpkg-distaddfile
9bin/dpkg-divert 9bin/dpkg-divert
10bin/dpkg-genchanges 10bin/dpkg-genchanges
11bin/dpkg-gencontrol 11bin/dpkg-gencontrol
12bin/dpkg-gensymbols 12bin/dpkg-gensymbols
13bin/dpkg-maintscript-helper 13bin/dpkg-maintscript-helper
14bin/dpkg-mergechangelogs 14bin/dpkg-mergechangelogs
@@ -80,78 +80,78 @@ lib/dpkg/methods/ftp/desc.ftp @@ -80,78 +80,78 @@ lib/dpkg/methods/ftp/desc.ftp
80lib/dpkg/methods/ftp/install 80lib/dpkg/methods/ftp/install
81lib/dpkg/methods/ftp/names 81lib/dpkg/methods/ftp/names
82lib/dpkg/methods/ftp/setup 82lib/dpkg/methods/ftp/setup
83lib/dpkg/methods/ftp/update 83lib/dpkg/methods/ftp/update
84lib/dpkg/methods/multicd/desc.multi_cd 84lib/dpkg/methods/multicd/desc.multi_cd
85lib/dpkg/methods/multicd/desc.multi_mount 85lib/dpkg/methods/multicd/desc.multi_mount
86lib/dpkg/methods/multicd/desc.multi_nfs 86lib/dpkg/methods/multicd/desc.multi_nfs
87lib/dpkg/methods/multicd/install 87lib/dpkg/methods/multicd/install
88lib/dpkg/methods/multicd/names 88lib/dpkg/methods/multicd/names
89lib/dpkg/methods/multicd/setup 89lib/dpkg/methods/multicd/setup
90lib/dpkg/methods/multicd/update 90lib/dpkg/methods/multicd/update
91lib/dpkg/parsechangelog/debian 91lib/dpkg/parsechangelog/debian
92lib/libdpkg.a 92lib/libdpkg.a
93lib/perl5/vendor_perl/5.14.0/Debian/Dselect/Ftp.pm 93lib/perl5/vendor_perl/${PERL}/Debian/Dselect/Ftp.pm
94lib/perl5/vendor_perl/5.14.0/Dpkg.pm 94lib/perl5/vendor_perl/${PERL}/Dpkg.pm
95lib/perl5/vendor_perl/5.14.0/Dpkg/Arch.pm 95lib/perl5/vendor_perl/${PERL}/Dpkg/Arch.pm
96lib/perl5/vendor_perl/5.14.0/Dpkg/BuildFlags.pm 96lib/perl5/vendor_perl/${PERL}/Dpkg/BuildFlags.pm
97lib/perl5/vendor_perl/5.14.0/Dpkg/BuildOptions.pm 97lib/perl5/vendor_perl/${PERL}/Dpkg/BuildOptions.pm
98lib/perl5/vendor_perl/5.14.0/Dpkg/Changelog.pm 98lib/perl5/vendor_perl/${PERL}/Dpkg/Changelog.pm
99lib/perl5/vendor_perl/5.14.0/Dpkg/Changelog/Debian.pm 99lib/perl5/vendor_perl/${PERL}/Dpkg/Changelog/Debian.pm
100lib/perl5/vendor_perl/5.14.0/Dpkg/Changelog/Entry.pm 100lib/perl5/vendor_perl/${PERL}/Dpkg/Changelog/Entry.pm
101lib/perl5/vendor_perl/5.14.0/Dpkg/Changelog/Entry/Debian.pm 101lib/perl5/vendor_perl/${PERL}/Dpkg/Changelog/Entry/Debian.pm
102lib/perl5/vendor_perl/5.14.0/Dpkg/Changelog/Parse.pm 102lib/perl5/vendor_perl/${PERL}/Dpkg/Changelog/Parse.pm
103lib/perl5/vendor_perl/5.14.0/Dpkg/Checksums.pm 103lib/perl5/vendor_perl/${PERL}/Dpkg/Checksums.pm
104lib/perl5/vendor_perl/5.14.0/Dpkg/Compression.pm 104lib/perl5/vendor_perl/${PERL}/Dpkg/Compression.pm
105lib/perl5/vendor_perl/5.14.0/Dpkg/Compression/FileHandle.pm 105lib/perl5/vendor_perl/${PERL}/Dpkg/Compression/FileHandle.pm
106lib/perl5/vendor_perl/5.14.0/Dpkg/Compression/Process.pm 106lib/perl5/vendor_perl/${PERL}/Dpkg/Compression/Process.pm
107lib/perl5/vendor_perl/5.14.0/Dpkg/Conf.pm 107lib/perl5/vendor_perl/${PERL}/Dpkg/Conf.pm
108lib/perl5/vendor_perl/5.14.0/Dpkg/Control.pm 108lib/perl5/vendor_perl/${PERL}/Dpkg/Control.pm
109lib/perl5/vendor_perl/5.14.0/Dpkg/Control/Changelog.pm 109lib/perl5/vendor_perl/${PERL}/Dpkg/Control/Changelog.pm
110lib/perl5/vendor_perl/5.14.0/Dpkg/Control/Fields.pm 110lib/perl5/vendor_perl/${PERL}/Dpkg/Control/Fields.pm
111lib/perl5/vendor_perl/5.14.0/Dpkg/Control/Hash.pm 111lib/perl5/vendor_perl/${PERL}/Dpkg/Control/Hash.pm
112lib/perl5/vendor_perl/5.14.0/Dpkg/Control/Info.pm 112lib/perl5/vendor_perl/${PERL}/Dpkg/Control/Info.pm
113lib/perl5/vendor_perl/5.14.0/Dpkg/Control/Types.pm 113lib/perl5/vendor_perl/${PERL}/Dpkg/Control/Types.pm
114lib/perl5/vendor_perl/5.14.0/Dpkg/Deps.pm 114lib/perl5/vendor_perl/${PERL}/Dpkg/Deps.pm
115lib/perl5/vendor_perl/5.14.0/Dpkg/ErrorHandling.pm 115lib/perl5/vendor_perl/${PERL}/Dpkg/ErrorHandling.pm
116lib/perl5/vendor_perl/5.14.0/Dpkg/Exit.pm 116lib/perl5/vendor_perl/${PERL}/Dpkg/Exit.pm
117lib/perl5/vendor_perl/5.14.0/Dpkg/Gettext.pm 117lib/perl5/vendor_perl/${PERL}/Dpkg/Gettext.pm
118lib/perl5/vendor_perl/5.14.0/Dpkg/IPC.pm 118lib/perl5/vendor_perl/${PERL}/Dpkg/IPC.pm
119lib/perl5/vendor_perl/5.14.0/Dpkg/Index.pm 119lib/perl5/vendor_perl/${PERL}/Dpkg/Index.pm
120lib/perl5/vendor_perl/5.14.0/Dpkg/Interface/Storable.pm 120lib/perl5/vendor_perl/${PERL}/Dpkg/Interface/Storable.pm
121lib/perl5/vendor_perl/5.14.0/Dpkg/Path.pm 121lib/perl5/vendor_perl/${PERL}/Dpkg/Path.pm
122lib/perl5/vendor_perl/5.14.0/Dpkg/Shlibs.pm 122lib/perl5/vendor_perl/${PERL}/Dpkg/Shlibs.pm
123lib/perl5/vendor_perl/5.14.0/Dpkg/Shlibs/Cppfilt.pm 123lib/perl5/vendor_perl/${PERL}/Dpkg/Shlibs/Cppfilt.pm
124lib/perl5/vendor_perl/5.14.0/Dpkg/Shlibs/Objdump.pm 124lib/perl5/vendor_perl/${PERL}/Dpkg/Shlibs/Objdump.pm
125lib/perl5/vendor_perl/5.14.0/Dpkg/Shlibs/Symbol.pm 125lib/perl5/vendor_perl/${PERL}/Dpkg/Shlibs/Symbol.pm
126lib/perl5/vendor_perl/5.14.0/Dpkg/Shlibs/SymbolFile.pm 126lib/perl5/vendor_perl/${PERL}/Dpkg/Shlibs/SymbolFile.pm
127lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Archive.pm 127lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Archive.pm
128lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Functions.pm 128lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Functions.pm
129lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package.pm 129lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package.pm
130lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V1.pm 130lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V1.pm
131lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V2.pm 131lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V2.pm
132lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V3/bzr.pm 132lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V3/bzr.pm
133lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V3/custom.pm 133lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V3/custom.pm
134lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V3/git.pm 134lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V3/git.pm
135lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V3/native.pm 135lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V3/native.pm
136lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Package/V3/quilt.pm 136lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Package/V3/quilt.pm
137lib/perl5/vendor_perl/5.14.0/Dpkg/Source/Patch.pm 137lib/perl5/vendor_perl/${PERL}/Dpkg/Source/Patch.pm
138lib/perl5/vendor_perl/5.14.0/Dpkg/Substvars.pm 138lib/perl5/vendor_perl/${PERL}/Dpkg/Substvars.pm
139lib/perl5/vendor_perl/5.14.0/Dpkg/Vars.pm 139lib/perl5/vendor_perl/${PERL}/Dpkg/Vars.pm
140lib/perl5/vendor_perl/5.14.0/Dpkg/Vendor.pm 140lib/perl5/vendor_perl/${PERL}/Dpkg/Vendor.pm
141lib/perl5/vendor_perl/5.14.0/Dpkg/Vendor/Debian.pm 141lib/perl5/vendor_perl/${PERL}/Dpkg/Vendor/Debian.pm
142lib/perl5/vendor_perl/5.14.0/Dpkg/Vendor/Default.pm 142lib/perl5/vendor_perl/${PERL}/Dpkg/Vendor/Default.pm
143lib/perl5/vendor_perl/5.14.0/Dpkg/Vendor/Ubuntu.pm 143lib/perl5/vendor_perl/${PERL}/Dpkg/Vendor/Ubuntu.pm
144lib/perl5/vendor_perl/5.14.0/Dpkg/Version.pm 144lib/perl5/vendor_perl/${PERL}/Dpkg/Version.pm
145lib/pkgconfig/libdpkg.pc 145lib/pkgconfig/libdpkg.pc
146man/de/man1/dpkg-architecture.1 146man/de/man1/dpkg-architecture.1
147man/de/man1/dpkg-buildflags.1 147man/de/man1/dpkg-buildflags.1
148man/de/man1/dpkg-buildpackage.1 148man/de/man1/dpkg-buildpackage.1
149man/de/man1/dpkg-checkbuilddeps.1 149man/de/man1/dpkg-checkbuilddeps.1
150man/de/man1/dpkg-deb.1 150man/de/man1/dpkg-deb.1
151man/de/man1/dpkg-distaddfile.1 151man/de/man1/dpkg-distaddfile.1
152man/de/man1/dpkg-genchanges.1 152man/de/man1/dpkg-genchanges.1
153man/de/man1/dpkg-gencontrol.1 153man/de/man1/dpkg-gencontrol.1
154man/de/man1/dpkg-gensymbols.1 154man/de/man1/dpkg-gensymbols.1
155man/de/man1/dpkg-maintscript-helper.1 155man/de/man1/dpkg-maintscript-helper.1
156man/de/man1/dpkg-mergechangelogs.1 156man/de/man1/dpkg-mergechangelogs.1
157man/de/man1/dpkg-name.1 157man/de/man1/dpkg-name.1