10 files changed, 375 insertions, 404 deletions

diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 329562a46b3a..64ba3919bada 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	dpkg
-PORTVERSION=	1.14.31
+PORTVERSION=	1.15.8.12
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	dpkg_${PORTVERSION}
@@ -13,12 +13,13 @@ DISTNAME=	dpkg_${PORTVERSION}
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Debian package maintenance system
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	po4a:${PORTSDIR}/textproc/po4a
 RUN_DEPENDS=	gmd5sum:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch
 
-LICENSE=	GPLv2
-
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
@@ -33,208 +34,12 @@ SUB_FILES=	pkg-install pkg-deinstall
 SUB_LIST+=	DPKGDIR=${DPKGDIR}
 
 CONFIGURE_ARGS+=--with-admindir=${DPKGDIR} --libdir=${PREFIX}/libexec \
-		--program-transform-name="" --with-libintl-prefix=${LOCALBASE}
+		--program-transform-name="" --with-libintl-prefix=${LOCALBASE} \
+		--disable-compiler-warnings
 CONFIGURE_ENV+=	PERL_LIBDIR="${PREFIX}/${SITE_PERL_REL}"
 
 .if !defined(WITHOUT_NLS)
 MANLANG=	"" de fr hu ja pl sv
-.endif
-
-MAN1_EN=	822-date.1 \
-		dpkg-architecture.1 \
-		dpkg-buildpackage.1 \
-		dpkg-checkbuilddeps.1 \
-		dpkg-deb.1 \
-		dpkg-distaddfile.1 \
-		dpkg-genchanges.1 \
-		dpkg-gencontrol.1 \
-		dpkg-gensymbols.1 \
-		dpkg-name.1 \
-		dpkg-parsechangelog.1 \
-		dpkg-query.1 \
-		dpkg-scanpackages.1 \
-		dpkg-scansources.1 \
-		dpkg-shlibdeps.1 \
-		dpkg-source.1 \
-		dpkg-split.1 \
-		dpkg-trigger.1 \
-		dpkg.1 \
-		dselect.1
-MAN5_EN=	deb-control.5 \
-		deb-old.5 \
-		deb-override.5 \
-		deb-shlibs.5 \
-		deb-substvars.5 \
-		deb-symbols.5 \
-		deb-triggers.5 \
-		deb-version.5 \
-		deb.5 \
-		dpkg.cfg.5 \
-		dselect.cfg.5
-MAN8_EN=	cleanup-info.8 \
-		dpkg-divert.8 \
-		dpkg-statoverride.8 \
-		install-info.8 \
-		start-stop-daemon.8 \
-		update-alternatives.8
-
-.if !defined(WITHOUT_NLS)
-MAN1_DE=	822-date.1 \
-		dpkg-architecture.1 \
-		dpkg-buildpackage.1 \
-		dpkg-checkbuilddeps.1 \
-		dpkg-deb.1 \
-		dpkg-distaddfile.1 \
-		dpkg-genchanges.1 \
-		dpkg-gencontrol.1 \
-		dpkg-name.1 \
-		dpkg-parsechangelog.1 \
-		dpkg-query.1 \
-		dpkg-scanpackages.1 \
-		dpkg-scansources.1 \
-		dpkg-shlibdeps.1 \
-		dpkg-source.1 \
-		dpkg-split.1 \
-		dpkg-trigger.1 \
-		dpkg.1 \
-		dselect.1
-MAN5_DE=	deb-control.5 \
-		deb-old.5 \
-		deb-override.5 \
-		deb-shlibs.5 \
-		deb-substvars.5 \
-		deb-symbols.5 \
-		deb-triggers.5 \
-		deb-version.5 \
-		deb.5 \
-		dpkg.cfg.5 \
-		dselect.cfg.5
-MAN8_DE=	cleanup-info.8 \
-		dpkg-divert.8 \
-		dpkg-statoverride.8 \
-		install-info.8 \
-		start-stop-daemon.8 \
-		update-alternatives.8
-
-MAN1_FR=	822-date.1 \
-		dpkg-architecture.1 \
-		dpkg-buildpackage.1 \
-		dpkg-checkbuilddeps.1 \
-		dpkg-deb.1 \
-		dpkg-distaddfile.1 \
-		dpkg-genchanges.1 \
-		dpkg-gencontrol.1 \
-		dpkg-name.1 \
-		dpkg-parsechangelog.1 \
-		dpkg-query.1 \
-		dpkg-scanpackages.1 \
-		dpkg-scansources.1 \
-		dpkg-shlibdeps.1 \
-		dpkg-source.1 \
-		dpkg-split.1 \
-		dpkg-trigger.1 \
-		dpkg.1 \
-		dselect.1
-MAN5_FR=	deb-control.5 \
-		deb-old.5 \
-		deb-override.5 \
-		deb-shlibs.5 \
-		deb-substvars.5 \
-		deb-symbols.5 \
-		deb-triggers.5 \
-		deb-version.5 \
-		deb.5 \
-		dpkg.cfg.5 \
-		dselect.cfg.5
-MAN8_FR=	cleanup-info.8 \
-		dpkg-divert.8 \
-		dpkg-statoverride.8 \
-		install-info.8 \
-		start-stop-daemon.8 \
-		update-alternatives.8
-
-MAN5_HU=	dpkg.cfg.5 \
-		dselect.cfg.5
-
-MAN1_JA=	dselect.1
-MAN5_JA=	deb-old.5 \
-		deb.5
-MAN8_JA=	update-alternatives.8
-
-MAN1_PL=	822-date.1 \
-		dpkg-architecture.1 \
-		dpkg-buildpackage.1 \
-		dpkg-checkbuilddeps.1 \
-		dpkg-deb.1 \
-		dpkg-distaddfile.1 \
-		dpkg-genchanges.1 \
-		dpkg-gencontrol.1 \
-		dpkg-name.1 \
-		dpkg-parsechangelog.1 \
-		dpkg-query.1 \
-		dpkg-scanpackages.1 \
-		dpkg-scansources.1 \
-		dpkg-shlibdeps.1 \
-		dpkg-source.1 \
-		dpkg-split.1 \
-		dpkg-trigger.1 \
-		dpkg.1 \
-		dselect.1
-MAN5_PL=	deb-control.5 \
-		deb-old.5 \
-		deb-override.5 \
-		deb-shlibs.5 \
-		deb-substvars.5 \
-		deb-symbols.5 \
-		deb-triggers.5 \
-		deb-version.5 \
-		deb.5 \
-		dpkg.cfg.5 \
-		dselect.cfg.5
-MAN8_PL=	cleanup-info.8 \
-		dpkg-divert.8 \
-		dpkg-statoverride.8 \
-		install-info.8 \
-		start-stop-daemon.8 \
-		update-alternatives.8
-
-MAN1_SV=	822-date.1 \
-		dpkg-architecture.1 \
-		dpkg-buildpackage.1 \
-		dpkg-checkbuilddeps.1 \
-		dpkg-deb.1 \
-		dpkg-distaddfile.1 \
-		dpkg-genchanges.1 \
-		dpkg-gencontrol.1 \
-		dpkg-name.1 \
-		dpkg-parsechangelog.1 \
-		dpkg-query.1 \
-		dpkg-scanpackages.1 \
-		dpkg-scansources.1 \
-		dpkg-shlibdeps.1 \
-		dpkg-source.1 \
-		dpkg-split.1 \
-		dpkg-trigger.1 \
-		dpkg.1 \
-		dselect.1
-MAN5_SV=	deb-control.5 \
-		deb-old.5 \
-		deb-override.5 \
-		deb-shlibs.5 \
-		deb-substvars.5 \
-		deb-symbols.5 \
-		deb-triggers.5 \
-		deb-version.5 \
-		deb.5 \
-		dpkg.cfg.5 \
-		dselect.cfg.5
-MAN8_SV=	cleanup-info.8 \
-		dpkg-divert.8 \
-		dpkg-statoverride.8 \
-		install-info.8 \
-		start-stop-daemon.8 \
-		update-alternatives.8
-
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
@@ -242,12 +47,10 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.include "Makefile.man"
+
 post-patch:
-	${REINPLACE_CMD} -e 's|ncursesw/||g' \
-		${WRKSRC}/dselect/Makefile.in \
-		${WRKSRC}/dselect/dselect.h \
-		${WRKSRC}/dselect/main.cc \
-		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|ncursesw/||g' ${WRKSRC}/dselect/main.cc
 
 post-install:
 	${MV} ${PREFIX}/sbin/install-info ${PREFIX}/sbin/dpkg-install-info
diff --git a/archivers/dpkg/Makefile.man b/archivers/dpkg/Makefile.man
new file mode 100644
index 000000000000..72aa5ca86f3a
--- /dev/null
+++ b/archivers/dpkg/Makefile.man
@@ -0,0 +1,226 @@
+# $FreeBSD$
+
+MAN1_EN=	dpkg-architecture.1 \
+		dpkg-buildflags.1 \
+		dpkg-buildpackage.1 \
+		dpkg-checkbuilddeps.1 \
+		dpkg-deb.1 \
+		dpkg-distaddfile.1 \
+		dpkg-genchanges.1 \
+		dpkg-gencontrol.1 \
+		dpkg-gensymbols.1 \
+		dpkg-maintscript-helper.1 \
+		dpkg-mergechangelogs.1 \
+		dpkg-name.1 \
+		dpkg-parsechangelog.1 \
+		dpkg-query.1 \
+		dpkg-scanpackages.1 \
+		dpkg-scansources.1 \
+		dpkg-shlibdeps.1 \
+		dpkg-source.1 \
+		dpkg-split.1 \
+		dpkg-trigger.1 \
+		dpkg-vendor.1 \
+		dpkg.1 \
+		dselect.1
+
+MAN3_EN=	Dpkg::BuildFlags.3 \
+		Dpkg::BuildOptions.3 \
+		Dpkg::Changelog.3 \
+		Dpkg::Changelog::Debian.3 \
+		Dpkg::Changelog::Entry.3 \
+		Dpkg::Changelog::Entry::Debian.3 \
+		Dpkg::Changelog::Parse.3 \
+		Dpkg::Checksums.3 \
+		Dpkg::Compression.3 \
+		Dpkg::Compression::FileHandle.3 \
+		Dpkg::Compression::Process.3 \
+		Dpkg::Conf.3 \
+		Dpkg::Control.3 \
+		Dpkg::Control::Changelog.3 \
+		Dpkg::Control::Fields.3 \
+		Dpkg::Control::Hash.3 \
+		Dpkg::Control::Info.3 \
+		Dpkg::Control::Types.3 \
+		Dpkg::Deps.3 \
+		Dpkg::IPC.3 \
+		Dpkg::Index.3 \
+		Dpkg::Interface::Storable.3 \
+		Dpkg::Path.3 \
+		Dpkg::Substvars.3 \
+		Dpkg::Vendor.3 \
+		Dpkg::Vendor::Debian.3 \
+		Dpkg::Vendor::Default.3 \
+		Dpkg::Vendor::Ubuntu.3 \
+		Dpkg::Version.3
+
+MAN5_EN=	deb-control.5 \
+		deb-extra-override.5 \
+		deb-old.5 \
+		deb-override.5 \
+		deb-shlibs.5 \
+		deb-split.5 \
+		deb-substvars.5 \
+		deb-symbols.5 \
+		deb-triggers.5 \
+		deb-version.5 \
+		deb.5 \
+		dpkg.cfg.5 \
+		dselect.cfg.5
+
+MAN8_EN=	dpkg-divert.8 \
+		dpkg-statoverride.8 \
+		start-stop-daemon.8 \
+		update-alternatives.8
+
+.if !defined(WITHOUT_NLS)
+MAN1_DE=	dpkg-architecture.1 \
+		dpkg-buildpackage.1 \
+		dpkg-checkbuilddeps.1 \
+		dpkg-deb.1 \
+		dpkg-distaddfile.1 \
+		dpkg-genchanges.1 \
+		dpkg-gencontrol.1 \
+		dpkg-name.1 \
+		dpkg-parsechangelog.1 \
+		dpkg-query.1 \
+		dpkg-scanpackages.1 \
+		dpkg-scansources.1 \
+		dpkg-shlibdeps.1 \
+		dpkg-source.1 \
+		dpkg-split.1 \
+		dpkg-trigger.1 \
+		dpkg.1 \
+		dselect.1
+
+MAN5_DE=	deb-control.5 \
+		deb-old.5 \
+		deb-override.5 \
+		deb-shlibs.5 \
+		deb-substvars.5 \
+		deb-symbols.5 \
+		deb-triggers.5 \
+		deb-version.5 \
+		deb.5 \
+		dpkg.cfg.5 \
+		dselect.cfg.5
+
+MAN8_DE=	dpkg-divert.8 \
+		dpkg-statoverride.8 \
+		start-stop-daemon.8 \
+		update-alternatives.8
+
+MAN1_FR=	dpkg-architecture.1 \
+		dpkg-buildpackage.1 \
+		dpkg-checkbuilddeps.1 \
+		dpkg-deb.1 \
+		dpkg-distaddfile.1 \
+		dpkg-genchanges.1 \
+		dpkg-gencontrol.1 \
+		dpkg-name.1 \
+		dpkg-parsechangelog.1 \
+		dpkg-query.1 \
+		dpkg-scanpackages.1 \
+		dpkg-scansources.1 \
+		dpkg-shlibdeps.1 \
+		dpkg-source.1 \
+		dpkg-split.1 \
+		dpkg-trigger.1 \
+		dpkg.1 \
+		dselect.1
+
+MAN5_FR=	deb-control.5 \
+		deb-old.5 \
+		deb-override.5 \
+		deb-shlibs.5 \
+		deb-substvars.5 \
+		deb-symbols.5 \
+		deb-triggers.5 \
+		deb-version.5 \
+		deb.5 \
+		dpkg.cfg.5 \
+		dselect.cfg.5
+
+MAN8_FR=	dpkg-divert.8 \
+		dpkg-statoverride.8 \
+		start-stop-daemon.8 \
+		update-alternatives.8
+
+MAN5_HU=	dpkg.cfg.5 \
+		dselect.cfg.5
+
+MAN1_JA=	dselect.1
+
+MAN5_JA=	deb-old.5
+
+MAN1_PL=	dpkg-architecture.1 \
+		dpkg-buildpackage.1 \
+		dpkg-checkbuilddeps.1 \
+		dpkg-deb.1 \
+		dpkg-distaddfile.1 \
+		dpkg-genchanges.1 \
+		dpkg-gencontrol.1 \
+		dpkg-name.1 \
+		dpkg-parsechangelog.1 \
+		dpkg-query.1 \
+		dpkg-scanpackages.1 \
+		dpkg-scansources.1 \
+		dpkg-shlibdeps.1 \
+		dpkg-split.1 \
+		dpkg-trigger.1 \
+		dpkg.1 \
+		dselect.1
+
+MAN5_PL=	deb-control.5 \
+		deb-old.5 \
+		deb-override.5 \
+		deb-shlibs.5 \
+		deb-substvars.5 \
+		deb-symbols.5 \
+		deb-triggers.5 \
+		deb-version.5 \
+		deb.5 \
+		dpkg.cfg.5 \
+		dselect.cfg.5
+
+MAN8_PL=	dpkg-divert.8 \
+		dpkg-statoverride.8 \
+		start-stop-daemon.8 \
+		update-alternatives.8
+
+MAN1_SV=	dpkg-architecture.1 \
+		dpkg-buildpackage.1 \
+		dpkg-checkbuilddeps.1 \
+		dpkg-deb.1 \
+		dpkg-distaddfile.1 \
+		dpkg-genchanges.1 \
+		dpkg-gencontrol.1 \
+		dpkg-name.1 \
+		dpkg-parsechangelog.1 \
+		dpkg-query.1 \
+		dpkg-scanpackages.1 \
+		dpkg-scansources.1 \
+		dpkg-shlibdeps.1 \
+		dpkg-source.1 \
+		dpkg-split.1 \
+		dpkg-trigger.1 \
+		dpkg.1 \
+		dselect.1
+
+MAN5_SV=	deb-control.5 \
+		deb-old.5 \
+		deb-override.5 \
+		deb-shlibs.5 \
+		deb-substvars.5 \
+		deb-symbols.5 \
+		deb-triggers.5 \
+		deb-version.5 \
+		deb.5 \
+		dpkg.cfg.5 \
+		dselect.cfg.5
+
+MAN8_SV=	dpkg-divert.8 \
+		dpkg-statoverride.8 \
+		start-stop-daemon.8 \
+		update-alternatives.8
+.endif
diff --git a/archivers/dpkg/distinfo b/archivers/dpkg/distinfo
index 83d992a78a8a..1c2571f77dcf 100644
--- a/archivers/dpkg/distinfo
+++ b/archivers/dpkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dpkg_1.14.31.tar.gz) = 1dac77bb76ef453a210bbe436ead8f26301a02f17aa0b39f11aadb94e4e6a221
-SIZE (dpkg_1.14.31.tar.gz) = 6853665
+SHA256 (dpkg_1.15.8.12.tar.bz2) = 55f296929c35e1105e0d83bdcfe14f699f8acf30c30060d88869379706af482a
+SIZE (dpkg_1.15.8.12.tar.bz2) = 5257258
diff --git a/archivers/dpkg/files/patch-configure b/archivers/dpkg/files/patch-configure
index ce39872f541c..b25b9919e76b 100644
--- a/archivers/dpkg/files/patch-configure
+++ b/archivers/dpkg/files/patch-configure
@@ -1,11 +1,12 @@
---- configure.orig	2009-11-19 19:45:27.000000000 +0800
-+++ configure	2009-11-19 19:45:35.000000000 +0800
-@@ -7172,8 +7172,6 @@
- echo "${ECHO_T}no" >&6; }
+--- configure.orig	2012-03-16 20:22:59.000000000 +0100
++++ configure	2012-03-16 20:23:12.000000000 +0100
+@@ -8180,9 +8180,6 @@
+ $as_echo "no" >&6; }
  fi
  
--PERL_LIBDIR=`$PERL -MConfig -e 'my $r=$Config{vendorlibexp};$r=~s/$Config{vendorprefixexp}/\\$(prefix)/; print $r'`
--
- # Checks for operating system services and capabilities.
- # Check whether --enable-largefile was given.
- if test "${enable_largefile+set}" = set; then
+-PERL_LIBDIR=$($PERL -MConfig -e 'my $r = $Config{vendorlibexp};
+-                                 $r =~ s/$Config{vendorprefixexp}/\$(prefix)/;
+-                                 print $r')
+ 
+ for ac_prog in pod2man
+ do
diff --git a/archivers/dpkg/files/patch-dpkg-deb_Makefile.in b/archivers/dpkg/files/patch-dpkg-deb_Makefile.in
deleted file mode 100644
index c51503ef1646..000000000000
--- a/archivers/dpkg/files/patch-dpkg-deb_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- dpkg-deb/Makefile.in.orig	2009-11-12 06:31:17.000000000 +0800
-+++ dpkg-deb/Makefile.in	2009-11-12 06:31:41.000000000 +0800
-@@ -58,9 +58,7 @@
- 	main.$(OBJEXT)
- dpkg_deb_OBJECTS = $(am_dpkg_deb_OBJECTS)
- am__DEPENDENCIES_1 =
--dpkg_deb_DEPENDENCIES = ../libcompat/libcompat.a $(am__DEPENDENCIES_1) \
--	../lib/libdpkg.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
-+dpkg_deb_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a ../libcompat/libcompat.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
-@@ -212,9 +210,7 @@
- 	info.c \
- 	main.c
- 
--dpkg_deb_LDADD = \
--	../libcompat/libcompat.a \
--	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
-+dpkg_deb_LDADD = $(LIBINTL) ../lib/libdpkg.a ../libcompat/libcompat.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
- 
- all: all-am
- 
diff --git a/archivers/dpkg/files/patch-dpkg-split_Makefile.in b/archivers/dpkg/files/patch-dpkg-split_Makefile.in
deleted file mode 100644
index 3f39caabe412..000000000000
--- a/archivers/dpkg/files/patch-dpkg-split_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- dpkg-split/Makefile.in.orig	2009-11-12 06:32:28.000000000 +0800
-+++ dpkg-split/Makefile.in	2009-11-12 06:32:44.000000000 +0800
-@@ -59,8 +59,7 @@
- 	queue.$(OBJEXT) split.$(OBJEXT)
- dpkg_split_OBJECTS = $(am_dpkg_split_OBJECTS)
- am__DEPENDENCIES_1 =
--dpkg_split_DEPENDENCIES = ../libcompat/libcompat.a \
--	$(am__DEPENDENCIES_1) ../lib/libdpkg.a
-+dpkg_split_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a ../libcompat/libcompat.a
- pkglibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(pkglib_SCRIPTS)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-@@ -216,10 +215,7 @@
- 	queue.c \
- 	split.c
- 
--dpkg_split_LDADD = \
--	../libcompat/libcompat.a \
--	$(LIBINTL) \
--	../lib/libdpkg.a
-+dpkg_split_LDADD = $(LIBINTL) ../lib/libdpkg.a ../libcompat/libcompat.a
- 
- pkglib_SCRIPTS = mksplit
- EXTRA_DIST = mksplit.pl
diff --git a/archivers/dpkg/files/patch-dselect_Makefile.in b/archivers/dpkg/files/patch-dselect_Makefile.in
index 4271f973af18..b6a429b94787 100644
--- a/archivers/dpkg/files/patch-dselect_Makefile.in
+++ b/archivers/dpkg/files/patch-dselect_Makefile.in
@@ -1,25 +1,25 @@
---- dselect/Makefile.in.orig	2009-11-12 06:30:16.000000000 +0800
-+++ dselect/Makefile.in	2009-11-12 06:30:34.000000000 +0800
-@@ -63,8 +63,7 @@
+--- dselect/Makefile.in.orig	2011-11-10 07:23:41.000000000 +0100
++++ dselect/Makefile.in	2012-03-16 22:18:30.000000000 +0100
+@@ -67,8 +67,7 @@
  	pkgsublist.$(OBJEXT) pkgtop.$(OBJEXT)
  dselect_OBJECTS = $(am_dselect_OBJECTS)
  am__DEPENDENCIES_1 =
--dselect_DEPENDENCIES = ../libcompat/libcompat.a $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1) ../lib/libdpkg.a
-+dselect_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ../lib/libdpkg.a ../libcompat/libcompat.a
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+-dselect_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/dpkg/libdpkg.a \
+-	../lib/compat/libcompat.a $(am__DEPENDENCIES_1)
++dselect_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ../lib/dpkg/libdpkg.a ../lib/compat/libcompat.a
+ DEFAULT_INCLUDES = 
+ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
  am__depfiles_maybe = depfiles
-@@ -248,11 +247,7 @@
+@@ -320,11 +319,7 @@
  	pkgsublist.cc \
  	pkgtop.cc
  
 -dselect_LDADD = \
--	../libcompat/libcompat.a \
--	$(LIBINTL) \
 -	$(CURSES_LIBS) \
--	../lib/libdpkg.a
-+dselect_LDADD = $(LIBINTL) $(CURSES_LIBS) ../lib/libdpkg.a ../libcompat/libcompat.a
+-	../lib/dpkg/libdpkg.a \
+-	../lib/compat/libcompat.a \
+-	$(LIBINTL)
++dselect_LDADD = $(LIBINTL) $(CURSES_LIBS) -ltinfow ../lib/dpkg/libdpkg.a ../lib/compat/libcompat.a
  
  EXTRA_DIST = keyoverride mkcurkeys.pl
  CLEANFILES = curkeys.h
diff --git a/archivers/dpkg/files/patch-src_Makefile.in b/archivers/dpkg/files/patch-src_Makefile.in
deleted file mode 100644
index 29478514c902..000000000000
--- a/archivers/dpkg/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/Makefile.in.orig	2009-11-12 06:25:40.000000000 +0800
-+++ src/Makefile.in	2009-11-12 06:26:38.000000000 +0800
-@@ -62,18 +62,14 @@
- 	update.$(OBJEXT)
- dpkg_OBJECTS = $(am_dpkg_OBJECTS)
- am__DEPENDENCIES_1 =
--dpkg_DEPENDENCIES = ../libcompat/libcompat.a $(am__DEPENDENCIES_1) \
--	../lib/libdpkg.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
-+dpkg_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a ../libcompat/libcompat.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_dpkg_query_OBJECTS = errors.$(OBJEXT) filesdb.$(OBJEXT) \
- 	query.$(OBJEXT)
- dpkg_query_OBJECTS = $(am_dpkg_query_OBJECTS)
--dpkg_query_DEPENDENCIES = ../libcompat/libcompat.a \
--	$(am__DEPENDENCIES_1) ../lib/libdpkg.a
-+dpkg_query_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a ../libcompat/libcompat.a
- am_dpkg_trigger_OBJECTS = trigcmd.$(OBJEXT)
- dpkg_trigger_OBJECTS = $(am_dpkg_trigger_OBJECTS)
--dpkg_trigger_DEPENDENCIES = ../libcompat/libcompat.a \
--	$(am__DEPENDENCIES_1) ../lib/libdpkg.a
-+dpkg_trigger_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a ../libcompat/libcompat.a
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
-@@ -238,27 +234,19 @@
- 	trigproc.c \
- 	update.c
- 
--dpkg_LDADD = \
--	../libcompat/libcompat.a \
--	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
-+dpkg_LDADD = $(LIBINTL) ../lib/libdpkg.a ../libcompat/libcompat.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
- 
- dpkg_query_SOURCES = \
- 	errors.c \
- 	filesdb.c filesdb.h \
- 	query.c
- 
--dpkg_query_LDADD = \
--	../libcompat/libcompat.a \
--	$(LIBINTL) \
--	../lib/libdpkg.a
-+dpkg_query_LDADD = $(LIBINTL) ../lib/libdpkg.a ../libcompat/libcompat.a
- 
- dpkg_trigger_SOURCES = \
- 	trigcmd.c
- 
--dpkg_trigger_LDADD = \
--	../libcompat/libcompat.a \
--	$(LIBINTL) \
--	../lib/libdpkg.a
-+dpkg_trigger_LDADD = $(LIBINTL) ../lib/libdpkg.a ../libcompat/libcompat.a
- 
- all: all-am
- 
diff --git a/archivers/dpkg/files/patch-utils_start-stop-daemon.c b/archivers/dpkg/files/patch-utils_start-stop-daemon.c
index 5843fefd8fab..c67de394d63e 100644
--- a/archivers/dpkg/files/patch-utils_start-stop-daemon.c
+++ b/archivers/dpkg/files/patch-utils_start-stop-daemon.c
@@ -1,14 +1,23 @@
---- utils/start-stop-daemon.c.orig	2009-02-01 14:19:02.000000000 +0800
-+++ utils/start-stop-daemon.c	2009-11-12 07:23:18.000000000 +0800
-@@ -50,6 +50,7 @@
+--- utils/start-stop-daemon.c.orig	2011-11-10 07:17:51.000000000 +0100
++++ utils/start-stop-daemon.c	2012-03-16 20:31:14.000000000 +0100
+@@ -59,6 +59,7 @@
  #endif
  
  #if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
 +#define _WANT_UCRED
  #include <sys/param.h>
  #include <sys/proc.h>
- #include <sys/stat.h>
-@@ -941,8 +942,8 @@
+ 
+@@ -989,7 +990,7 @@
+ 	kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries);
+ 	if (kp == NULL)
+ 		errx(1, "%s", kvm_geterr(kd));
+-	pidexec = (&kp->kp_proc)->p_comm;
++	pidexec = kp->ki_paddr->p_comm;
+ 	if (strlen(name) != strlen(pidexec))
+ 		return false;
+ 	return (strcmp(name, pidexec) == 0) ? 1 : 0;
+@@ -1043,8 +1044,8 @@
  	kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries);
  	if (kp == NULL)
  		errx(1, "%s", kvm_geterr(kd));
@@ -18,13 +27,4 @@
 +		kvm_read(kd, (u_long)&(kp->ki_paddr->p_ucred->cr_ruid),
  		         &proc_uid, sizeof(uid_t));
  	else
- 		return 0;
-@@ -963,7 +964,7 @@
- 	kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries);
- 	if (kp == NULL)
- 		errx(1, "%s", kvm_geterr(kd));
--	pidexec = (&kp->kp_proc)->p_comm;
-+	pidexec = kp->ki_paddr->p_comm;
- 	if (strlen(name) != strlen(pidexec))
- 		return 0;
- 	return (strcmp(name, pidexec) == 0) ? 1 : 0;
+ 		return false;
diff --git a/archivers/dpkg/pkg-plist b/archivers/dpkg/pkg-plist
index c77847510a9e..7e3ccb8f5681 100644
--- a/archivers/dpkg/pkg-plist
+++ b/archivers/dpkg/pkg-plist
@@ -1,28 +1,41 @@
 %%DATADIR%%/cputable
 %%DATADIR%%/ostable
 %%DATADIR%%/triplettable
+%%SITE_PERL%%/Debian/Dselect/Ftp.pm
 %%SITE_PERL%%/Dpkg.pm
 %%SITE_PERL%%/Dpkg/Arch.pm
+%%SITE_PERL%%/Dpkg/BuildFlags.pm
 %%SITE_PERL%%/Dpkg/BuildOptions.pm
-%%SITE_PERL%%/Dpkg/Cdata.pm
 %%SITE_PERL%%/Dpkg/Changelog.pm
 %%SITE_PERL%%/Dpkg/Changelog/Debian.pm
+%%SITE_PERL%%/Dpkg/Changelog/Entry/Debian.pm
+%%SITE_PERL%%/Dpkg/Changelog/Entry.pm
+%%SITE_PERL%%/Dpkg/Changelog/Parse.pm
 %%SITE_PERL%%/Dpkg/Checksums.pm
 %%SITE_PERL%%/Dpkg/Compression.pm
+%%SITE_PERL%%/Dpkg/Compression/FileHandle.pm
+%%SITE_PERL%%/Dpkg/Compression/Process.pm
+%%SITE_PERL%%/Dpkg/Conf.pm
 %%SITE_PERL%%/Dpkg/Control.pm
+%%SITE_PERL%%/Dpkg/Control/Changelog.pm
+%%SITE_PERL%%/Dpkg/Control/Fields.pm
+%%SITE_PERL%%/Dpkg/Control/Hash.pm
+%%SITE_PERL%%/Dpkg/Control/Info.pm
+%%SITE_PERL%%/Dpkg/Control/Types.pm
 %%SITE_PERL%%/Dpkg/Deps.pm
 %%SITE_PERL%%/Dpkg/ErrorHandling.pm
 %%SITE_PERL%%/Dpkg/Exit.pm
-%%SITE_PERL%%/Dpkg/Fields.pm
 %%SITE_PERL%%/Dpkg/Gettext.pm
 %%SITE_PERL%%/Dpkg/IPC.pm
+%%SITE_PERL%%/Dpkg/Index.pm
+%%SITE_PERL%%/Dpkg/Interface/Storable.pm
 %%SITE_PERL%%/Dpkg/Path.pm
 %%SITE_PERL%%/Dpkg/Shlibs.pm
+%%SITE_PERL%%/Dpkg/Shlibs/Cppfilt.pm
 %%SITE_PERL%%/Dpkg/Shlibs/Objdump.pm
+%%SITE_PERL%%/Dpkg/Shlibs/Symbol.pm
 %%SITE_PERL%%/Dpkg/Shlibs/SymbolFile.pm
 %%SITE_PERL%%/Dpkg/Source/Archive.pm
-%%SITE_PERL%%/Dpkg/Source/CompressedFile.pm
-%%SITE_PERL%%/Dpkg/Source/Compressor.pm
 %%SITE_PERL%%/Dpkg/Source/Functions.pm
 %%SITE_PERL%%/Dpkg/Source/Package.pm
 %%SITE_PERL%%/Dpkg/Source/Package/V1.pm
@@ -35,17 +48,24 @@
 %%SITE_PERL%%/Dpkg/Source/Patch.pm
 %%SITE_PERL%%/Dpkg/Substvars.pm
 %%SITE_PERL%%/Dpkg/Vars.pm
+%%SITE_PERL%%/Dpkg/Vendor.pm
+%%SITE_PERL%%/Dpkg/Vendor/Debian.pm
+%%SITE_PERL%%/Dpkg/Vendor/Default.pm
+%%SITE_PERL%%/Dpkg/Vendor/Ubuntu.pm
 %%SITE_PERL%%/Dpkg/Version.pm
-bin/822-date
 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
@@ -54,10 +74,37 @@ bin/dpkg-scansources
 bin/dpkg-shlibdeps
 bin/dpkg-source
 bin/dpkg-split
+bin/dpkg-statoverride
+bin/dpkg-vendor
 bin/dpkg-trigger
 bin/dselect
+bin/update-alternatives
 etc/alternatives/README
-etc/dpkg/origins/debian
+include/dpkg/ar.h
+include/dpkg/buffer.h
+include/dpkg/command.h
+include/dpkg/compress.h
+include/dpkg/dir.h
+include/dpkg/dpkg.h
+include/dpkg/dpkg-db.h
+include/dpkg/file.h
+include/dpkg/macros.h
+include/dpkg/myopt.h
+include/dpkg/parsedump.h
+include/dpkg/path.h
+include/dpkg/pkg.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/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
 libexec/dpkg/methods/disk/desc.cdrom
 libexec/dpkg/methods/disk/desc.harddisk
 libexec/dpkg/methods/disk/desc.mounted
@@ -71,8 +118,22 @@ libexec/dpkg/methods/floppy/install
 libexec/dpkg/methods/floppy/names
 libexec/dpkg/methods/floppy/setup
 libexec/dpkg/methods/floppy/update
-libexec/dpkg/mksplit
+libexec/dpkg/methods/ftp/names
+libexec/dpkg/methods/ftp/README.mirrors.txt
+libexec/dpkg/methods/ftp/desc.ftp
+libexec/dpkg/methods/ftp/install
+libexec/dpkg/methods/ftp/setup
+libexec/dpkg/methods/ftp/update
+libexec/dpkg/methods/multicd/desc.multi_cd
+libexec/dpkg/methods/multicd/desc.multi_mount
+libexec/dpkg/methods/multicd/desc.multi_nfs
+libexec/dpkg/methods/multicd/install
+libexec/dpkg/methods/multicd/names
+libexec/dpkg/methods/multicd/setup
+libexec/dpkg/methods/multicd/update
 libexec/dpkg/parsechangelog/debian
+libexec/libdpkg.a
+libexec/pkgconfig/libdpkg.pc
 %%NLS%%@dirrmtry man/sv/man8
 %%NLS%%@dirrmtry man/sv/man5
 %%NLS%%@dirrmtry man/sv/man1
@@ -105,12 +166,9 @@ libexec/dpkg/parsechangelog/debian
 %%NLS%%@dirrmtry man/de
 %%NLS%%@dirrmtry man/hu/man1
 %%NLS%%@dirrmtry man/hu
-sbin/cleanup-info
-sbin/dpkg-divert
 sbin/dpkg-install-info
-sbin/dpkg-statoverride
 sbin/start-stop-daemon
-sbin/update-alternatives
+%%NLS%%share/locale/ast/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/dpkg-dev.mo
@@ -126,7 +184,9 @@ sbin/update-alternatives
 %%NLS%%share/locale/dz/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/el/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/el/LC_MESSAGES/dselect.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/es/LC_MESSAGES/dpkg.mo
+%%NLS%%share/locale/es/LC_MESSAGES/dpkg-dev.mo
 %%NLS%%share/locale/es/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/et/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/et/LC_MESSAGES/dselect.mo
@@ -193,85 +253,69 @@ sbin/update-alternatives
 %%NLS%%@dirrmtry share/locale/vi
 %%NLS%%@dirrmtry share/locale/tl/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/tl
-%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv
 %%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru
 %%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSA
 %%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/pt
 %%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/pl
 %%NLS%%@dirrmtry share/locale/nn/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/nn
-%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl
-%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nb
 %%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/mr
-%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lt
 %%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ku
 %%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ko
 %%NLS%%@dirrmtry share/locale/km/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/km
-%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja
-%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it
-%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id
-%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hu
 %%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eu
-%%NLS%%@dirrmtry share/locale/et/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/et
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es
 %%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/el
 %%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/dz
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
-%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/da
 %%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/cs
 %%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ca
-@dirrmtry libexec/dpkg/parsechangelog
-@dirrmtry libexec/dpkg/methods/floppy
-@dirrmtry libexec/dpkg/methods/disk
-@dirrmtry libexec/dpkg/methods
-@dirrmtry libexec/dpkg
-@dirrmtry etc/dpkg/origins
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+@dirrm libexec/pkgconfig
+@dirrm libexec/dpkg/parsechangelog
+@dirrm libexec/dpkg/methods/multicd
+@dirrm libexec/dpkg/methods/ftp
+@dirrm libexec/dpkg/methods/floppy
+@dirrm libexec/dpkg/methods/disk
+@dirrm libexec/dpkg/methods
+@dirrm libexec/dpkg
+@dirrm include/dpkg
+@dirrmtry etc/dpkg/dselect.cfg.d
+@dirrmtry etc/dpkg/dpkg.cfg.d
 @dirrmtry etc/dpkg
 @dirrmtry etc/alternatives
-@dirrmtry %%SITE_PERL%%/Dpkg/Source/Package/V3
-@dirrmtry %%SITE_PERL%%/Dpkg/Source/Package
-@dirrmtry %%SITE_PERL%%/Dpkg/Source
-@dirrmtry %%SITE_PERL%%/Dpkg/Shlibs
-@dirrmtry %%SITE_PERL%%/Dpkg/Changelog
-@dirrmtry %%SITE_PERL%%/Dpkg
-@dirrmtry %%DATADIR%%/origins
-@dirrmtry %%DATADIR%%
+@dirrm %%SITE_PERL%%/Dpkg/Vendor
+@dirrm %%SITE_PERL%%/Dpkg/Source/Package/V3
+@dirrm %%SITE_PERL%%/Dpkg/Source/Package
+@dirrm %%SITE_PERL%%/Dpkg/Source
+@dirrm %%SITE_PERL%%/Dpkg/Shlibs
+@dirrm %%SITE_PERL%%/Dpkg/Interface
+@dirrm %%SITE_PERL%%/Dpkg/Control
+@dirrm %%SITE_PERL%%/Dpkg/Compression
+@dirrm %%SITE_PERL%%/Dpkg/Changelog/Entry
+@dirrm %%SITE_PERL%%/Dpkg/Changelog
+@dirrm %%SITE_PERL%%/Dpkg
+@dirrm %%SITE_PERL%%/Debian/Dselect
+@dirrm %%SITE_PERL%%/Debian
+@dirrm %%DATADIR%%
 @cwd /
 @dirrmtry %%DPKGDIR%%/updates
 @dirrmtry %%DPKGDIR%%/parts
+@dirrmtry %%DPKGDIR%%/methods/multicd
 @dirrmtry %%DPKGDIR%%/methods/mnt
+@dirrmtry %%DPKGDIR%%/methods/ftp
 @dirrmtry %%DPKGDIR%%/methods/floppy
 @dirrmtry %%DPKGDIR%%/methods/disk
 @dirrmtry %%DPKGDIR%%/methods