Update dpkg to 1.16.10.

with some fixes mentioned in PR pkg/47234.

dpkg (1.16.10) unstable; urgency=low

  [ Guillem Jover ]
  * Fix typos in 1.16.9 changelog entry. Closes: #691954
    Thanks to Nicolás Alvarez <nicolas.alvarez@gmail.com>.
  * Add missing @LIBLZMA_LIBS@ to Libs.Private in libdpkg.pc.in.
  * Do not use an undefined va_list variable in dpkg_put_errno().
  * Abort installation if we cannot set the security context for a file.
  * Fix OpenPGP armored signature parsing, to be resilient against doctored
    input, including source package control files. Closes: #695919
  * Make sure the OpenGPG armor contains a signature block, even on EOF.
  * Do not accept Armor Header Lines inside a paragraph.
  * Do not abort dselect when multiarch is detected, as that only makes
    users downgrade and hold on an older version w/ worse multiarch support.
  * Fix warning in Dpkg::Source::Archive with «perl -w» due to redefinition
    of getcwd() by removing unused POSIX modules usage. Closes: #700978

  [ Updated programs translations ]
  * Esperanto (Felipe Castro).
  * Spanish (Javier Fernández-Sanguino).
  * Vietnamesea (Trần Ngọc Quân). Closes: #692100

  [ Updated scripts translations ]
  * Fix mistranslation in French translation of scripts.
    Thanks to Filipus Klutiero. Closes: #698530
  * Fix typos in French translation of scripts.
    Thanks to Sylvestre Ledru. Closes: #702627
  * Fix Russian translation (wrong order of parameters in a string).
    Thanks to Andrey Rahmatullin for noticing and Yuri Kozlov for fixing
    the translation. Closes: #698869

 -- Guillem Jover <guillem@debian.org>  Fri, 08 Mar 2013 04:41:26 +0100

dpkg (1.16.9) unstable; urgency=low

  [ Raphaël Hertzog ]
  * Fix dpkg-source regression in "3.0 (quilt)" source packages while
    unapplying patches that remove all files in a directory. Closes: #683547
  * Fix segfault in field format parsing on empty strings, affecting
    «dpkg-query -W -f ''» and «dpkg-deb -W --showformat=''». LP: #1035512
  * Fix dpkg's French usage string which was missing the final “s“ in
    --print-foreign-architectures. Closes: #685863

  [ Guillem Jover ]
  * Use “statoverrides” instead of “statusoverrides” in dpkg-statoverride.
    Closes: #686995
  * Comment out dpkg(1) documentation about disabled --command-fd option.
    Closes: #685677
  * Cleanup dpkg-divert unit-test environment to avoid build failures.
    Closes: #687656
  * Fix update-alternatives test suite to behave correctly on non-Debian
    binary paths. Known to be affecting at least Gentoo and Mac OS X.
  * Do not leak subcall command arguments in update-alternatives.
  * Fix segfault on update-alternatives when passing --slave without any
    action at all. LP: #1037431
  * Fix memory leak in dpkg filesavespackage().
  * Do not print garbage (or worse) on dpkg shared conffile debug output.
  * Use a hash instead of a ref to a hash for keys() in Dpkg::BuildFlags
    get_feature_areas(). This causes compilation failures with older perl
    versions, which can be an issue with partial upgrades.
  * Fix filter subpattern debug output format string to print an actual
    value instead of just blanks.
  * Ignore trailing filter subpattern slashes on reinclusion comparison.
    This makes sure to reinclude directories previously excluded so that
    contained files marked for inclusion do not fail to unpack due to a
    missing directory. Closes: #688416
  * Do not consider obsolete conffiles as actively owned by the package.
    This ensures conffile entries are not mishandled nor mixed up when
    configuring packages owning the non-obsolete conffiles. Closes: #689836
    Based on a patch by Andreas Beckmann <debian@abeckmann.de>.
  * Properly mark in the database obsolete conffiles on package replaces.
  * Sync the Conffiles field values for all package instances. Because
    only the first package instance being configured will have a *.dpkg-new
    conffile available to be processed, the subsequent ones need to use the
    hash from the previously processed entries.
  * Fix logic for previously configured conffiles, so that the shared
    conffile checks actually work on reinstallation. Closes: #684776
  * Avoid info database corruption and bogus accesses on unknown format
    values, by always reading the format file and validating it.
  * Clarify that the most probable reason for multiarch database
    inconsistencies is due to upgrades from unofficial dpkg versions.
  * Only satisfy a dependency on a “Multi-Arch: foreign” if arch-unqualified.
  * Take architecture into account in virtual packages on remove and
    configure dpkg actions. Closes: #683411
  * Update update-alternatives --query format and examples in man page to
    match the implementation.
  * Add two missing 3rd person ‘s’ in dpkg-gensymbols(1). Closes: #689863
    Thanks to Paul Menzel <pm.debian@googlemail.com>.
  * Fix regression on old-style binNMUs for packages that specify an
    explicit binary version to dpkg-gencontrol, by always fixing up the
    source version. Closes: #690823

  [ Updated programs translations ]
  * Catalan (Guillem Jover).
  * Czech (Miroslav Kure).
  * Danish (Joe Dalton). Closes: #690808
  * French (Christian Perrier).
  * German (Sven Joachim).
  * Italian (Milo Casagrande).
  * Japanese (Kenshi Muto).
  * Polish (Michał Kułach). Closes: #690449
  * Portuguese (Miguel Figueiredo). Closes: #682582, #690431
  * Russian (Yuri Kozlov). Closes: #688050, #690415
  * Slovak (Ivan Masár). Closes: #690426
  * Swedish (Peter Krefting).
  * Thai (Theppitak Karoonboonyanan). Closes: #690678
  * Traditional Chinese (imacat). Closes: #687002

  [ Updated scripts translations ]
  * Polish (Michał Kułach). Closes: #683104
  * Spanish (Omar Campagne). Closes: #685297

  [ Updated dselect translations ]
  * Basque (Iñaki Larrañaga Murgoitio). Closes: #686421
  * Czech (Miroslav Kure).
  * Danish (Joe Dalton). Closes: #689820
  * Polish (Michał Kułach).

  [ Updated man page translations ]
  * French (Thomas Vincent, Sylvestre Ledru, Christian Perrier).
    Closes: #682978, #683221
  * German (Helge Kreutzmann).
  * Japanese (Hideki Yamane). Closes: #685103
  * Polish (Michał Kułach).
  * Spanish (Omar Campagne, Guillem Jover). Closes: #683514
  * Swedish (Peter Krefting).

 -- Guillem Jover <guillem@debian.org>  Sat, 20 Oct 2012 05:59:50 +0200

dpkg (1.16.8) unstable; urgency=low

  [ Updated programs translations ]
  * Esperanto (Felipe Castro).
  * French (Christian Perrier).
  * Polish (Michał Kułach). Closes: #680561
  * Russian (Yuri Kozlov). Closes: #677850, #680411
  * Slovak (Ivan Masár).
  * Spanish (Javier Fernández-Sanguino)

  [ Updated man page translations ]
  * French (Christian Perrier).

  [ Updated scripts translations ]
  * French (Christian Perrier).
  * Russian (Yuri Kozlov).

  [ Updated dselect translations ]
  * Danish (Joe Dalton). Closes: #680108
  * Russian (Yuri Kozlov).
  * Traditional Chinese (Asho Yeh - 阿信).

 -- Guillem Jover <guillem@debian.org>  Sat, 21 Jul 2012 02:11:04 +0200

dpkg (1.16.7) unstable; urgency=low

  [ Guillem Jover ]
  * Fix bogus dpkg-query --control-show badusage() strings.

  [ Raphaël Hertzog ]
  * Fix dpkg-gencontrol to correctly compute the source version
    in the case of "old-style" bin-nmus. Closes: #679959

  [ Updated dselect translations ]
  * Catalan (Guillem Jover).
  * French (Christian Perrier).
  * German (Sven Joachim).
  * Swedish (Peter Krefting).

  [ Updated programs translations ]
  * French (Christian Perrier).
  * German (Sven Joachim).
  * Italian (Milo Casagrande).
  * Swedish (Peter Krefting).

  [ Updated man page translations ]
  * Swedish (Peter Krefting).
  * French (Christian Perrier).

  [ Updated scripts translations ]
  * Swedish (Peter Krefting).
  * French (Christian Perrier).

 -- Raphaël Hertzog <hertzog@debian.org>  Mon, 02 Jul 2012 21:16:12 +0200

dpkg (1.16.6) unstable; urgency=low

  [ Guillem Jover ]
  * Do not translate SE Linux context to human readable form while unpacking,
    as that might cause the operation to fail if the mcstransd daemon
    stopped running during the transaction. Closes: #679641
    Thanks to Russell Coker <russell@coker.com.au>.
  * Add --control-list and --control-show to dpkg-query --help output.

  [ Raphaël Hertzog ]
  * Fix import of error functions in dpkg-buildflags. Regression introduced
    in 1.16.5.

  [ Updated scripts translations ]
  * German (Helge Kreutzmann).

  [ Updated man page translations ]
  * German (Helge Kreutzmann).

 -- Guillem Jover <guillem@debian.org>  Sat, 30 Jun 2012 21:45:10 +0200

dpkg (1.16.5) unstable; urgency=low

  [ Raphaël Hertzog ]
  * dpkg-source will now clean up after a failed application of a quilt
    patch. Closes: #652970
    And it will display a message explaining the most likely cause of
    failure (patch applying with fuzz).
  * When dpkg-source regenerates the automatic patch (with formats "2.0"
    or "3.0 (quilt)") it will keep the current patch header to avoid
    losing changes made by the maintainer.
  * Modify dpkg-source --commit to auto-whitelist modified binary files.
    That way the same command can be used whatever kind of upstream files
    has been modified.
  * dpkg-source now supports a new option --no-unapply-patches to force
    patches to be kept applied after build (used by formats "2.0" and "3.0
    (quilt)"). Closes: #643043

  [ Guillem Jover ]
  * Add a dpkg-buildflags --status action to describe the flag settings.
    Thanks to Bernhard R. Link <brlink@debian.org>. Closes: #664058
  * Add support for “binary-only” key-value option in changelogs, to allow
    marking changelog entries as part of a binary only upload, having a
    different version from the source package. Closes: #440094, #672723
  * Minimize source architecture list on «dpkg-source -b» by removing
    architectures already covered by architecture wildcards. Closes: #675333
  * Do not assume $ENV{'HOME'} is defined in Dpkg::Source::Package.
    Thanks to Niels Thykier <niels@thykier.net>. Closes: #677631
  * Document in more detail in deb(5) the supported ar archive format.
  * Document in deb-src-control(5) the “Private-” field prefix.
  * Add new start-stop-daemon --no-close option to disable closing file
    descriptors on --background. Closes: #627333, #646425
  * Switch source compression to xz.
  * Detect ar header fields truncation due to too long member names or too
    large member sizes. Closes: #678933
  * Add new dpkg-query --control-list and --control-show commands, which
    replace the now deprecated --control-path.
  * Print master and slave alternarive link names in update-alternatives
    --query and always print alternative link in --config. Closes: #679010
  * Cleanup and clarify buffer I/O error reporting. Closes: #621763
  * Avoid full stop and double newline at the end of errors and warnings.
    Thanks to Jonathan Nieder <jnieder@gmail.com>. Closes: #624000
  * Change all programs to accept -? instead of -h for help output.
  * Add support for specific arch-qualified dependencies. Closes: #676232
    Thanks to Thibaut Girka <thib@sitedethib.com>.
  * Accept “:native” arch-qualified Build-Dependencies. Closes: #558095
    Thanks to Thibaut Girka <thib@sitedethib.com>.
  * Do not use undefined values returned form deps_parse() in dpkg-shlibdeps.
    Closes: #640676
  * Add an Architecture column to «dpkg-query -l» before the Description
    column. Suggested by Jonathan Nieder <jnieder@gmail.com>. Closes: #673190

  [ Updated dpkg translations ]
  * Swedish (Peter Krefting).

  [ Updated dselect translations ]
  * Swedish (Peter Krefting).

  [ Updated scripts translations ]
  * German (Helge Kreutzmann).

  [ Updated man page translations ]
  * German (Helge Kreutzmann).
  * Swedish (Peter Krefting).

 -- Guillem Jover <guillem@debian.org>  Sat, 30 Jun 2012 04:28:51 +0200

dpkg (1.16.4.3) unstable; urgency=low

  * On «update-alternatives --install» only warn for now on out of range
    priorities and clamp the values, as there seems to be packages using
    priorities > INT_MAX, which although bogus as they were previously
    overflowing the int used to store them, that would cause installation
    failures when upgrading from squeeze. This will be reverted to an
    error after wheezy. Closes: #676874

 -- Guillem Jover <guillem@debian.org>  Sun, 17 Jun 2012 10:56:15 +0200

dpkg (1.16.4.2) unstable; urgency=low

  * Check correctly for out of range negative field width values in dpkg-query
    --show format strings. Regression introduced in 1.16.4. Closes: #676796

 -- Guillem Jover <guillem@debian.org>  Sat, 09 Jun 2012 16:16:17 +0200

dpkg (1.16.4.1) unstable; urgency=low

  * Fix explicit file trigger activation. Regression introduced in 1.16.4.
    Closes: #676684

 -- Guillem Jover <guillem@debian.org>  Fri, 08 Jun 2012 23:17:11 +0200

dpkg (1.16.4) unstable; urgency=low

  [ Guillem Jover ]
  * Deprecate compressing .deb files with lzma, by making dpkg-deb issue a
    warning, as the format has several deficiencies that have been addressed
    by upstream in xz. Although unpacking will be kept being supported to
    handle existing lzma compressed .deb files.
  * Add alternative changelog formats documentation from the policy manual
    to dpkg-parsechangelog(1). Closes: #584141
  * Add MiNT support to ostable and triplettable.
    Requested by Thorsten Glaser <tg@mirbsd.de>.
  * Add new frontend.txt file to dpkg-dev documenting some public interfaces
    for dpkg frontends. Closes: #670897
  * Clarify in dpkg(1) when --force-conf* options cause action.
    Suggested by Sven Joachim <svenjoac@gmx.de>. Closes: #391818
  * Add “gcc | c-compiler” to libdpkg-perl Suggests, due to Dpkg::Arch usage.
    Closes: #671198
  * Do not mask PIE from dpkg-buildflags on m68k, it appears to work now.
    Requested by Thorsten Glaser <tg@mirbsd.de>.
  * Remove deprecated support for PGP style signing command interface from
    dpkg-buildpackage.
  * Remove obsolete --udeb dpkg-scanpackages option.
  * Add arm64 support to cputable. Closes: #672408
    Thanks Wookey <wookey@wookware.org>.
  * Check parsed integers for invalid or no digit errors in start-stop-daemon
    and update-alternatives.
  * Check all parsed integers for out of range errors; i.e. that no negative
    values are allowed if not appropriate, and that no overflows occur.
    Closes: #580038
  * Switch start-stop-daemon(8) man page examples from /var/run to /run.
  * Do not obscure Dpkg::Source::Package ‘require’ errors with custom
    error message. Thanks to Thomas Adam <thomas.adam@smoothwall.net> and
    Jonathan Nieder <jrnieder@gmail.com>.
  * Add new Dpkg::Substvars::set_as_used() member function.
  * Rename Dpkg::Substvars no_warn() member function to mark_as_used(), keep
    the old name aliased to the new one producing a deprecation warning.
  * Add support for Build-Depends-Arch and Build-Conflicts-Arch fields, and
    a new -A option to dpkg-checkbuilddeps. Closes: #629480
    Thanks to Roger Leigh <rleigh@debian.org>.
  * Add support for “none” as a valid dpkg-deb compression strategy value.
    Closes: #674711
  * Clarify in dpkg(1) that the «dpkg -l» example only lists installed
    packages, and that to list available packages «dpkg-query --load-avail»
    has to be used instead. Closes: #673305
  * Clarify also in the dpkg(1) man page (already present in the dpkg.cfg(5)
    man page) the valid filenames for /etc/dpkg/dpkg.cfg.d/ fragment files.
    Closes: #674674
  * Fix start-stop-daemon to not follow symlinks when creating pidfiles.
    Thanks to Carsten Hey <carsten@debian.org>. Closes: #675918
  * Refactor the file locking logic into a new Dpkg::File module, and move
    the libfile-fcntllock-perl dependency from dpkg-dev to libdpkg-perl.
  * Demote the libfile-fcntllock-perl Depends to a Recommends by falling back
    to use flock based locking, because it being an XS module makes building
    a new perl package bumping the perl ABI impossible, as both packages
    become uninstallable. Thanks to Dominic Hargreaves <dom@earth.li>.
    Closes: #675947
  * Put an & before field_capitalize() calls in Dpkg::Control::Fields to
    fix a usage before declaration warning with perl 5.16. Closes: #676262
  * Do not warn in dpkg-divert on missing files list file for packages never
    installed before. Closes: #673518
  * Add support for liblzma to handle .xz and .lzma compressed files, and
    switch to it instead of using xz-utils. This removes the xz-utils
    Pre-Depends from dpkg. Thanks to Jonathan Nieder <jrnieder@gmail.com>.
  * Always activate all path components for file triggers, this fixes file
    trigger handling for conffiles and dpkg-trigger invocations.
    Closes: #675613, #676061, #676062, #676107, #676118, #676122
  * Do not reset Multi-Arch field in the update log when removing the package.
    Closes: #676496
  * Fix dpkg-split to honour the DPKG_ADMINDIR environment variable.

  [ Updated man page translations ]
  * German (Helge Kreutzmann).
  * French (Christian Perrier). Fixes a mistranslation and some
    inconsistencies reported by Vincent Danjean( thanks). Closes: #673158

 -- Guillem Jover <guillem@debian.org>  Thu, 07 Jun 2012 23:43:19 +0200

4 files changed, 110 insertions, 89 deletions

diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile
index 0c9bd4cdde3..be986cbaa99 100644
--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.28 2013/05/31 20:14:24 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2013/06/14 11:15:16 obache Exp $
 #
 
-DISTNAME=	dpkg_1.16.3
-PKGNAME=	dpkg-1.16.3
-PKGREVISION=	4
+DISTNAME=	dpkg_1.16.10
+PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://wiki.debian.org/Teams/Dpkg
 COMMENT=	Package maintenance system for Debian
+LICENSE=	gnu-gpl-v2
 
 BUILD_DEPENDS+=		po4a>=0:../../textproc/po4a
-BUILD_DEPENDS+=		gtar>=1.26:../../archivers/gtar
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 BUILD_DEFS+=	VARBASE
@@ -21,7 +20,7 @@ BUILD_DEFS+=	VARBASE
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake msgfmt perl:run
+USE_TOOLS+=		gmake msgfmt perl:run gtar:run
 USE_NCURSES=		yes	# needs tigetstr()
 
 REPLACE_PERL=		scripts/*.pl
@@ -29,18 +28,12 @@ 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.18.0
-NEXT_PERL_VERSION=	5.20.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
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/dpkg
+# or uses GCC version specific warning flags unconditionally. 
+CONFIGURE_ARGS+=	--disable-compiler-warnings
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -48,9 +41,17 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/dpkg
 CONFIGURE_ARGS+=	--enable-linker-optimisations=no
 .endif
 
+SUBST_CLASSES+=		tool-path
+SUBST_STAGE.tool-path=	pre-build
+SUBST_VARS.tool-path=	GTAR
+SUBST_FILES.tool-path=	lib/dpkg/dpkg.h
+
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+PERL5_CONFIGURE=	no
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/dpkg/PLIST b/misc/dpkg/PLIST
index c186e7513ee..f7c46f859bf 100644
--- a/misc/dpkg/PLIST
+++ b/misc/dpkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/12/21 04:55:10 dholland Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/06/14 11:15:16 obache Exp $
 bin/dpkg
 bin/dpkg-architecture
 bin/dpkg-buildflags
@@ -55,6 +55,7 @@ include/dpkg/pkg-spec.h
 include/dpkg/pkg.h
 include/dpkg/progname.h
 include/dpkg/progress.h
+include/dpkg/report.h
 include/dpkg/string.h
 include/dpkg/subproc.h
 include/dpkg/tarfn.h
@@ -90,58 +91,62 @@ lib/dpkg/methods/multicd/setup
 lib/dpkg/methods/multicd/update
 lib/dpkg/parsechangelog/debian
 lib/libdpkg.a
-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
+${PERL5_SUB_INSTALLVENDORLIB}/Debian/Dselect/Ftp.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Arch.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/BuildEnv.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/BuildFlags.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/BuildOptions.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Changelog.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Changelog/Debian.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Changelog/Entry.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Changelog/Entry/Debian.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Changelog/Parse.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Checksums.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Compression.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Compression/FileHandle.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Compression/Process.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Conf.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Control.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Control/Changelog.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Control/Fields.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Control/Hash.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Control/Info.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Control/Types.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Deps.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/ErrorHandling.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Exit.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/File.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Gettext.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/IPC.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Index.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Interface/Storable.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Package.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Path.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Shlibs.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Shlibs/Cppfilt.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Shlibs/Objdump.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Shlibs/Symbol.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Shlibs/SymbolFile.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Source/Archive.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Source/Functions.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Source/Package.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Source/Package/V1.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Source/Package/V2.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Source/Package/V3/bzr.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Source/Package/V3/custom.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Source/Package/V3/git.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Source/Package/V3/native.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Source/Package/V3/quilt.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Source/Patch.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Source/Quilt.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Substvars.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Vars.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Vendor.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Vendor/Debian.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Vendor/Default.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Vendor/Ubuntu.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Dpkg/Version.pm
 lib/pkgconfig/libdpkg.pc
 man/de/man1/dpkg-architecture.1
 man/de/man1/dpkg-buildflags.1
@@ -185,6 +190,7 @@ man/de/man8/dpkg-divert.8
 man/de/man8/dpkg-statoverride.8
 man/de/man8/update-alternatives.8
 man/es/man1/dpkg-architecture.1
+man/es/man1/dpkg-buildflags.1
 man/es/man1/dpkg-buildpackage.1
 man/es/man1/dpkg-checkbuilddeps.1
 man/es/man1/dpkg-deb.1
@@ -192,6 +198,7 @@ man/es/man1/dpkg-distaddfile.1
 man/es/man1/dpkg-genchanges.1
 man/es/man1/dpkg-gencontrol.1
 man/es/man1/dpkg-gensymbols.1
+man/es/man1/dpkg-maintscript-helper.1
 man/es/man1/dpkg-mergechangelogs.1
 man/es/man1/dpkg-name.1
 man/es/man1/dpkg-parsechangelog.1
@@ -208,6 +215,7 @@ man/es/man1/dselect.1
 man/es/man5/deb-control.5
 man/es/man5/deb-extra-override.5
 man/es/man5/deb-old.5
+man/es/man5/deb-origin.5
 man/es/man5/deb-override.5
 man/es/man5/deb-shlibs.5
 man/es/man5/deb-split.5
@@ -235,6 +243,7 @@ man/fr/man1/dpkg-maintscript-helper.1
 man/fr/man1/dpkg-mergechangelogs.1
 man/fr/man1/dpkg-name.1
 man/fr/man1/dpkg-parsechangelog.1
+man/fr/man1/dpkg-query.1
 man/fr/man1/dpkg-scanpackages.1
 man/fr/man1/dpkg-scansources.1
 man/fr/man1/dpkg-shlibdeps.1
@@ -267,19 +276,13 @@ man/hu/man5/dselect.cfg.5
 man/ja/man1/dpkg-architecture.1
 man/ja/man1/dpkg-buildflags.1
 man/ja/man1/dpkg-buildpackage.1
-man/ja/man1/dpkg-checkbuilddeps.1
 man/ja/man1/dpkg-deb.1
 man/ja/man1/dpkg-distaddfile.1
-man/ja/man1/dpkg-genchanges.1
-man/ja/man1/dpkg-gencontrol.1
 man/ja/man1/dpkg-gensymbols.1
 man/ja/man1/dpkg-mergechangelogs.1
 man/ja/man1/dpkg-name.1
-man/ja/man1/dpkg-parsechangelog.1
-man/ja/man1/dpkg-query.1
 man/ja/man1/dpkg-scanpackages.1
 man/ja/man1/dpkg-scansources.1
-man/ja/man1/dpkg-shlibdeps.1
 man/ja/man1/dpkg-source.1
 man/ja/man1/dpkg-split.1
 man/ja/man1/dpkg-trigger.1
@@ -327,6 +330,7 @@ man/man1/dpkg-trigger.1
 man/man1/dpkg-vendor.1
 man/man1/dpkg.1
 man/man1/dselect.1
+man/man3/Dpkg::BuildEnv.3
 man/man3/Dpkg::BuildFlags.3
 man/man3/Dpkg::BuildOptions.3
 man/man3/Dpkg::Changelog.3
@@ -376,23 +380,40 @@ man/man8/dpkg-divert.8
 man/man8/dpkg-statoverride.8
 man/man8/update-alternatives.8
 man/pl/man1/dpkg-architecture.1
+man/pl/man1/dpkg-buildflags.1
 man/pl/man1/dpkg-buildpackage.1
 man/pl/man1/dpkg-checkbuilddeps.1
 man/pl/man1/dpkg-deb.1
 man/pl/man1/dpkg-distaddfile.1
 man/pl/man1/dpkg-genchanges.1
 man/pl/man1/dpkg-gencontrol.1
+man/pl/man1/dpkg-gensymbols.1
+man/pl/man1/dpkg-maintscript-helper.1
+man/pl/man1/dpkg-mergechangelogs.1
 man/pl/man1/dpkg-name.1
 man/pl/man1/dpkg-parsechangelog.1
+man/pl/man1/dpkg-query.1
+man/pl/man1/dpkg-scanpackages.1
 man/pl/man1/dpkg-scansources.1
 man/pl/man1/dpkg-shlibdeps.1
+man/pl/man1/dpkg-source.1
 man/pl/man1/dpkg-split.1
 man/pl/man1/dpkg-trigger.1
 man/pl/man1/dpkg-vendor.1
+man/pl/man1/dpkg.1
 man/pl/man1/dselect.1
+man/pl/man5/deb-control.5
 man/pl/man5/deb-extra-override.5
 man/pl/man5/deb-old.5
+man/pl/man5/deb-origin.5
+man/pl/man5/deb-override.5
+man/pl/man5/deb-shlibs.5
+man/pl/man5/deb-split.5
+man/pl/man5/deb-src-control.5
 man/pl/man5/deb-substvars.5
+man/pl/man5/deb-symbols.5
+man/pl/man5/deb-triggers.5
+man/pl/man5/deb-version.5
 man/pl/man5/deb.5
 man/pl/man5/dpkg.cfg.5
 man/pl/man5/dselect.cfg.5
diff --git a/misc/dpkg/distinfo b/misc/dpkg/distinfo
index cc515cc6280..83231cf951f 100644
--- a/misc/dpkg/distinfo
+++ b/misc/dpkg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/05/26 14:27:20 christos Exp $
+$NetBSD: distinfo,v 1.7 2013/06/14 11:15:16 obache Exp $
 
-SHA1 (dpkg_1.16.3.tar.bz2) = b82a62c1b5e85adcc947f28a264ef7b7ee8580ca
-RMD160 (dpkg_1.16.3.tar.bz2) = 7175a4394a48c4a2158cb0f9b0be93c37e74cf11
-Size (dpkg_1.16.3.tar.bz2) = 5599915 bytes
-SHA1 (patch-aa) = 0d037973cd36788bc94cf9d3aac3b08dc978bd7b
+SHA1 (dpkg_1.16.10.tar.xz) = bd67ce10236a674a2349d13feaa096b41fea4c9c
+RMD160 (dpkg_1.16.10.tar.xz) = e04b3834056cd97c1cb955007f02e1358a8e8fa0
+Size (dpkg_1.16.10.tar.xz) = 3703340 bytes
+SHA1 (patch-aa) = a7d40af564ae6f95357450026ed75236918cb5ff
diff --git a/misc/dpkg/patches/patch-aa b/misc/dpkg/patches/patch-aa
index b004033f4ed..9bd104f4a42 100644
--- a/misc/dpkg/patches/patch-aa
+++ b/misc/dpkg/patches/patch-aa
@@ -1,16 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2012/05/26 14:27:55 christos Exp $
+$NetBSD: patch-aa,v 1.4 2013/06/14 11:15:16 obache Exp $
 
---- lib/dpkg/dpkg.h.orig	2012-04-26 22:49:02.000000000 -0400
-+++ lib/dpkg/dpkg.h	2012-05-26 10:21:27.000000000 -0400
-@@ -108,7 +108,11 @@
+* GNU tar is expected as tar.
+
+--- lib/dpkg/dpkg.h.orig	2013-03-08 16:45:46.000000000 +0000
++++ lib/dpkg/dpkg.h
+@@ -108,7 +108,7 @@ DPKG_BEGIN_DECLS
  #define DPKG		"dpkg"
  #define DEBSIGVERIFY	"/usr/bin/debsig-verify"
  
-+#ifdef __NetBSD__
-+#define TAR		"gtar"
-+#else
- #define TAR		"tar"
-+#endif
+-#define TAR		"tar"
++#define TAR		"@GTAR@"
  #define RM		"rm"
+ #define CAT		"cat"
  #define FIND		"find"
- #define DIFF		"diff"