Update to 1.16.3. the old tar file is gone.

8 files changed, 350 insertions, 1299 deletions

diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile
index 0ee9b0e50fa..d692f0b0ed3 100644
--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2011/04/22 13:44:08 obache Exp $
+# $NetBSD: Makefile,v 1.22 2012/05/26 14:27:20 christos Exp $
 #
 
-DISTNAME=	dpkg_1.13.25
-PKGNAME=	dpkg-1.13.25
-PKGREVISION=	1
+DISTNAME=	dpkg_1.16.3
+PKGNAME=	dpkg-1.16.3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://wiki.debian.org/Teams/Dpkg
@@ -14,6 +14,7 @@ COMMENT=	Package maintenance system for Debian
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_DEPENDS+=		po4a>=0:../../textproc/po4a
+BUILD_DEPENDS+=		gtar>=1.26:../../archivers/gtar
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 BUILD_DEFS+=	VARBASE
@@ -27,8 +28,7 @@ USE_NCURSES=		yes	# needs tigetstr()
 REPLACE_PERL=		scripts/*.pl
 
 CONFIGURE_ARGS+=	--with-zlib
-CONFIGURE_ARGS+=	--with-start-stop-daemon=no
-CONFIGURE_ARGS+=	--with-sgml-doc=no
+CONFIGURE_ARGS+=	--disable-start-stop-daemon
 CONFIGURE_ARGS+=	--with-admindir=${VARBASE}/db/dpkg
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/dpkg
 
@@ -38,9 +38,6 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/dpkg
 CONFIGURE_ARGS+=	--enable-linker-optimisations=no
 .endif
 
-post-extract:
-	cd ${FILESDIR} && cp obstack.* ${WRKSRC}/lib/
-
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/misc/dpkg/PLIST b/misc/dpkg/PLIST
index 55ba8871b46..4b62ebdbc87 100644
--- a/misc/dpkg/PLIST
+++ b/misc/dpkg/PLIST
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:07:20 joerg Exp $
-bin/822-date
+@comment $NetBSD: PLIST,v 1.6 2012/05/26 14:27:20 christos Exp $
 bin/dpkg
 bin/dpkg-architecture
+bin/dpkg-buildflags
 bin/dpkg-buildpackage
 bin/dpkg-checkbuilddeps
 bin/dpkg-deb
 bin/dpkg-distaddfile
+bin/dpkg-divert
 bin/dpkg-genchanges
 bin/dpkg-gencontrol
+bin/dpkg-gensymbols
+bin/dpkg-maintscript-helper
+bin/dpkg-mergechangelogs
 bin/dpkg-name
 bin/dpkg-parsechangelog
 bin/dpkg-query
@@ -16,10 +20,48 @@ bin/dpkg-scansources
 bin/dpkg-shlibdeps
 bin/dpkg-source
 bin/dpkg-split
+bin/dpkg-statoverride
+bin/dpkg-trigger
+bin/dpkg-vendor
 bin/dselect
-lib/dpkg/controllib.pl
-lib/dpkg/dpkg-gettext.pl
-lib/dpkg/enoent
+bin/update-alternatives
+include/dpkg/ar.h
+include/dpkg/arch.h
+include/dpkg/atomic-file.h
+include/dpkg/buffer.h
+include/dpkg/command.h
+include/dpkg/compress.h
+include/dpkg/deb-version.h
+include/dpkg/debug.h
+include/dpkg/dir.h
+include/dpkg/dpkg-db.h
+include/dpkg/dpkg.h
+include/dpkg/ehandle.h
+include/dpkg/error.h
+include/dpkg/fdio.h
+include/dpkg/file.h
+include/dpkg/glob.h
+include/dpkg/macros.h
+include/dpkg/namevalue.h
+include/dpkg/options.h
+include/dpkg/parsedump.h
+include/dpkg/path.h
+include/dpkg/pkg-array.h
+include/dpkg/pkg-format.h
+include/dpkg/pkg-list.h
+include/dpkg/pkg-queue.h
+include/dpkg/pkg-show.h
+include/dpkg/pkg-spec.h
+include/dpkg/pkg.h
+include/dpkg/progname.h
+include/dpkg/progress.h
+include/dpkg/string.h
+include/dpkg/subproc.h
+include/dpkg/tarfn.h
+include/dpkg/trigdeferred.h
+include/dpkg/triglib.h
+include/dpkg/varbuf.h
+include/dpkg/version.h
 lib/dpkg/methods/disk/desc.cdrom
 lib/dpkg/methods/disk/desc.harddisk
 lib/dpkg/methods/disk/desc.mounted
@@ -33,80 +75,246 @@ lib/dpkg/methods/floppy/install
 lib/dpkg/methods/floppy/names
 lib/dpkg/methods/floppy/setup
 lib/dpkg/methods/floppy/update
-lib/dpkg/mksplit
+lib/dpkg/methods/ftp/README.mirrors.txt
+lib/dpkg/methods/ftp/desc.ftp
+lib/dpkg/methods/ftp/install
+lib/dpkg/methods/ftp/names
+lib/dpkg/methods/ftp/setup
+lib/dpkg/methods/ftp/update
+lib/dpkg/methods/multicd/desc.multi_cd
+lib/dpkg/methods/multicd/desc.multi_mount
+lib/dpkg/methods/multicd/desc.multi_nfs
+lib/dpkg/methods/multicd/install
+lib/dpkg/methods/multicd/names
+lib/dpkg/methods/multicd/setup
+lib/dpkg/methods/multicd/update
 lib/dpkg/parsechangelog/debian
-man/de/man1/822-date.1
+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/pkgconfig/libdpkg.pc
 man/de/man1/dpkg-architecture.1
+man/de/man1/dpkg-buildflags.1
+man/de/man1/dpkg-buildpackage.1
 man/de/man1/dpkg-checkbuilddeps.1
+man/de/man1/dpkg-deb.1
+man/de/man1/dpkg-distaddfile.1
+man/de/man1/dpkg-genchanges.1
+man/de/man1/dpkg-gencontrol.1
+man/de/man1/dpkg-gensymbols.1
+man/de/man1/dpkg-maintscript-helper.1
+man/de/man1/dpkg-mergechangelogs.1
 man/de/man1/dpkg-name.1
+man/de/man1/dpkg-parsechangelog.1
+man/de/man1/dpkg-query.1
 man/de/man1/dpkg-scanpackages.1
 man/de/man1/dpkg-scansources.1
+man/de/man1/dpkg-shlibdeps.1
+man/de/man1/dpkg-source.1
+man/de/man1/dpkg-split.1
+man/de/man1/dpkg-trigger.1
+man/de/man1/dpkg-vendor.1
 man/de/man1/dpkg.1
+man/de/man1/dselect.1
 man/de/man5/deb-control.5
+man/de/man5/deb-extra-override.5
 man/de/man5/deb-old.5
+man/de/man5/deb-origin.5
+man/de/man5/deb-override.5
+man/de/man5/deb-shlibs.5
+man/de/man5/deb-split.5
+man/de/man5/deb-src-control.5
+man/de/man5/deb-substvars.5
+man/de/man5/deb-symbols.5
+man/de/man5/deb-triggers.5
+man/de/man5/deb-version.5
 man/de/man5/deb.5
 man/de/man5/dpkg.cfg.5
 man/de/man5/dselect.cfg.5
-man/de/man8/cleanup-info.8
 man/de/man8/dpkg-divert.8
 man/de/man8/dpkg-statoverride.8
-man/de/man8/start-stop-daemon.8
 man/de/man8/update-alternatives.8
-man/fr/man1/822-date.1
+man/es/man1/dpkg-architecture.1
+man/es/man1/dpkg-buildpackage.1
+man/es/man1/dpkg-checkbuilddeps.1
+man/es/man1/dpkg-deb.1
+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-mergechangelogs.1
+man/es/man1/dpkg-name.1
+man/es/man1/dpkg-parsechangelog.1
+man/es/man1/dpkg-query.1
+man/es/man1/dpkg-scanpackages.1
+man/es/man1/dpkg-scansources.1
+man/es/man1/dpkg-shlibdeps.1
+man/es/man1/dpkg-source.1
+man/es/man1/dpkg-split.1
+man/es/man1/dpkg-trigger.1
+man/es/man1/dpkg-vendor.1
+man/es/man1/dpkg.1
+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-override.5
+man/es/man5/deb-shlibs.5
+man/es/man5/deb-split.5
+man/es/man5/deb-src-control.5
+man/es/man5/deb-substvars.5
+man/es/man5/deb-symbols.5
+man/es/man5/deb-triggers.5
+man/es/man5/deb-version.5
+man/es/man5/deb.5
+man/es/man5/dpkg.cfg.5
+man/es/man5/dselect.cfg.5
+man/es/man8/dpkg-divert.8
+man/es/man8/dpkg-statoverride.8
+man/es/man8/update-alternatives.8
 man/fr/man1/dpkg-architecture.1
+man/fr/man1/dpkg-buildflags.1
 man/fr/man1/dpkg-buildpackage.1
 man/fr/man1/dpkg-checkbuilddeps.1
 man/fr/man1/dpkg-deb.1
 man/fr/man1/dpkg-distaddfile.1
 man/fr/man1/dpkg-genchanges.1
 man/fr/man1/dpkg-gencontrol.1
+man/fr/man1/dpkg-gensymbols.1
+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
 man/fr/man1/dpkg-source.1
 man/fr/man1/dpkg-split.1
+man/fr/man1/dpkg-trigger.1
+man/fr/man1/dpkg-vendor.1
 man/fr/man1/dpkg.1
+man/fr/man1/dselect.1
 man/fr/man5/deb-control.5
+man/fr/man5/deb-extra-override.5
+man/fr/man5/deb-old.5
+man/fr/man5/deb-origin.5
+man/fr/man5/deb-override.5
+man/fr/man5/deb-shlibs.5
+man/fr/man5/deb-split.5
+man/fr/man5/deb-src-control.5
+man/fr/man5/deb-substvars.5
+man/fr/man5/deb-symbols.5
+man/fr/man5/deb-triggers.5
+man/fr/man5/deb-version.5
 man/fr/man5/deb.5
 man/fr/man5/dpkg.cfg.5
-man/fr/man8/cleanup-info.8
+man/fr/man5/dselect.cfg.5
 man/fr/man8/dpkg-divert.8
 man/fr/man8/dpkg-statoverride.8
-man/fr/man8/install-info.8
-man/fr/man8/start-stop-daemon.8
 man/fr/man8/update-alternatives.8
-man/hu/man1/dpkg-deb.1
-man/hu/man5/deb-control.5
 man/hu/man5/dpkg.cfg.5
 man/hu/man5/dselect.cfg.5
-man/ja/man1/822-date.1
+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
+man/ja/man1/dpkg-vendor.1
 man/ja/man1/dpkg.1
 man/ja/man1/dselect.1
 man/ja/man5/deb-control.5
+man/ja/man5/deb-extra-override.5
 man/ja/man5/deb-old.5
+man/ja/man5/deb-origin.5
+man/ja/man5/deb-override.5
+man/ja/man5/deb-shlibs.5
+man/ja/man5/deb-split.5
+man/ja/man5/deb-src-control.5
+man/ja/man5/deb-substvars.5
+man/ja/man5/deb-symbols.5
+man/ja/man5/deb-triggers.5
+man/ja/man5/deb-version.5
 man/ja/man5/deb.5
-man/ja/man8/cleanup-info.8
+man/ja/man5/dpkg.cfg.5
+man/ja/man5/dselect.cfg.5
 man/ja/man8/dpkg-divert.8
 man/ja/man8/dpkg-statoverride.8
-man/ja/man8/install-info.8
-man/ja/man8/start-stop-daemon.8
 man/ja/man8/update-alternatives.8
-man/man1/822-date.1
 man/man1/dpkg-architecture.1
+man/man1/dpkg-buildflags.1
 man/man1/dpkg-buildpackage.1
 man/man1/dpkg-checkbuilddeps.1
 man/man1/dpkg-deb.1
 man/man1/dpkg-distaddfile.1
 man/man1/dpkg-genchanges.1
 man/man1/dpkg-gencontrol.1
+man/man1/dpkg-gensymbols.1
+man/man1/dpkg-maintscript-helper.1
+man/man1/dpkg-mergechangelogs.1
 man/man1/dpkg-name.1
 man/man1/dpkg-parsechangelog.1
 man/man1/dpkg-query.1
@@ -115,56 +323,135 @@ man/man1/dpkg-scansources.1
 man/man1/dpkg-shlibdeps.1
 man/man1/dpkg-source.1
 man/man1/dpkg-split.1
+man/man1/dpkg-trigger.1
+man/man1/dpkg-vendor.1
 man/man1/dpkg.1
 man/man1/dselect.1
+man/man3/Dpkg::BuildFlags.3
+man/man3/Dpkg::BuildOptions.3
+man/man3/Dpkg::Changelog.3
+man/man3/Dpkg::Changelog::Debian.3
+man/man3/Dpkg::Changelog::Entry.3
+man/man3/Dpkg::Changelog::Entry::Debian.3
+man/man3/Dpkg::Changelog::Parse.3
+man/man3/Dpkg::Checksums.3
+man/man3/Dpkg::Compression.3
+man/man3/Dpkg::Compression::FileHandle.3
+man/man3/Dpkg::Compression::Process.3
+man/man3/Dpkg::Conf.3
+man/man3/Dpkg::Control.3
+man/man3/Dpkg::Control::Changelog.3
+man/man3/Dpkg::Control::Fields.3
+man/man3/Dpkg::Control::Hash.3
+man/man3/Dpkg::Control::Info.3
+man/man3/Dpkg::Control::Types.3
+man/man3/Dpkg::Deps.3
+man/man3/Dpkg::IPC.3
+man/man3/Dpkg::Index.3
+man/man3/Dpkg::Interface::Storable.3
+man/man3/Dpkg::Path.3
+man/man3/Dpkg::Source::Package.3
+man/man3/Dpkg::Substvars.3
+man/man3/Dpkg::Vendor.3
+man/man3/Dpkg::Vendor::Debian.3
+man/man3/Dpkg::Vendor::Default.3
+man/man3/Dpkg::Vendor::Ubuntu.3
+man/man3/Dpkg::Version.3
 man/man5/deb-control.5
+man/man5/deb-extra-override.5
 man/man5/deb-old.5
+man/man5/deb-origin.5
+man/man5/deb-override.5
+man/man5/deb-shlibs.5
+man/man5/deb-split.5
+man/man5/deb-src-control.5
+man/man5/deb-substvars.5
+man/man5/deb-symbols.5
+man/man5/deb-triggers.5
+man/man5/deb-version.5
 man/man5/deb.5
 man/man5/dpkg.cfg.5
 man/man5/dselect.cfg.5
-man/man8/cleanup-info.8
 man/man8/dpkg-divert.8
 man/man8/dpkg-statoverride.8
-man/man8/install-info.8
-man/man8/start-stop-daemon.8
 man/man8/update-alternatives.8
-man/pl/man1/822-date.1
+man/pl/man1/dpkg-architecture.1
+man/pl/man1/dpkg-buildpackage.1
+man/pl/man1/dpkg-checkbuilddeps.1
 man/pl/man1/dpkg-deb.1
-man/pl/man1/dpkg-query.1
+man/pl/man1/dpkg-distaddfile.1
+man/pl/man1/dpkg-genchanges.1
+man/pl/man1/dpkg-gencontrol.1
+man/pl/man1/dpkg-name.1
+man/pl/man1/dpkg-parsechangelog.1
+man/pl/man1/dpkg-scansources.1
+man/pl/man1/dpkg-shlibdeps.1
 man/pl/man1/dpkg-split.1
-man/pl/man1/dpkg.1
+man/pl/man1/dpkg-trigger.1
+man/pl/man1/dpkg-vendor.1
 man/pl/man1/dselect.1
+man/pl/man5/deb-extra-override.5
+man/pl/man5/deb-old.5
+man/pl/man5/deb-substvars.5
+man/pl/man5/deb.5
 man/pl/man5/dpkg.cfg.5
 man/pl/man5/dselect.cfg.5
+man/pl/man8/dpkg-divert.8
 man/pl/man8/dpkg-statoverride.8
-man/pl/man8/start-stop-daemon.8
 man/pl/man8/update-alternatives.8
-man/ru/man1/822-date.1
-man/ru/man1/dpkg-checkbuilddeps.1
-man/ru/man1/dpkg.1
-man/ru/man5/deb-control.5
-man/ru/man8/start-stop-daemon.8
-man/sv/man1/822-date.1
+man/sv/man1/dpkg-architecture.1
+man/sv/man1/dpkg-buildflags.1
+man/sv/man1/dpkg-buildpackage.1
+man/sv/man1/dpkg-checkbuilddeps.1
 man/sv/man1/dpkg-deb.1
+man/sv/man1/dpkg-distaddfile.1
+man/sv/man1/dpkg-genchanges.1
+man/sv/man1/dpkg-gencontrol.1
+man/sv/man1/dpkg-gensymbols.1
+man/sv/man1/dpkg-maintscript-helper.1
+man/sv/man1/dpkg-mergechangelogs.1
+man/sv/man1/dpkg-name.1
+man/sv/man1/dpkg-parsechangelog.1
 man/sv/man1/dpkg-query.1
+man/sv/man1/dpkg-scanpackages.1
+man/sv/man1/dpkg-scansources.1
+man/sv/man1/dpkg-shlibdeps.1
+man/sv/man1/dpkg-source.1
 man/sv/man1/dpkg-split.1
+man/sv/man1/dpkg-trigger.1
+man/sv/man1/dpkg-vendor.1
 man/sv/man1/dpkg.1
 man/sv/man1/dselect.1
 man/sv/man5/deb-control.5
+man/sv/man5/deb-extra-override.5
 man/sv/man5/deb-old.5
+man/sv/man5/deb-origin.5
+man/sv/man5/deb-override.5
+man/sv/man5/deb-shlibs.5
+man/sv/man5/deb-split.5
+man/sv/man5/deb-src-control.5
+man/sv/man5/deb-substvars.5
+man/sv/man5/deb-symbols.5
+man/sv/man5/deb-triggers.5
+man/sv/man5/deb-version.5
 man/sv/man5/deb.5
 man/sv/man5/dpkg.cfg.5
 man/sv/man5/dselect.cfg.5
-man/sv/man8/start-stop-daemon.8
-sbin/cleanup-info
-sbin/dpkg-divert
-sbin/dpkg-statoverride
+man/sv/man8/dpkg-divert.8
+man/sv/man8/dpkg-statoverride.8
+man/sv/man8/update-alternatives.8
 sbin/install-info
-sbin/update-alternatives
+share/dpkg/abitable
 share/dpkg/alternatives/README
+share/dpkg/architecture.mk
+share/dpkg/buildflags.mk
 share/dpkg/cputable
-share/dpkg/dpkg/origins/debian
+share/dpkg/default.mk
 share/dpkg/ostable
+share/dpkg/pkg-info.mk
+share/dpkg/triplettable
+share/dpkg/vendor.mk
+share/locale/ast/LC_MESSAGES/dpkg.mo
 share/locale/bs/LC_MESSAGES/dpkg.mo
 share/locale/bs/LC_MESSAGES/dselect.mo
 share/locale/ca/LC_MESSAGES/dpkg-dev.mo
@@ -174,13 +461,18 @@ share/locale/cs/LC_MESSAGES/dpkg.mo
 share/locale/cs/LC_MESSAGES/dselect.mo
 share/locale/da/LC_MESSAGES/dpkg.mo
 share/locale/da/LC_MESSAGES/dselect.mo
+share/locale/de/LC_MESSAGES/dpkg-dev.mo
 share/locale/de/LC_MESSAGES/dpkg.mo
 share/locale/de/LC_MESSAGES/dselect.mo
 share/locale/dz/LC_MESSAGES/dpkg.mo
 share/locale/el/LC_MESSAGES/dpkg.mo
 share/locale/el/LC_MESSAGES/dselect.mo
+share/locale/eo/LC_MESSAGES/dpkg.mo
+share/locale/es/LC_MESSAGES/dpkg-dev.mo
 share/locale/es/LC_MESSAGES/dpkg.mo
 share/locale/es/LC_MESSAGES/dselect.mo
+share/locale/et/LC_MESSAGES/dpkg.mo
+share/locale/et/LC_MESSAGES/dselect.mo
 share/locale/eu/LC_MESSAGES/dpkg.mo
 share/locale/eu/LC_MESSAGES/dselect.mo
 share/locale/fr/LC_MESSAGES/dpkg-dev.mo
@@ -199,6 +491,9 @@ share/locale/ja/LC_MESSAGES/dselect.mo
 share/locale/km/LC_MESSAGES/dpkg.mo
 share/locale/ko/LC_MESSAGES/dpkg.mo
 share/locale/ko/LC_MESSAGES/dselect.mo
+share/locale/ku/LC_MESSAGES/dpkg.mo
+share/locale/lt/LC_MESSAGES/dpkg.mo
+share/locale/mr/LC_MESSAGES/dpkg.mo
 share/locale/nb/LC_MESSAGES/dpkg.mo
 share/locale/nb/LC_MESSAGES/dselect.mo
 share/locale/ne/LC_MESSAGES/dpkg.mo
@@ -207,6 +502,7 @@ share/locale/nl/LC_MESSAGES/dselect.mo
 share/locale/nn/LC_MESSAGES/dpkg.mo
 share/locale/nn/LC_MESSAGES/dselect.mo
 share/locale/pa/LC_MESSAGES/dpkg.mo
+share/locale/pl/LC_MESSAGES/dpkg-dev.mo
 share/locale/pl/LC_MESSAGES/dpkg.mo
 share/locale/pl/LC_MESSAGES/dselect.mo
 share/locale/pt/LC_MESSAGES/dpkg.mo
@@ -215,12 +511,15 @@ share/locale/pt_BR/LC_MESSAGES/dpkg.mo
 share/locale/pt_BR/LC_MESSAGES/dselect.mo
 share/locale/ro/LC_MESSAGES/dpkg.mo
 share/locale/ro/LC_MESSAGES/dselect.mo
+share/locale/ru/LC_MESSAGES/dpkg-dev.mo
 share/locale/ru/LC_MESSAGES/dpkg.mo
 share/locale/ru/LC_MESSAGES/dselect.mo
 share/locale/sk/LC_MESSAGES/dpkg.mo
 share/locale/sk/LC_MESSAGES/dselect.mo
+share/locale/sv/LC_MESSAGES/dpkg-dev.mo
 share/locale/sv/LC_MESSAGES/dpkg.mo
 share/locale/sv/LC_MESSAGES/dselect.mo
+share/locale/th/LC_MESSAGES/dpkg.mo
 share/locale/tl/LC_MESSAGES/dpkg.mo
 share/locale/tl/LC_MESSAGES/dselect.mo
 share/locale/vi/LC_MESSAGES/dpkg.mo
diff --git a/misc/dpkg/distinfo b/misc/dpkg/distinfo
index babbf138f5f..cc515cc6280 100644
--- a/misc/dpkg/distinfo
+++ b/misc/dpkg/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/12/02 09:38:50 rillig Exp $
+$NetBSD: distinfo,v 1.6 2012/05/26 14:27:20 christos Exp $
 
-SHA1 (dpkg_1.13.25.tar.gz) = d943167eac6abde6bc88a628389b26bb7a84c3b7
-RMD160 (dpkg_1.13.25.tar.gz) = a4a58cd34839d0d70e8c231e1db548dbd9568806
-Size (dpkg_1.13.25.tar.gz) = 3384618 bytes
-SHA1 (patch-ad) = 95c64b2d0c6872b75151f2e8ca4c3d0a3206b6a0
-SHA1 (patch-af) = 2b7245e7c335d738197fc92284e901a43fa1d8a8
-SHA1 (patch-ag) = bbba4a85ff03f4aafd902cf61586a7e614bc1c36
+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
diff --git a/misc/dpkg/files/obstack.c b/misc/dpkg/files/obstack.c
deleted file mode 100644
index f277da9874e..00000000000
--- a/misc/dpkg/files/obstack.c
+++ /dev/null
@@ -1,600 +0,0 @@
-/*	$NetBSD: obstack.c,v 1.1 2007/12/02 09:38:50 rillig Exp $	*/
-
-/* obstack.c - subroutines used implicitly by object stack macros
-   Copyright (C) 1988-1994,96,97,98,99 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.  The master source lives in /gd/gnu/lib.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "obstack.h"
-
-/* NOTE BEFORE MODIFYING THIS FILE: This version number must be
-   incremented whenever callers compiled using an old obstack.h can no
-   longer properly call the functions in this obstack.c.  */
-#define OBSTACK_INTERFACE_VERSION 1
-
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself, and the installed library
-   supports the same library interface we do.  This code is part of the GNU
-   C Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object
-   files, it is simpler to just do this in the source for each such file.  */
-
-#include <stdio.h>		/* Random thing to get __GNU_LIBRARY__.  */
-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
-#include <gnu-versions.h>
-#if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
-#define ELIDE_CODE
-#endif
-#endif
-
-
-#ifndef ELIDE_CODE
-
-
-#if defined (__STDC__) && __STDC__
-#define POINTER void *
-#else
-#define POINTER char *
-#endif
-
-/* Determine default alignment.  */
-struct fooalign {char x; double d;};
-#define DEFAULT_ALIGNMENT  \
-  ((PTR_INT_TYPE) ((char *) &((struct fooalign *) 0)->d - (char *) 0))
-/* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT.
-   But in fact it might be less smart and round addresses to as much as
-   DEFAULT_ROUNDING.  So we prepare for it to do that.  */
-union fooround {long x; double d;};
-#define DEFAULT_ROUNDING (sizeof (union fooround))
-
-/* When we copy a long block of data, this is the unit to do it with.
-   On some machines, copying successive ints does not work;
-   in such a case, redefine COPYING_UNIT to `long' (if that works)
-   or `char' as a last resort.  */
-#ifndef COPYING_UNIT
-#define COPYING_UNIT int
-#endif
-
-
-/* The functions allocating more room by calling `obstack_chunk_alloc'
-   jump to the handler pointed to by `obstack_alloc_failed_handler'.
-   This can be set to a user defined function which should either
-   abort gracefully or use longjump - but shouldn't return.  This
-   variable by default points to the internal function
-   `print_and_abort'.  */
-#if defined (__STDC__) && __STDC__
-static void print_and_abort (void);
-void (*obstack_alloc_failed_handler) (void) = print_and_abort;
-#else
-static void print_and_abort ();
-void (*obstack_alloc_failed_handler) () = print_and_abort;
-#endif
-
-/* Exit value used when `print_and_abort' is used.  */
-#if defined __GNU_LIBRARY__ || defined HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-int obstack_exit_failure = EXIT_FAILURE;
-
-/* The non-GNU-C macros copy the obstack into this global variable
-   to avoid multiple evaluation.  */
-
-struct obstack *_obstack;
-
-/* Define a macro that either calls functions with the traditional malloc/free
-   calling interface, or calls functions with the mmalloc/mfree interface
-   (that adds an extra first argument), based on the state of use_extra_arg.
-   For free, do not use ?:, since some compilers, like the MIPS compilers,
-   do not allow (expr) ? void : void.  */
-
-#if defined (__STDC__) && __STDC__
-#define CALL_CHUNKFUN(h, size) \
-  (((h) -> use_extra_arg) \
-   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
-   : (*(struct _obstack_chunk *(*) (long)) (h)->chunkfun) ((size)))
-
-#define CALL_FREEFUN(h, old_chunk) \
-  do { \
-    if ((h) -> use_extra_arg) \
-      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
-    else \
-      (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \
-  } while (0)
-#else
-#define CALL_CHUNKFUN(h, size) \
-  (((h) -> use_extra_arg) \
-   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
-   : (*(struct _obstack_chunk *(*) ()) (h)->chunkfun) ((size)))
-
-#define CALL_FREEFUN(h, old_chunk) \
-  do { \
-    if ((h) -> use_extra_arg) \
-      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
-    else \
-      (*(void (*) ()) (h)->freefun) ((old_chunk)); \
-  } while (0)
-#endif
-
-
-/* Initialize an obstack H for use.  Specify chunk size SIZE (0 means default).
-   Objects start on multiples of ALIGNMENT (0 means use default).
-   CHUNKFUN is the function to use to allocate chunks,
-   and FREEFUN the function to free them.
-
-   Return nonzero if successful, calls obstack_alloc_failed_handler if
-   allocation fails.  */
-
-int
-_obstack_begin (h, size, alignment, chunkfun, freefun)
-     struct obstack *h;
-     int size;
-     int alignment;
-#if defined (__STDC__) && __STDC__
-     POINTER (*chunkfun) (long);
-     void (*freefun) (void *);
-#else
-     POINTER (*chunkfun) ();
-     void (*freefun) ();
-#endif
-{
-  register struct _obstack_chunk *chunk; /* points to new chunk */
-
-  if (alignment == 0)
-    alignment = (int) DEFAULT_ALIGNMENT;
-  if (size == 0)
-    /* Default size is what GNU malloc can fit in a 4096-byte block.  */
-    {
-      /* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc.
-	 Use the values for range checking, because if range checking is off,
-	 the extra bytes won't be missed terribly, but if range checking is on
-	 and we used a larger request, a whole extra 4096 bytes would be
-	 allocated.
-
-	 These number are irrelevant to the new GNU malloc.  I suspect it is
-	 less sensitive to the size of the request.  */
-      int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1))
-		    + 4 + DEFAULT_ROUNDING - 1)
-		   & ~(DEFAULT_ROUNDING - 1));
-      size = 4096 - extra;
-    }
-
-#if defined (__STDC__) && __STDC__
-  h->chunkfun = (struct _obstack_chunk * (*)(void *, long)) chunkfun;
-  h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
-#else
-  h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun;
-  h->freefun = freefun;
-#endif
-  h->chunk_size = size;
-  h->alignment_mask = alignment - 1;
-  h->use_extra_arg = 0;
-
-  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
-  if (!chunk)
-    (*obstack_alloc_failed_handler) ();
-  h->next_free = h->object_base = chunk->contents;
-  h->chunk_limit = chunk->limit
-    = (char *) chunk + h->chunk_size;
-  chunk->prev = 0;
-  /* The initial chunk now contains no empty object.  */
-  h->maybe_empty_object = 0;
-  h->alloc_failed = 0;
-  return 1;
-}
-
-int
-_obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg)
-     struct obstack *h;
-     int size;
-     int alignment;
-#if defined (__STDC__) && __STDC__
-     POINTER (*chunkfun) (POINTER, long);
-     void (*freefun) (POINTER, POINTER);
-#else
-     POINTER (*chunkfun) ();
-     void (*freefun) ();
-#endif
-     POINTER arg;
-{
-  register struct _obstack_chunk *chunk; /* points to new chunk */
-
-  if (alignment == 0)
-    alignment = (int) DEFAULT_ALIGNMENT;
-  if (size == 0)
-    /* Default size is what GNU malloc can fit in a 4096-byte block.  */
-    {
-      /* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc.
-	 Use the values for range checking, because if range checking is off,
-	 the extra bytes won't be missed terribly, but if range checking is on
-	 and we used a larger request, a whole extra 4096 bytes would be
-	 allocated.
-
-	 These number are irrelevant to the new GNU malloc.  I suspect it is
-	 less sensitive to the size of the request.  */
-      int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1))
-		    + 4 + DEFAULT_ROUNDING - 1)
-		   & ~(DEFAULT_ROUNDING - 1));
-      size = 4096 - extra;
-    }
-
-#if defined(__STDC__) && __STDC__
-  h->chunkfun = (struct _obstack_chunk * (*)(void *,long)) chunkfun;
-  h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
-#else
-  h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun;
-  h->freefun = freefun;
-#endif
-  h->chunk_size = size;
-  h->alignment_mask = alignment - 1;
-  h->extra_arg = arg;
-  h->use_extra_arg = 1;
-
-  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
-  if (!chunk)
-    (*obstack_alloc_failed_handler) ();
-  h->next_free = h->object_base = chunk->contents;
-  h->chunk_limit = chunk->limit
-    = (char *) chunk + h->chunk_size;
-  chunk->prev = 0;
-  /* The initial chunk now contains no empty object.  */
-  h->maybe_empty_object = 0;
-  h->alloc_failed = 0;
-  return 1;
-}
-
-/* Allocate a new current chunk for the obstack *H
-   on the assumption that LENGTH bytes need to be added
-   to the current object, or a new object of length LENGTH allocated.
-   Copies any partial object from the end of the old chunk
-   to the beginning of the new one.  */
-
-void
-_obstack_newchunk (h, length)
-     struct obstack *h;
-     int length;
-{
-  register struct _obstack_chunk *old_chunk = h->chunk;
-  register struct _obstack_chunk *new_chunk;
-  register long	new_size;
-  register long obj_size = h->next_free - h->object_base;
-  register long i;
-  long already;
-
-  /* Compute size for new chunk.  */
-  new_size = (obj_size + length) + (obj_size >> 3) + 100;
-  if (new_size < h->chunk_size)
-    new_size = h->chunk_size;
-
-  /* Allocate and initialize the new chunk.  */
-  new_chunk = CALL_CHUNKFUN (h, new_size);
-  if (!new_chunk)
-    (*obstack_alloc_failed_handler) ();
-  h->chunk = new_chunk;
-  new_chunk->prev = old_chunk;
-  new_chunk->limit = h->chunk_limit = (char *) new_chunk + new_size;
-
-  /* Move the existing object to the new chunk.
-     Word at a time is fast and is safe if the object
-     is sufficiently aligned.  */
-  if (h->alignment_mask + 1 >= DEFAULT_ALIGNMENT)
-    {
-      for (i = obj_size / sizeof (COPYING_UNIT) - 1;
-	   i >= 0; i--)
-	((COPYING_UNIT *)new_chunk->contents)[i]
-	  = ((COPYING_UNIT *)h->object_base)[i];
-      /* We used to copy the odd few remaining bytes as one extra COPYING_UNIT,
-	 but that can cross a page boundary on a machine
-	 which does not do strict alignment for COPYING_UNITS.  */
-      already = obj_size / sizeof (COPYING_UNIT) * sizeof (COPYING_UNIT);
-    }
-  else
-    already = 0;
-  /* Copy remaining bytes one by one.  */
-  for (i = already; i < obj_size; i++)
-    new_chunk->contents[i] = h->object_base[i];
-
-  /* If the object just copied was the only data in OLD_CHUNK,
-     free that chunk and remove it from the chain.
-     But not if that chunk might contain an empty object.  */
-  if (h->object_base == old_chunk->contents && ! h->maybe_empty_object)
-    {
-      new_chunk->prev = old_chunk->prev;
-      CALL_FREEFUN (h, old_chunk);
-    }
-
-  h->object_base = new_chunk->contents;
-  h->next_free = h->object_base + obj_size;
-  /* The new chunk certainly contains no empty object yet.  */
-  h->maybe_empty_object = 0;
-}
-
-/* Return nonzero if object OBJ has been allocated from obstack H.
-   This is here for debugging.
-   If you use it in a program, you are probably losing.  */
-
-#if defined (__STDC__) && __STDC__
-/* Suppress -Wmissing-prototypes warning.  We don't want to declare this in
-   obstack.h because it is just for debugging.  */
-int _obstack_allocated_p (struct obstack *h, POINTER obj);
-#endif
-
-int
-_obstack_allocated_p (h, obj)
-     struct obstack *h;
-     POINTER obj;
-{
-  register struct _obstack_chunk *lp;	/* below addr of any objects in this chunk */
-  register struct _obstack_chunk *plp;	/* point to previous chunk if any */
-
-  lp = (h)->chunk;
-  /* We use >= rather than > since the object cannot be exactly at
-     the beginning of the chunk but might be an empty object exactly
-     at the end of an adjacent chunk.  */
-  while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
-    {
-      plp = lp->prev;
-      lp = plp;
-    }
-  return lp != 0;
-}
-
-/* Free objects in obstack H, including OBJ and everything allocate
-   more recently than OBJ.  If OBJ is zero, free everything in H.  */
-
-#undef obstack_free
-
-/* This function has two names with identical definitions.
-   This is the first one, called from non-ANSI code.  */
-
-void
-_obstack_free (h, obj)
-     struct obstack *h;
-     POINTER obj;
-{
-  register struct _obstack_chunk *lp;	/* below addr of any objects in this chunk */
-  register struct _obstack_chunk *plp;	/* point to previous chunk if any */
-
-  lp = h->chunk;
-  /* We use >= because there cannot be an object at the beginning of a chunk.
-     But there can be an empty object at that address
-     at the end of another chunk.  */
-  while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
-    {
-      plp = lp->prev;
-      CALL_FREEFUN (h, lp);
-      lp = plp;
-      /* If we switch chunks, we can't tell whether the new current
-	 chunk contains an empty object, so assume that it may.  */
-      h->maybe_empty_object = 1;
-    }
-  if (lp)
-    {
-      h->object_base = h->next_free = (char *) (obj);
-      h->chunk_limit = lp->limit;
-      h->chunk = lp;
-    }
-  else if (obj != 0)
-    /* obj is not in any of the chunks! */
-    abort ();
-}
-
-/* This function is used from ANSI code.  */
-
-void
-obstack_free (h, obj)
-     struct obstack *h;
-     POINTER obj;
-{
-  register struct _obstack_chunk *lp;	/* below addr of any objects in this chunk */
-  register struct _obstack_chunk *plp;	/* point to previous chunk if any */
-
-  lp = h->chunk;
-  /* We use >= because there cannot be an object at the beginning of a chunk.
-     But there can be an empty object at that address
-     at the end of another chunk.  */
-  while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
-    {
-      plp = lp->prev;
-      CALL_FREEFUN (h, lp);
-      lp = plp;
-      /* If we switch chunks, we can't tell whether the new current
-	 chunk contains an empty object, so assume that it may.  */
-      h->maybe_empty_object = 1;
-    }
-  if (lp)
-    {
-      h->object_base = h->next_free = (char *) (obj);
-      h->chunk_limit = lp->limit;
-      h->chunk = lp;
-    }
-  else if (obj != 0)
-    /* obj is not in any of the chunks! */
-    abort ();
-}
-
-int
-_obstack_memory_used (h)
-     struct obstack *h;
-{
-  register struct _obstack_chunk* lp;
-  register int nbytes = 0;
-
-  for (lp = h->chunk; lp != 0; lp = lp->prev)
-    {
-      nbytes += lp->limit - (char *) lp;
-    }
-  return nbytes;
-}
-
-/* Define the error handler.  */
-#ifndef _
-# ifdef HAVE_LIBINTL_H
-#  include <libintl.h>
-#  ifndef _
-#   define _(Str) gettext (Str)
-#  endif
-# else
-#  define _(Str) (Str)
-# endif
-#endif
-#if defined _LIBC && defined USE_IN_LIBIO
-# include <libio/iolibio.h>
-# define fputs(s, f) _IO_fputs (s, f)
-#endif
-
-static void
-print_and_abort ()
-{
-  fputs (_("memory exhausted"), stderr);
-  fputc ('\n', stderr);
-  exit (obstack_exit_failure);
-}
-
-#if 0
-/* These are now turned off because the applications do not use it
-   and it uses bcopy via obstack_grow, which causes trouble on sysV.  */
-
-/* Now define the functional versions of the obstack macros.
-   Define them to simply use the corresponding macros to do the job.  */
-
-#if defined (__STDC__) && __STDC__
-/* These function definitions do not work with non-ANSI preprocessors;
-   they won't pass through the macro names in parentheses.  */
-
-/* The function names appear in parentheses in order to prevent
-   the macro-definitions of the names from being expanded there.  */
-
-POINTER (obstack_base) (obstack)
-     struct obstack *obstack;
-{
-  return obstack_base (obstack);
-}
-
-POINTER (obstack_next_free) (obstack)
-     struct obstack *obstack;
-{
-  return obstack_next_free (obstack);
-}
-
-int (obstack_object_size) (obstack)
-     struct obstack *obstack;
-{
-  return obstack_object_size (obstack);
-}
-
-int (obstack_room) (obstack)
-     struct obstack *obstack;
-{
-  return obstack_room (obstack);
-}
-
-int (obstack_make_room) (obstack, length)
-     struct obstack *obstack;
-     int length;
-{
-  return obstack_make_room (obstack, length);
-}
-
-void (obstack_grow) (obstack, pointer, length)
-     struct obstack *obstack;
-     POINTER pointer;
-     int length;
-{
-  obstack_grow (obstack, pointer, length);
-}
-
-void (obstack_grow0) (obstack, pointer, length)
-     struct obstack *obstack;
-     POINTER pointer;
-     int length;
-{
-  obstack_grow0 (obstack, pointer, length);
-}
-
-void (obstack_1grow) (obstack, character)
-     struct obstack *obstack;
-     int character;
-{
-  obstack_1grow (obstack, character);
-}
-
-void (obstack_blank) (obstack, length)
-     struct obstack *obstack;
-     int length;
-{
-  obstack_blank (obstack, length);
-}
-
-void (obstack_1grow_fast) (obstack, character)
-     struct obstack *obstack;
-     int character;
-{
-  obstack_1grow_fast (obstack, character);
-}
-
-void (obstack_blank_fast) (obstack, length)
-     struct obstack *obstack;
-     int length;
-{
-  obstack_blank_fast (obstack, length);
-}
-
-POINTER (obstack_finish) (obstack)
-     struct obstack *obstack;
-{
-  return obstack_finish (obstack);
-}
-
-POINTER (obstack_alloc) (obstack, length)
-     struct obstack *obstack;
-     int length;
-{
-  return obstack_alloc (obstack, length);
-}
-
-POINTER (obstack_copy) (obstack, pointer, length)
-     struct obstack *obstack;
-     POINTER pointer;
-     int length;
-{
-  return obstack_copy (obstack, pointer, length);
-}
-
-POINTER (obstack_copy0) (obstack, pointer, length)
-     struct obstack *obstack;
-     POINTER pointer;
-     int length;
-{
-  return obstack_copy0 (obstack, pointer, length);
-}
-
-#endif /* __STDC__ */
-
-#endif /* 0 */
-
-#endif	/* !ELIDE_CODE */
diff --git a/misc/dpkg/files/obstack.h b/misc/dpkg/files/obstack.h
deleted file mode 100644
index 58484a6a6c2..00000000000
--- a/misc/dpkg/files/obstack.h
+++ /dev/null
@@ -1,595 +0,0 @@
-/*	$NetBSD: obstack.h,v 1.1 2007/12/02 09:38:50 rillig Exp $	*/
-
-/* obstack.h - object stack macros
-   Copyright (C) 1988,89,90,91,92,93,94,96,97,98,99 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.  The master source lives in /gd/gnu/lib.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* Summary:
-
-All the apparent functions defined here are macros. The idea
-is that you would use these pre-tested macros to solve a
-very specific set of problems, and they would run fast.
-Caution: no side-effects in arguments please!! They may be
-evaluated MANY times!!
-
-These macros operate a stack of objects.  Each object starts life
-small, and may grow to maturity.  (Consider building a word syllable
-by syllable.)  An object can move while it is growing.  Once it has
-been "finished" it never changes address again.  So the "top of the
-stack" is typically an immature growing object, while the rest of the
-stack is of mature, fixed size and fixed address objects.
-
-These routines grab large chunks of memory, using a function you
-supply, called `obstack_chunk_alloc'.  On occasion, they free chunks,
-by calling `obstack_chunk_free'.  You must define them and declare
-them before using any obstack macros.
-
-Each independent stack is represented by a `struct obstack'.
-Each of the obstack macros expects a pointer to such a structure
-as the first argument.
-
-One motivation for this package is the problem of growing char strings
-in symbol tables.  Unless you are "fascist pig with a read-only mind"
---Gosper's immortal quote from HAKMEM item 154, out of context--you
-would not like to put any arbitrary upper limit on the length of your
-symbols.
-
-In practice this often means you will build many short symbols and a
-few long symbols.  At the time you are reading a symbol you don't know
-how long it is.  One traditional method is to read a symbol into a
-buffer, realloc()ating the buffer every time you try to read a symbol
-that is longer than the buffer.  This is beaut, but you still will
-want to copy the symbol from the buffer to a more permanent
-symbol-table entry say about half the time.
-
-With obstacks, you can work differently.  Use one obstack for all symbol
-names.  As you read a symbol, grow the name in the obstack gradually.
-When the name is complete, finalize it.  Then, if the symbol exists already,
-free the newly read name.
-
-The way we do this is to take a large chunk, allocating memory from
-low addresses.  When you want to build a symbol in the chunk you just
-add chars above the current "high water mark" in the chunk.  When you
-have finished adding chars, because you got to the end of the symbol,
-you know how long the chars are, and you can create a new object.
-Mostly the chars will not burst over the highest address of the chunk,
-because you would typically expect a chunk to be (say) 100 times as
-long as an average object.
-
-In case that isn't clear, when we have enough chars to make up
-the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed)
-so we just point to it where it lies.  No moving of chars is
-needed and this is the second win: potentially long strings need
-never be explicitly shuffled. Once an object is formed, it does not
-change its address during its lifetime.
-
-When the chars burst over a chunk boundary, we allocate a larger
-chunk, and then copy the partly formed object from the end of the old
-chunk to the beginning of the new larger chunk.  We then carry on
-accreting characters to the end of the object as we normally would.
-
-A special macro is provided to add a single char at a time to a
-growing object.  This allows the use of register variables, which
-break the ordinary 'growth' macro.
-
-Summary:
-	We allocate large chunks.
-	We carve out one object at a time from the current chunk.
-	Once carved, an object never moves.
-	We are free to append data of any size to the currently
-	  growing object.
-	Exactly one object is growing in an obstack at any one time.
-	You can run one obstack per control block.
-	You may have as many control blocks as you dare.
-	Because of the way we do it, you can `unwind' an obstack
-	  back to a previous state. (You may remove objects much
-	  as you would with a stack.)
-*/
-
-
-/* Don't do the contents of this file more than once.  */
-
-#ifndef _OBSTACK_H
-#define _OBSTACK_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* We use subtraction of (char *) 0 instead of casting to int
-   because on word-addressable machines a simple cast to int
-   may ignore the byte-within-word field of the pointer.  */
-
-#ifndef __PTR_TO_INT
-# define __PTR_TO_INT(P) ((P) - (char *) 0)
-#endif
-
-#ifndef __INT_TO_PTR
-# define __INT_TO_PTR(P) ((P) + (char *) 0)
-#endif
-
-/* We need the type of the resulting object.  If __PTRDIFF_TYPE__ is
-   defined, as with GNU C, use that; that way we don't pollute the
-   namespace with <stddef.h>'s symbols.  Otherwise, if <stddef.h> is
-   available, include it and use ptrdiff_t.  In traditional C, long is
-   the best that we can do.  */
-
-#ifdef __PTRDIFF_TYPE__
-# define PTR_INT_TYPE __PTRDIFF_TYPE__
-#else
-# ifdef HAVE_STDDEF_H
-#  include <stddef.h>
-#  define PTR_INT_TYPE ptrdiff_t
-# else
-#  define PTR_INT_TYPE long
-# endif
-#endif
-
-#if defined _LIBC || defined HAVE_STRING_H
-# include <string.h>
-# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N))
-#else
-# ifdef memcpy
-#  define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N))
-# else
-#  define _obstack_memcpy(To, From, N) bcopy ((From), (To), (N))
-# endif
-#endif
-
-struct _obstack_chunk		/* Lives at front of each chunk. */
-{
-  char  *limit;			/* 1 past end of this chunk */
-  struct _obstack_chunk *prev;	/* address of prior chunk or NULL */
-  char	contents[4];		/* objects begin here */
-};
-
-struct obstack		/* control current object in current chunk */
-{
-  long	chunk_size;		/* preferred size to allocate chunks in */
-  struct _obstack_chunk *chunk;	/* address of current struct obstack_chunk */
-  char	*object_base;		/* address of object we are building */
-  char	*next_free;		/* where to add next char to current object */
-  char	*chunk_limit;		/* address of char after current chunk */
-  PTR_INT_TYPE temp;		/* Temporary for some macros.  */
-  int   alignment_mask;		/* Mask of alignment for each object. */
-#if defined __STDC__ && __STDC__
-  /* These prototypes vary based on `use_extra_arg', and we use
-     casts to the prototypeless function type in all assignments,
-     but having prototypes here quiets -Wstrict-prototypes.  */
-  struct _obstack_chunk *(*chunkfun) (void *, long);
-  void (*freefun) (void *, struct _obstack_chunk *);
-  void *extra_arg;		/* first arg for chunk alloc/dealloc funcs */
-#else
-  struct _obstack_chunk *(*chunkfun) (); /* User's fcn to allocate a chunk.  */
-  void (*freefun) ();		/* User's function to free a chunk.  */
-  char *extra_arg;		/* first arg for chunk alloc/dealloc funcs */
-#endif
-  unsigned use_extra_arg:1;	/* chunk alloc/dealloc funcs take extra arg */
-  unsigned maybe_empty_object:1;/* There is a possibility that the current
-				   chunk contains a zero-length object.  This
-				   prevents freeing the chunk if we allocate
-				   a bigger chunk to replace it. */
-  unsigned alloc_failed:1;	/* No longer used, as we now call the failed
-				   handler on error, but retained for binary
-				   compatibility.  */
-};
-
-/* Declare the external functions we use; they are in obstack.c.  */
-
-#if defined __STDC__ && __STDC__
-extern void _obstack_newchunk (struct obstack *, int);
-extern void _obstack_free (struct obstack *, void *);
-extern int _obstack_begin (struct obstack *, int, int,
-			    void *(*) (long), void (*) (void *));
-extern int _obstack_begin_1 (struct obstack *, int, int,
-			     void *(*) (void *, long),
-			     void (*) (void *, void *), void *);
-extern int _obstack_memory_used (struct obstack *);
-#else
-extern void _obstack_newchunk ();
-extern void _obstack_free ();
-extern int _obstack_begin ();
-extern int _obstack_begin_1 ();
-extern int _obstack_memory_used ();
-#endif
-
-#if defined __STDC__ && __STDC__
-
-/* Do the function-declarations after the structs
-   but before defining the macros.  */
-
-void obstack_init (struct obstack *obstack);
-
-void * obstack_alloc (struct obstack *obstack, int size);
-
-void * obstack_copy (struct obstack *obstack, void *address, int size);
-void * obstack_copy0 (struct obstack *obstack, void *address, int size);
-
-void obstack_free (struct obstack *obstack, void *block);
-
-void obstack_blank (struct obstack *obstack, int size);
-
-void obstack_grow (struct obstack *obstack, void *data, int size);
-void obstack_grow0 (struct obstack *obstack, void *data, int size);
-
-void obstack_1grow (struct obstack *obstack, int data_char);
-void obstack_ptr_grow (struct obstack *obstack, void *data);
-void obstack_int_grow (struct obstack *obstack, int data);
-
-void * obstack_finish (struct obstack *obstack);
-
-int obstack_object_size (struct obstack *obstack);
-
-int obstack_room (struct obstack *obstack);
-void obstack_make_room (struct obstack *obstack, int size);
-void obstack_1grow_fast (struct obstack *obstack, int data_char);
-void obstack_ptr_grow_fast (struct obstack *obstack, void *data);
-void obstack_int_grow_fast (struct obstack *obstack, int data);
-void obstack_blank_fast (struct obstack *obstack, int size);
-
-void * obstack_base (struct obstack *obstack);
-void * obstack_next_free (struct obstack *obstack);
-int obstack_alignment_mask (struct obstack *obstack);
-int obstack_chunk_size (struct obstack *obstack);
-int obstack_memory_used (struct obstack *obstack);
-
-#endif /* __STDC__ */
-
-/* Non-ANSI C cannot really support alternative functions for these macros,
-   so we do not declare them.  */
-
-/* Error handler called when `obstack_chunk_alloc' failed to allocate
-   more memory.  This can be set to a user defined function which
-   should either abort gracefully or use longjump - but shouldn't
-   return.  The default action is to print a message and abort.  */
-#if defined __STDC__ && __STDC__
-extern void (*obstack_alloc_failed_handler) (void);
-#else
-extern void (*obstack_alloc_failed_handler) ();
-#endif
-
-/* Exit value used when `print_and_abort' is used.  */
-extern int obstack_exit_failure;
-
-/* Pointer to beginning of object being allocated or to be allocated next.
-   Note that this might not be the final address of the object
-   because a new chunk might be needed to hold the final size.  */
-
-#define obstack_base(h) ((h)->object_base)
-
-/* Size for allocating ordinary chunks.  */
-
-#define obstack_chunk_size(h) ((h)->chunk_size)
-
-/* Pointer to next byte not yet allocated in current chunk.  */
-
-#define obstack_next_free(h)	((h)->next_free)
-
-/* Mask specifying low bits that should be clear in address of an object.  */
-
-#define obstack_alignment_mask(h) ((h)->alignment_mask)
-
-/* To prevent prototype warnings provide complete argument list in
-   standard C version.  */
-#if defined __STDC__ && __STDC__
-
-# define obstack_init(h) \
-  _obstack_begin ((h), 0, 0, \
-		  (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free)
-
-# define obstack_begin(h, size) \
-  _obstack_begin ((h), (size), 0, \
-		  (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free)
-
-# define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
-  _obstack_begin ((h), (size), (alignment), \
-		    (void *(*) (long)) (chunkfun), (void (*) (void *)) (freefun))
-
-# define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
-  _obstack_begin_1 ((h), (size), (alignment), \
-		    (void *(*) (void *, long)) (chunkfun), \
-		    (void (*) (void *, void *)) (freefun), (arg))
-
-# define obstack_chunkfun(h, newchunkfun) \
-  ((h) -> chunkfun = (struct _obstack_chunk *(*)(void *, long)) (newchunkfun))
-
-# define obstack_freefun(h, newfreefun) \
-  ((h) -> freefun = (void (*)(void *, struct _obstack_chunk *)) (newfreefun))
-
-#else
-
-# define obstack_init(h) \
-  _obstack_begin ((h), 0, 0, \
-		  (void *(*) ()) obstack_chunk_alloc, (void (*) ()) obstack_chunk_free)
-
-# define obstack_begin(h, size) \
-  _obstack_begin ((h), (size), 0, \
-		  (void *(*) ()) obstack_chunk_alloc, (void (*) ()) obstack_chunk_free)
-
-# define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
-  _obstack_begin ((h), (size), (alignment), \
-		    (void *(*) ()) (chunkfun), (void (*) ()) (freefun))
-
-# define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
-  _obstack_begin_1 ((h), (size), (alignment), \
-		    (void *(*) ()) (chunkfun), (void (*) ()) (freefun), (arg))
-
-# define obstack_chunkfun(h, newchunkfun) \
-  ((h) -> chunkfun = (struct _obstack_chunk *(*)()) (newchunkfun))
-
-# define obstack_freefun(h, newfreefun) \
-  ((h) -> freefun = (void (*)()) (newfreefun))
-
-#endif
-
-#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = achar)
-
-#define obstack_blank_fast(h,n) ((h)->next_free += (n))
-
-#define obstack_memory_used(h) _obstack_memory_used (h)
-
-#if defined __GNUC__ && defined __STDC__ && __STDC__
-/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
-   does not implement __extension__.  But that compiler doesn't define
-   __GNUC_MINOR__.  */
-# if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
-#  define __extension__
-# endif
-
-/* For GNU C, if not -traditional,
-   we can define these macros to compute all args only once
-   without using a global variable.
-   Also, we can avoid using the `temp' slot, to make faster code.  */
-
-# define obstack_object_size(OBSTACK)					\
-  __extension__								\
-  ({ struct obstack *__o = (OBSTACK);					\
-     (unsigned) (__o->next_free - __o->object_base); })
-
-# define obstack_room(OBSTACK)						\
-  __extension__								\
-  ({ struct obstack *__o = (OBSTACK);					\
-     (unsigned) (__o->chunk_limit - __o->next_free); })
-
-# define obstack_make_room(OBSTACK,length)				\
-__extension__								\
-({ struct obstack *__o = (OBSTACK);					\
-   int __len = (length);						\
-   if (__o->chunk_limit - __o->next_free < __len)			\
-     _obstack_newchunk (__o, __len);					\
-   (void) 0; })
-
-# define obstack_empty_p(OBSTACK)					\
-  __extension__								\
-  ({ struct obstack *__o = (OBSTACK);					\
-     (__o->chunk->prev == 0 && __o->next_free - __o->chunk->contents == 0); })
-
-# define obstack_grow(OBSTACK,where,length)				\
-__extension__								\
-({ struct obstack *__o = (OBSTACK);					\
-   int __len = (length);						\
-   if (__o->next_free + __len > __o->chunk_limit)			\
-     _obstack_newchunk (__o, __len);					\
-   _obstack_memcpy (__o->next_free, (char *) (where), __len);		\
-   __o->next_free += __len;						\
-   (void) 0; })
-
-# define obstack_grow0(OBSTACK,where,length)				\
-__extension__								\
-({ struct obstack *__o = (OBSTACK);					\
-   int __len = (length);						\
-   if (__o->next_free + __len + 1 > __o->chunk_limit)			\
-     _obstack_newchunk (__o, __len + 1);				\
-   _obstack_memcpy (__o->next_free, (char *) (where), __len);		\
-   __o->next_free += __len;						\
-   *(__o->next_free)++ = 0;						\
-   (void) 0; })
-
-# define obstack_1grow(OBSTACK,datum)					\
-__extension__								\
-({ struct obstack *__o = (OBSTACK);					\
-   if (__o->next_free + 1 > __o->chunk_limit)				\
-     _obstack_newchunk (__o, 1);					\
-   *(__o->next_free)++ = (datum);					\
-   (void) 0; })
-
-/* These assume that the obstack alignment is good enough for pointers or ints,
-   and that the data added so far to the current object
-   shares that much alignment.  */
-
-# define obstack_ptr_grow(OBSTACK,datum)				\
-__extension__								\
-({ struct obstack *__o = (OBSTACK);					\
-   if (__o->next_free + sizeof (void *) > __o->chunk_limit)		\
-     _obstack_newchunk (__o, sizeof (void *));				\
-   *((void **)__o->next_free)++ = ((void *)datum);			\
-   (void) 0; })
-
-# define obstack_int_grow(OBSTACK,datum)				\
-__extension__								\
-({ struct obstack *__o = (OBSTACK);					\
-   if (__o->next_free + sizeof (int) > __o->chunk_limit)		\
-     _obstack_newchunk (__o, sizeof (int));				\
-   *((int *)__o->next_free)++ = ((int)datum);				\
-   (void) 0; })
-
-# define obstack_ptr_grow_fast(h,aptr) (*((void **) (h)->next_free)++ = (void *)aptr)
-# define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint)
-
-# define obstack_blank(OBSTACK,length)					\
-__extension__								\
-({ struct obstack *__o = (OBSTACK);					\
-   int __len = (length);						\
-   if (__o->chunk_limit - __o->next_free < __len)			\
-     _obstack_newchunk (__o, __len);					\
-   __o->next_free += __len;						\
-   (void) 0; })
-
-# define obstack_alloc(OBSTACK,length)					\
-__extension__								\
-({ struct obstack *__h = (OBSTACK);					\
-   obstack_blank (__h, (length));					\
-   obstack_finish (__h); })
-
-# define obstack_copy(OBSTACK,where,length)				\
-__extension__								\
-({ struct obstack *__h = (OBSTACK);					\
-   obstack_grow (__h, (where), (length));				\
-   obstack_finish (__h); })
-
-# define obstack_copy0(OBSTACK,where,length)				\
-__extension__								\
-({ struct obstack *__h = (OBSTACK);					\
-   obstack_grow0 (__h, (where), (length));				\
-   obstack_finish (__h); })
-
-/* The local variable is named __o1 to avoid a name conflict
-   when obstack_blank is called.  */
-# define obstack_finish(OBSTACK)  					\
-__extension__								\
-({ struct obstack *__o1 = (OBSTACK);					\
-   void *value;								\
-   value = (void *) __o1->object_base;					\
-   if (__o1->next_free == value)					\
-     __o1->maybe_empty_object = 1;					\
-   __o1->next_free							\
-     = __INT_TO_PTR ((__PTR_TO_INT (__o1->next_free)+__o1->alignment_mask)\
-		     & ~ (__o1->alignment_mask));			\
-   if (__o1->next_free - (char *)__o1->chunk				\
-       > __o1->chunk_limit - (char *)__o1->chunk)			\
-     __o1->next_free = __o1->chunk_limit;				\
-   __o1->object_base = __o1->next_free;					\
-   value; })
-
-# define obstack_free(OBSTACK, OBJ)					\
-__extension__								\
-({ struct obstack *__o = (OBSTACK);					\
-   void *__obj = (OBJ);							\
-   if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit)  \
-     __o->next_free = __o->object_base = (char *)__obj;			\
-   else (obstack_free) (__o, __obj); })
-
-#else /* not __GNUC__ or not __STDC__ */
-
-# define obstack_object_size(h) \
- (unsigned) ((h)->next_free - (h)->object_base)
-
-# define obstack_room(h)		\
- (unsigned) ((h)->chunk_limit - (h)->next_free)
-
-# define obstack_empty_p(h) \
- ((h)->chunk->prev == 0 && (h)->next_free - (h)->chunk->contents == 0)
-
-/* Note that the call to _obstack_newchunk is enclosed in (..., 0)
-   so that we can avoid having void expressions
-   in the arms of the conditional expression.
-   Casting the third operand to void was tried before,
-   but some compilers won't accept it.  */
-
-# define obstack_make_room(h,length)					\
-( (h)->temp = (length),							\
-  (((h)->next_free + (h)->temp > (h)->chunk_limit)			\
-   ? (_obstack_newchunk ((h), (h)->temp), 0) : 0))
-
-# define obstack_grow(h,where,length)					\
-( (h)->temp = (length),							\
-  (((h)->next_free + (h)->temp > (h)->chunk_limit)			\
-   ? (_obstack_newchunk ((h), (h)->temp), 0) : 0),			\
-  _obstack_memcpy ((h)->next_free, (char *) (where), (h)->temp),	\
-  (h)->next_free += (h)->temp)
-
-# define obstack_grow0(h,where,length)					\
-( (h)->temp = (length),							\
-  (((h)->next_free + (h)->temp + 1 > (h)->chunk_limit)			\
-   ? (_obstack_newchunk ((h), (h)->temp + 1), 0) : 0),			\
-  _obstack_memcpy ((h)->next_free, (char *) (where), (h)->temp),	\
-  (h)->next_free += (h)->temp,						\
-  *((h)->next_free)++ = 0)
-
-# define obstack_1grow(h,datum)						\
-( (((h)->next_free + 1 > (h)->chunk_limit)				\
-   ? (_obstack_newchunk ((h), 1), 0) : 0),				\
-  (*((h)->next_free)++ = (datum)))
-
-# define obstack_ptr_grow(h,datum)					\
-( (((h)->next_free + sizeof (char *) > (h)->chunk_limit)		\
-   ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0),		\
-  (*((char **) (((h)->next_free+=sizeof(char *))-sizeof(char *))) = ((char *) datum)))
-
-# define obstack_int_grow(h,datum)					\
-( (((h)->next_free + sizeof (int) > (h)->chunk_limit)			\
-   ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0),			\
-  (*((int *) (((h)->next_free+=sizeof(int))-sizeof(int))) = ((int) datum)))
-
-# define obstack_ptr_grow_fast(h,aptr) (*((char **) (h)->next_free)++ = (char *) aptr)
-# define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint)
-
-# define obstack_blank(h,length)					\
-( (h)->temp = (length),							\
-  (((h)->chunk_limit - (h)->next_free < (h)->temp)			\
-   ? (_obstack_newchunk ((h), (h)->temp), 0) : 0),			\
-  ((h)->next_free += (h)->temp))
-
-# define obstack_alloc(h,length)					\
- (obstack_blank ((h), (length)), obstack_finish ((h)))
-
-# define obstack_copy(h,where,length)					\
- (obstack_grow ((h), (where), (length)), obstack_finish ((h)))
-
-# define obstack_copy0(h,where,length)					\
- (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
-
-# define obstack_finish(h)  						\
-( ((h)->next_free == (h)->object_base					\
-   ? (((h)->maybe_empty_object = 1), 0)					\
-   : 0),								\
-  (h)->temp = __PTR_TO_INT ((h)->object_base),				\
-  (h)->next_free							\
-    = __INT_TO_PTR ((__PTR_TO_INT ((h)->next_free)+(h)->alignment_mask)	\
-		    & ~ ((h)->alignment_mask)),				\
-  (((h)->next_free - (char *) (h)->chunk				\
-    > (h)->chunk_limit - (char *) (h)->chunk)				\
-   ? ((h)->next_free = (h)->chunk_limit) : 0),				\
-  (h)->object_base = (h)->next_free,					\
-  __INT_TO_PTR ((h)->temp))
-
-# if defined __STDC__ && __STDC__
-#  define obstack_free(h,obj)						\
-( (h)->temp = (char *) (obj) - (char *) (h)->chunk,			\
-  (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
-   ? (int) ((h)->next_free = (h)->object_base				\
-	    = (h)->temp + (char *) (h)->chunk)				\
-   : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0)))
-# else
-#  define obstack_free(h,obj)						\
-( (h)->temp = (char *) (obj) - (char *) (h)->chunk,			\
-  (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
-   ? (int) ((h)->next_free = (h)->object_base				\
-	    = (h)->temp + (char *) (h)->chunk)				\
-   : (_obstack_free ((h), (h)->temp + (char *) (h)->chunk), 0)))
-# endif
-
-#endif /* not __GNUC__ or not __STDC__ */
-
-#ifdef __cplusplus
-}	/* C++ */
-#endif
-
-#endif /* obstack.h */
diff --git a/misc/dpkg/patches/patch-ad b/misc/dpkg/patches/patch-ad
deleted file mode 100644
index 5f7053e99c7..00000000000
--- a/misc/dpkg/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/10/29 17:26:18 erh Exp $
-
---- lib/tarfn.c.orig	2004-10-29 16:55:01.000000000 +0000
-+++ lib/tarfn.c	2004-10-29 16:56:37.000000000 +0000
-@@ -58,7 +58,8 @@
- 	int	len;
- 	char *	str;
- 
--	len = strnlen(s, size);
-+	char *nul = memchr(s, 0, size);
-+	len = nul ? (nul - s) : size;
- 	str = malloc(len + 1);
- 	memcpy(str, s, len);
- 	str[len] = 0;
diff --git a/misc/dpkg/patches/patch-af b/misc/dpkg/patches/patch-af
deleted file mode 100644
index 2902c617c13..00000000000
--- a/misc/dpkg/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/12/02 09:38:51 rillig Exp $
-
---- src/main.h.orig	2006-06-19 03:22:03.000000000 +0200
-+++ src/main.h	2007-12-02 10:14:17.000000000 +0100
-@@ -22,6 +22,8 @@
- #ifndef MAIN_H
- #define MAIN_H
- 
-+#include <sys/stat.h>
-+
- struct fileinlist; /* these two are defined in filesdb.h */
- struct filenamenode;
- 
diff --git a/misc/dpkg/patches/patch-ag b/misc/dpkg/patches/patch-ag
deleted file mode 100644
index 5eb24ddd968..00000000000
--- a/misc/dpkg/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/12/02 09:38:51 rillig Exp $
-
---- lib/Makefile.in.orig	2007-12-02 10:05:42.000000000 +0100
-+++ lib/Makefile.in	2007-12-02 10:15:38.000000000 +0100
-@@ -75,7 +75,7 @@ am_libdpkg_a_OBJECTS = compat.$(OBJEXT) 
- 	md5.$(OBJEXT) mlib.$(OBJEXT) myopt.$(OBJEXT) \
- 	nfmalloc.$(OBJEXT) parse.$(OBJEXT) parsehelp.$(OBJEXT) \
- 	showcright.$(OBJEXT) showpkg.$(OBJEXT) tarfn.$(OBJEXT) \
--	utils.$(OBJEXT) varbuf.$(OBJEXT) vercmp.$(OBJEXT)
-+	utils.$(OBJEXT) varbuf.$(OBJEXT) vercmp.$(OBJEXT) obstack.$(OBJEXT)
- libdpkg_a_OBJECTS = $(am_libdpkg_a_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-@@ -249,6 +249,7 @@ libdpkg_a_SOURCES = \
- 	mlib.c \
- 	myopt.c myopt.h \
- 	nfmalloc.c \
-+	obstack.c \
- 	parse.c \
- 	parsehelp.c \
- 	parsedump.h \