26 files changed, 506 insertions, 547 deletions

diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 5b3480f23b07..d62472c9cd50 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	dpkg
-PORTVERSION=	1.13.25
-PORTREVISION=	2
+PORTVERSION=	1.14.25
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	dpkg_${PORTVERSION}
@@ -32,56 +31,203 @@ SUB_LIST+=	DPKGDIR=${DPKGDIR}
 
 CONFIGURE_ARGS+=--with-admindir=${DPKGDIR} --libdir=${PREFIX}/libexec \
 		--program-transform-name="" --with-libintl-prefix=${LOCALBASE}
-
-MANLANG=	"" de fr hu ja pl ru sv
-
-MAN1_DE=	822-date.1 dpkg-architecture.1 dpkg-checkbuilddeps.1 \
-		dpkg-name.1 dpkg-scanpackages.1 dpkg-scansources.1 dpkg.1
-MAN5_DE=	deb-control.5 deb-old.5 deb.5 dpkg.cfg.5 dselect.cfg.5
-MAN8_DE=	cleanup-info.8 dpkg-divert.8 dpkg-statoverride.8 \
-		start-stop-daemon.8 update-alternatives.8
-
-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-name.1 \
-		dpkg-parsechangelog.1 dpkg-scanpackages.1 dpkg-scansources.1 \
-		dpkg-shlibdeps.1 dpkg-source.1 dpkg.1 dpkg-query.1 \
-		dpkg-split.1 dselect.1
-MAN5_EN=	deb-control.5 deb-old.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
-
-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.1
-MAN5_FR=	deb-control.5 deb.5 dpkg.cfg.5
-MAN8_FR=	cleanup-info.8 dpkg-divert.8 dpkg-statoverride.8 \
-		install-info.8 start-stop-daemon.8 update-alternatives.8
-
-MAN1_HU=	dpkg-deb.1
-MAN5_HU=	deb-control.5 dpkg.cfg.5 dselect.cfg.5
-
-MAN1_JA=	822-date.1 dpkg-checkbuilddeps.1 dpkg-deb.1 dpkg-name.1 \
-		dpkg-query.1 dpkg-scanpackages.1 dpkg.1 dselect.1
-
-MAN5_JA=	deb-control.5 deb-old.5 deb.5
-MAN8_JA=	cleanup-info.8 dpkg-divert.8 dpkg-statoverride.8 \
-		install-info.8 start-stop-daemon.8 update-alternatives.8
-
-MAN1_PL=	822-date.1 dpkg-deb.1 dpkg-query.1 dpkg-split.1 dpkg.1 dselect.1
-MAN5_PL=	dpkg.cfg.5 dselect.cfg.5
-MAN8_PL=	dpkg-statoverride.8 start-stop-daemon.8 update-alternatives.8
-
-MAN1_RU=	822-date.1 dpkg-checkbuilddeps.1 dpkg.1
-MAN5_RU=	deb-control.5
-MAN8_RU=	start-stop-daemon.8
-
-MAN1_SV=	822-date.1 dpkg-deb.1 dpkg-query.1 dpkg-split.1 dpkg.1 dselect.1
-MAN5_SV=	deb-control.5 deb-old.5 deb.5 dpkg.cfg.5 dselect.cfg.5
-MAN8_SV=	start-stop-daemon.8
+CONFIGURE_ENV+=	PERL_LIBDIR="${PREFIX}/${SITE_PERL_REL}"
+
+MANLANG=	"" de fr hu ja pl sv
+
+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
+
+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
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -92,21 +238,17 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-	${MV} ${WRKSRC}/getopt/obstack.[ch] ${WRKSRC}/lib
+	${REINPLACE_CMD} -e 's|ncursesw/||g' \
+		${WRKSRC}/dselect/Makefile.in \
+		${WRKSRC}/dselect/dselect.h \
+		${WRKSRC}/dselect/main.cc \
+		${WRKSRC}/src/Makefile.in
 
 post-install:
 	${MV} ${PREFIX}/sbin/install-info ${PREFIX}/sbin/dpkg-install-info
-
 .for f in available diversions statoverride status
 	${TOUCH} ${DPKGDIR}/${f}
 .endfor
-
 	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/dpkg/distinfo b/archivers/dpkg/distinfo
index b7cfd122c2ab..3b7326cf1b0b 100644
--- a/archivers/dpkg/distinfo
+++ b/archivers/dpkg/distinfo
@@ -1,3 +1,3 @@
-MD5 (dpkg_1.13.25.tar.gz) = 88effb358aa04d25036b662d588433a6
-SHA256 (dpkg_1.13.25.tar.gz) = a525f321e875a8c16f5b6942bc02ac66b0d284cc6c61704f93e74789ef89d817
-SIZE (dpkg_1.13.25.tar.gz) = 3384618
+MD5 (dpkg_1.14.25.tar.gz) = 6bf3504b07d8fe2175a5d794391280de
+SHA256 (dpkg_1.14.25.tar.gz) = 545ce9830f0cf649e3b1b40d25d13989c23302623bf9b50f4c24402f63c82184
+SIZE (dpkg_1.14.25.tar.gz) = 6823861
diff --git a/archivers/dpkg/files/patch-configure b/archivers/dpkg/files/patch-configure
index 2bb263eb98ff..ce39872f541c 100644
--- a/archivers/dpkg/files/patch-configure
+++ b/archivers/dpkg/files/patch-configure
@@ -1,33 +1,11 @@
---- configure.orig	Fri Oct 13 06:37:44 2006
-+++ configure	Mon Nov 13 18:23:21 2006
-@@ -1991,7 +1991,7 @@
- { echo "$as_me:$LINENO: checking dpkg cpu type" >&5
- echo $ECHO_N "checking dpkg cpu type... $ECHO_C" >&6; }
- 
--cpu_type="`cd $srcdir/scripts; ./dpkg-architecture.pl -t$target -qDEB_HOST_ARCH_CPU 2>/dev/null`"
-+cpu_type="`grep -v ^# cputable | awk 'match("'$target'", $3) { print $1 }'`"
- 
- if test "x$cpu_type" = "x"; then
- 	cpu_type=$target_cpu
-@@ -2012,7 +2012,7 @@
- { echo "$as_me:$LINENO: checking dpkg operating system type" >&5
- echo $ECHO_N "checking dpkg operating system type... $ECHO_C" >&6; }
- 
--os_type="`cd $srcdir/scripts; ./dpkg-architecture.pl -t$target -qDEB_HOST_ARCH_OS 2>/dev/null`"
-+os_type="`grep -v ^# ostable | awk 'match("'$target'", $3) { print $1 }'`"
- 
- if test "x$os_type" = "x"; then
- 	os_type=$target_os
-@@ -2033,7 +2033,11 @@
- { echo "$as_me:$LINENO: checking dpkg architecture name" >&5
- echo $ECHO_N "checking dpkg architecture name... $ECHO_C" >&6; }
- 
--dpkg_arch="`cd $srcdir/scripts; ./dpkg-architecture.pl -t$target -qDEB_HOST_ARCH 2>/dev/null`"
-+if test $os_type = "linux"; then
-+	dpkg_arch=$cpu_type
-+else
-+	dpkg_arch=$os_type-$cpu_type
-+fi
- 
- { echo "$as_me:$LINENO: result: $dpkg_arch" >&5
- echo "${ECHO_T}$dpkg_arch" >&6; }
+--- 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; }
+ 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
diff --git a/archivers/dpkg/files/patch-dpkg-deb_Makefile.in b/archivers/dpkg/files/patch-dpkg-deb_Makefile.in
new file mode 100644
index 000000000000..c51503ef1646
--- /dev/null
+++ b/archivers/dpkg/files/patch-dpkg-deb_Makefile.in
@@ -0,0 +1,24 @@
+--- 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
new file mode 100644
index 000000000000..3f39caabe412
--- /dev/null
+++ b/archivers/dpkg/files/patch-dpkg-split_Makefile.in
@@ -0,0 +1,24 @@
+--- 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
new file mode 100644
index 000000000000..4271f973af18
--- /dev/null
+++ b/archivers/dpkg/files/patch-dselect_Makefile.in
@@ -0,0 +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 @@
+ 	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
+ am__depfiles_maybe = depfiles
+@@ -248,11 +247,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
+ 
+ EXTRA_DIST = keyoverride mkcurkeys.pl
+ CLEANFILES = curkeys.h
diff --git a/archivers/dpkg/files/patch-getopt_Makefile.am b/archivers/dpkg/files/patch-getopt_Makefile.am
deleted file mode 100644
index 8e52b6be1e2a..000000000000
--- a/archivers/dpkg/files/patch-getopt_Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
---- getopt/Makefile.am.orig	Wed Jun 21 06:41:12 2006
-+++ getopt/Makefile.am	Thu Oct 26 18:38:28 2006
-@@ -13,5 +13,4 @@
- 	error.h \
- 	getopt.c getopt.h \
- 	getopt1.c \
--	long-options.c long-options.h \
--	obstack.c obstack.h
-+	long-options.c long-options.h
diff --git a/archivers/dpkg/files/patch-getopt_Makefile.in b/archivers/dpkg/files/patch-getopt_Makefile.in
deleted file mode 100644
index 4b190f45b971..000000000000
--- a/archivers/dpkg/files/patch-getopt_Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- getopt/Makefile.in.orig	Fri Oct 13 06:37:54 2006
-+++ getopt/Makefile.in	Thu Oct 26 18:35:34 2006
-@@ -70,7 +70,7 @@
- libopt_a_AR = $(AR) $(ARFLAGS)
- libopt_a_LIBADD =
- am_libopt_a_OBJECTS = closeout.$(OBJEXT) getopt.$(OBJEXT) \
--	getopt1.$(OBJEXT) long-options.$(OBJEXT) obstack.$(OBJEXT)
-+	getopt1.$(OBJEXT) long-options.$(OBJEXT) 
- libopt_a_OBJECTS = $(am_libopt_a_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-@@ -232,7 +232,6 @@
- 	getopt.c getopt.h \
- 	getopt1.c \
- 	long-options.c long-options.h \
--	obstack.c obstack.h
- 
- all: all-am
- 
-@@ -285,7 +284,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/long-options.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obstack.Po@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
diff --git a/archivers/dpkg/files/patch-lib_Makefile.am b/archivers/dpkg/files/patch-lib_Makefile.am
deleted file mode 100644
index 9cee70340d7a..000000000000
--- a/archivers/dpkg/files/patch-lib_Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
---- lib/Makefile.am.orig	Thu Oct 26 18:38:08 2006
-+++ lib/Makefile.am	Thu Oct 26 18:37:18 2006
-@@ -34,4 +34,5 @@
- 	tarfn.c tarfn.h \
- 	utils.c \
- 	varbuf.c \
--	vercmp.c
-+	vercmp.c \
-+	obstack.c obstack.h
diff --git a/archivers/dpkg/files/patch-lib_Makefile.in b/archivers/dpkg/files/patch-lib_Makefile.in
deleted file mode 100644
index be4dd9665bca..000000000000
--- a/archivers/dpkg/files/patch-lib_Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- lib/Makefile.in.orig	Fri Oct 13 06:37:55 2006
-+++ lib/Makefile.in	Thu Oct 26 18:34:48 2006
-@@ -75,7 +75,8 @@
- 	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
-@@ -257,7 +258,8 @@
- 	tarfn.c tarfn.h \
- 	utils.c \
- 	varbuf.c \
--	vercmp.c
-+	vercmp.c \
-+	obstack.c obstack.h
- 
- all: all-am
- 
-@@ -326,6 +328,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/varbuf.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vercmp.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obstack.Po@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
diff --git a/archivers/dpkg/files/patch-lib_utils.c b/archivers/dpkg/files/patch-lib_utils.c
deleted file mode 100644
index 1bef888fb0fb..000000000000
--- a/archivers/dpkg/files/patch-lib_utils.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/utils.c.orig	Sat Apr 22 12:28:47 2006
-+++ lib/utils.c	Sat Apr 22 12:29:37 2006
-@@ -32,3 +32,12 @@
- int cisalpha(int c) {
- 	return ((c>='a') && (c<='z')) || ((c>='A') && (c<='Z'));
- }
-+
-+#ifdef __FreeBSD__
-+size_t
-+strnlen (const char *string, size_t maxlen)
-+{
-+	const char *end = memchr (string, '\0', maxlen);
-+	return end ? (size_t) (end - string) : maxlen;
-+}
-+#endif
diff --git a/archivers/dpkg/files/patch-scripts_Makefile.in b/archivers/dpkg/files/patch-scripts_Makefile.in
deleted file mode 100644
index 4228457a5cb5..000000000000
--- a/archivers/dpkg/files/patch-scripts_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- scripts/Makefile.in.orig	Fri Oct 13 06:37:57 2006
-+++ scripts/Makefile.in	Fri Nov 10 12:54:34 2006
-@@ -282,6 +282,9 @@
- 		    -e "s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(pkglibdir)\":" \
- 		    -e "s:\$$pkgdatadir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$pkgdatadir=\"$(pkgdatadir)\":" \
- 		    -e "s:\$$admindir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$admindir=\"$(admindir)\":" \
-+		    -e "s:\$$sysconfdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$sysconfdir=\"$(sysconfdir)\":" \
-+		    -e "s:\$$infodir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$infodir=\"$(infodir)\":" \
-+		    -e "s:\$$prefix[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$prefix=\"$(prefix)\":" \
- 		    -e "s:\$$version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$version=\"$(PACKAGE_VERSION)\":"
- 
- do_shell_subst = sed -e "s:version=\"[^\"]*\":version=\"$(PACKAGE_VERSION)\":"
diff --git a/archivers/dpkg/files/patch-scripts_cleanup-info.pl b/archivers/dpkg/files/patch-scripts_cleanup-info.pl
deleted file mode 100644
index c20d4a192039..000000000000
--- a/archivers/dpkg/files/patch-scripts_cleanup-info.pl
+++ /dev/null
@@ -1,19 +0,0 @@
---- scripts/cleanup-info.pl.orig	Tue Jun 20 19:36:39 2006
-+++ scripts/cleanup-info.pl	Fri Nov 10 12:22:49 2006
-@@ -25,6 +25,7 @@
- # use strict;
- 
- my $dpkglibdir = "."; # This line modified by Makefile
-+my $prefix = "/usr"; # This line modified by Makefile
- push(@INC,$dpkglibdir);
- require 'dpkg-gettext.pl';
- textdomain("dpkg");
-@@ -56,7 +57,7 @@
- "), $0;
- }
- 
--my $infodir = '/usr/info';
-+my $infodir = "$prefix/info";
- my $unsafe = 0;
- $0 =~ m|[^/]+$|;
- my $name= $&;
diff --git a/archivers/dpkg/files/patch-scripts_dpkg-checkbuilddeps.pl b/archivers/dpkg/files/patch-scripts_dpkg-checkbuilddeps.pl
deleted file mode 100644
index 8eb20c1bfe99..000000000000
--- a/archivers/dpkg/files/patch-scripts_dpkg-checkbuilddeps.pl
+++ /dev/null
@@ -1,21 +0,0 @@
---- scripts/dpkg-checkbuilddeps.pl.orig	Sun Jun 18 18:22:03 2006
-+++ scripts/dpkg-checkbuilddeps.pl	Fri Nov 10 16:23:44 2006
-@@ -4,7 +4,8 @@
- #use strict;
- use Getopt::Long;
- 
--my $dpkglibdir="/usr/lib/dpkg";
-+my $dpkglibdir="/usr/lib/dpkg"; # This line modified by Makefile
-+my $admindir="/var/lib/dpkg"; # This line modified by Makefile
- push(@INC,$dpkglibdir);
- #my $controlfile;
- require 'controllib.pl';
-@@ -79,7 +80,7 @@
- # thanks to Matt Zimmerman. Returns two hash references that
- # are exactly what the other functions need...
- sub parse_status {
--	my $status=shift || "/var/lib/dpkg/status";
-+	my $status=shift || "$admindir/status";
- 	
- 	my %providers;
- 	my %version;
diff --git a/archivers/dpkg/files/patch-scripts_dpkg-genchanges.pl b/archivers/dpkg/files/patch-scripts_dpkg-genchanges.pl
deleted file mode 100644
index 9083a3b99606..000000000000
--- a/archivers/dpkg/files/patch-scripts_dpkg-genchanges.pl
+++ /dev/null
@@ -1,14 +0,0 @@
---- scripts/dpkg-genchanges.pl.orig	Wed Jun 28 17:14:04 2006
-+++ scripts/dpkg-genchanges.pl	Mon Nov 13 21:29:46 2006
-@@ -336,9 +336,9 @@
-     open(STDIN,"< $uf") || &syserr(sprintf(_g("cannot open upload file %s for reading"), $uf));
-     (@s=stat(STDIN)) || &syserr(sprintf(_g("cannot fstat upload file %s"), $uf));
-     $size= $s[7]; $size || &warn(sprintf(_g("upload file %s is empty"), $uf));
--    $md5sum=`md5sum`; $? && subprocerr(sprintf(_g("md5sum upload file %s"), $uf));
-+    $md5sum=`gmd5sum`; $? && subprocerr(sprintf(_g("gmd5sum upload file %s"), $uf));
-     $md5sum =~ m/^([0-9a-f]{32})\s*-?\s*$/i ||
--        &failure(sprintf(_g("md5sum upload file %s gave strange output \`%s'"), $uf, $md5sum));
-+        &failure(sprintf(_g("gmd5sum upload file %s gave strange output \`%s'"), $uf, $md5sum));
-     $md5sum= $1;
-     defined($md5sum{$f}) && $md5sum{$f} ne $md5sum &&
-         &error(sprintf(_g("md5sum of source file %s (%s) is different ".
diff --git a/archivers/dpkg/files/patch-scripts_dpkg-scanpackages.pl b/archivers/dpkg/files/patch-scripts_dpkg-scanpackages.pl
deleted file mode 100644
index 89ab6e79933c..000000000000
--- a/archivers/dpkg/files/patch-scripts_dpkg-scanpackages.pl
+++ /dev/null
@@ -1,15 +0,0 @@
---- scripts/dpkg-scanpackages.pl.orig	Sun Jun 18 18:22:03 2006
-+++ scripts/dpkg-scanpackages.pl	Mon Nov 13 21:30:48 2006
-@@ -167,9 +167,9 @@
- 	
- 	$tv{'Filename'}= "$pathprefix$fn";
- 	
--	open(C,"md5sum <$fn |") || die "$fn $!";
--	chop($_=<C>); close(C); $? and die sprintf(_g("\`md5sum < %s' exited with %d"), $fn, $?)."\n";
--	/^([0-9a-f]{32})\s*-?\s*$/ or die sprintf(_g("Strange text from \`md5sum < %s': \`%s'"), $fn, $_)."\n";
-+	open(C,"gmd5sum <$fn |") || die "$fn $!";
-+	chop($_=<C>); close(C); $? and die sprintf(_g("\`gmd5sum < %s' exited with %d"), $fn, $?)."\n";
-+	/^([0-9a-f]{32})\s*-?\s*$/ or die sprintf(_g("Strange text from \`gmd5sum < %s': \`%s'"), $fn, $_)."\n";
- 	$tv{'MD5sum'}= $1;
- 	
- 	my @stat= stat($fn) or die sprintf(_g("Couldn't stat %s: %s"), $fn, $!)."\n";
diff --git a/archivers/dpkg/files/patch-scripts_dpkg-scansources.pl b/archivers/dpkg/files/patch-scripts_dpkg-scansources.pl
deleted file mode 100644
index 9ddcf7199c41..000000000000
--- a/archivers/dpkg/files/patch-scripts_dpkg-scansources.pl
+++ /dev/null
@@ -1,16 +0,0 @@
---- scripts/dpkg-scansources.pl.orig	Sun Jun 18 18:22:03 2006
-+++ scripts/dpkg-scansources.pl	Mon Nov 13 21:31:23 2006
-@@ -298,11 +298,11 @@
-     if (!$pid) {
- 	open STDIN, '<&FILE' or xdie sprintf(_g("can't dup %s:"), $file);
- 	seek STDIN, 0, 0     or xdie sprintf(_g("can't rewind %s:"), $file);
--	exec 'md5sum'        or xdie _g("can't exec md5sum:");
-+	exec 'gmd5sum'        or xdie _g("can't exec gmd5sum:");
-     }
-     chomp($md5 = join '', <MD5>);
-     unless (close MD5) {
--	xwarn_noerror close_msg 'md5sum';
-+	xwarn_noerror close_msg 'gmd5sum';
- 	return;
-     }
-     $md5 =~ s/ *-$//; # Remove trailing spaces and -, to work with GNU md5sum
diff --git a/archivers/dpkg/files/patch-scripts_dpkg-shlibdeps.pl b/archivers/dpkg/files/patch-scripts_dpkg-shlibdeps.pl
deleted file mode 100644
index fc6e9d822714..000000000000
--- a/archivers/dpkg/files/patch-scripts_dpkg-shlibdeps.pl
+++ /dev/null
@@ -1,25 +0,0 @@
---- scripts/dpkg-shlibdeps.pl.orig	Fri Nov 10 12:02:38 2006
-+++ scripts/dpkg-shlibdeps.pl	Fri Nov 10 12:54:26 2006
-@@ -3,16 +3,18 @@
- # dpkg-shlibdeps
- # $Id: dpkg-shlibdeps.pl,v 1.19.2.2 2004/04/25 17:11:41 keybuk Exp $
- 
--my $dpkglibdir="/usr/lib/dpkg";
-+my $dpkglibdir="/usr/lib/dpkg"; # This line modified by Makefile
-+my $admindir="/var/lib/dpkg"; # This line modified by Makefile
-+my $sysconfdir="/etc"; # This line modified by Makefile
- my $version="1.4.1.19"; # This line modified by Makefile
- 
- use English;
- use POSIX qw(:errno_h :signal_h);
- 
--my $shlibsoverride= '/etc/dpkg/shlibs.override';
--my $shlibsdefault= '/etc/dpkg/shlibs.default';
-+my $shlibsoverride= "$sysconfdir/dpkg/shlibs.override";
-+my $shlibsdefault= "$sysconfdir/etc/dpkg/shlibs.default";
- my $shlibslocal= 'debian/shlibs.local';
--my $shlibsppdir= '/var/lib/dpkg/info';
-+my $shlibsppdir= "$admindir/info";
- my $shlibsppext= '.shlibs';
- my $varnameprefix= 'shlibs';
- my $dependencyfield= 'Depends';
diff --git a/archivers/dpkg/files/patch-scripts_dpkg-source.pl b/archivers/dpkg/files/patch-scripts_dpkg-source.pl
deleted file mode 100644
index b46481566d04..000000000000
--- a/archivers/dpkg/files/patch-scripts_dpkg-source.pl
+++ /dev/null
@@ -1,77 +0,0 @@
---- scripts/dpkg-source.pl.orig	Tue Jun 20 20:40:27 2006
-+++ scripts/dpkg-source.pl	Fri Nov 10 13:26:54 2006
-@@ -1,6 +1,7 @@
- #! /usr/bin/perl
- 
- my $dpkglibdir = ".";
-+my $prefix = "/usr"; # This line modified by Makefile
- my $version = "1.3.0"; # This line modified by Makefile
- 
- my @filesinarchive;
-@@ -616,10 +617,17 @@
-     close(DSC);
- 
-     if ($is_signed) {
--	if (-x '/usr/bin/gpg') {
-+	my $have_gpg = 0;
-+	foreach my $path (split ':', $ENV{PATH}) {
-+	    if (-x "$path/gpg") {
-+		$have_gpg = 1;
-+		last;
-+	    }
-+	}
-+	if ($have_gpg) {
- 	    my $gpg_command = 'gpg -q --verify ';
--	    if (-r '/usr/share/keyrings/debian-keyring.gpg') {
--		$gpg_command = $gpg_command.'--keyring /usr/share/keyrings/debian-keyring.gpg ';
-+	    if (-r "$prefix/share/apt/keyrings/freebsd-keyring.gpg") {
-+		$gpg_command = $gpg_command."--keyring $prefix/share/apt/keyrings/freebsd-keyring.gpg ";
- 	    }
- 	    $gpg_command = $gpg_command.quotemeta($dsc).' 2>&1';
- 
-@@ -842,18 +850,18 @@
- 	    open DIFF, $patch or &error(sprintf(_g("can't open diff `%s'"), $patch));
- 	}
- 
--        defined($c2= fork) || &syserr(_g("fork for patch"));
-+        defined($c2= fork) || &syserr(_g("fork for gpatch"));
-         if (!$c2) {
--            open(STDIN,"<&DIFF") || &syserr(_g("reopen gzip for patch"));
--            chdir($newdirectory) || &syserr(sprintf(_g("chdir to %s for patch"), $newdirectory));
-+            open(STDIN,"<&DIFF") || &syserr(_g("reopen gzip for gpatch"));
-+            chdir($newdirectory) || &syserr(sprintf(_g("chdir to %s for gpatch"), $newdirectory));
- 	    $ENV{'LC_ALL'}= 'C';
- 	    $ENV{'LANG'}= 'C';
--            exec('patch','-s','-t','-F','0','-N','-p1','-u',
--                 '-V','never','-g0','-b','-z','.dpkg-orig') or &syserr(_g("exec patch"));
-+            exec('gpatch','-s','-t','-F','0','-N','-p1','-u',
-+                 '-V','never','-g0','-b','-z','.dpkg-orig') or &syserr(_g("exec gpatch"));
-         }
-         close(DIFF);
--        $c2 == waitpid($c2,0) || &syserr(_g("wait for patch"));
--        $? && subprocerr("patch");
-+        $c2 == waitpid($c2,0) || &syserr(_g("wait for gpatch"));
-+        $? && subprocerr("gpatch");
- 
- 	&reapgzip if $patch =~ /\.(gz|bz2)$/;
-     }
-@@ -909,7 +917,7 @@
-     open(STDIN,"< $dscdir/$f") || &syserr(sprintf(_g("cannot read %s"), "$dscdir/$f"));
-     (@s= stat(STDIN)) || &syserr(sprintf(_g("cannot fstat %s"), "$dscdir/$f"));
-     $s[7] == $size{$f} || &error(sprintf(_g("file %s has size %s instead of expected %s"), $f, $s[7], $size{$f}));
--    $m= `md5sum`; $? && subprocerr("md5sum $f"); $m =~ s/\n$//;
-+    $m= `gmd5sum`; $? && subprocerr("gmd5sum $f"); $m =~ s/\n$//;
-     $m = readmd5sum( $m );
-     $m eq $md5sum{$f} || &error(sprintf(_g("file %s has md5sum %s instead of expected %s"), $f, $m, $md5sum{$f}));
-     open(STDIN,"</dev/null") || &syserr(_g("reopen stdin from /dev/null"));
-@@ -1334,8 +1342,8 @@
- 	&internerr( sprintf(_g("tried to add file `%s' twice"), $filename));
-     stat($filename) || &syserr(sprintf(_g("could not stat output file `%s'"), $filename));
-     $size= (stat _)[7];
--    my $md5sum= `md5sum <$filename`;
--    $? && &subprocerr("md5sum $filename");
-+    my $md5sum= `gmd5sum <$filename`;
-+    $? && &subprocerr("gmd5sum $filename");
-     $md5sum = readmd5sum( $md5sum );
-     $f{'Files'}.= "\n $md5sum $size $filename";
- }
diff --git a/archivers/dpkg/files/patch-scripts_install-info.pl b/archivers/dpkg/files/patch-scripts_install-info.pl
deleted file mode 100644
index d679676a5054..000000000000
--- a/archivers/dpkg/files/patch-scripts_install-info.pl
+++ /dev/null
@@ -1,25 +0,0 @@
---- scripts/install-info.pl.orig	Tue Jun 20 19:36:39 2006
-+++ scripts/install-info.pl	Fri Nov 10 15:33:54 2006
-@@ -3,6 +3,8 @@
- use Text::Wrap;
- 
- my $dpkglibdir = "."; # This line modified by Makefile
-+my $prefix = "/usr"; # This line modified by Makefile
-+my $infodir = "/usr/share/info"; # This line modified by Makefile
- push (@INC, $dpkglibdir);
- require 'dpkg-gettext.pl';
- textdomain("dpkg");
-@@ -51,11 +53,11 @@
- "), $0;
- }
- 
--$dirfile = '/usr/share/info/dir';
-+$dirfile = "$infodir/dir";
- $maxwidth=79;
- $Text::Wrap::columns=$maxwidth;
- $backup='/var/backups/infodir.bak';
--$default='/usr/share/base-files/info.dir';
-+$default="$prefix/share/base-files/info.dir";
- 
- $menuentry="";
- $description="";
diff --git a/archivers/dpkg/files/patch-scripts_update-alternatives.pl b/archivers/dpkg/files/patch-scripts_update-alternatives.pl
deleted file mode 100644
index 6a216f994511..000000000000
--- a/archivers/dpkg/files/patch-scripts_update-alternatives.pl
+++ /dev/null
@@ -1,28 +0,0 @@
---- scripts/update-alternatives.pl.orig	Tue Jun 20 19:36:39 2006
-+++ scripts/update-alternatives.pl	Fri Nov 10 13:57:31 2006
-@@ -2,6 +2,7 @@
- 
- $admindir= "/var/lib/dpkg"; # This line modified by Makefile
- $dpkglibdir= "../utils"; # This line modified by Makefile
-+$sysconfdir="/etc"; # This line modified by Makefile
- $version= '0.93.80'; # This line modified by Makefile
- push (@INC, $dpkglibdir);
- require 'dpkg-gettext.pl';
-@@ -64,7 +65,7 @@
-   --set <name> <path>      set <path> as alternative for <name>.
-   --all                    call --config on all alternatives.
- 
--<link> is the symlink pointing to /etc/alternatives/<name>.
-+<link> is the symlink pointing to $sysconfdir/alternatives/<name>.
-   (e.g. /usr/bin/pager)
- <name> is the master name for this link group.
-   (e.g. pager)
-@@ -97,7 +98,7 @@
-     exit(2);
- }
- 
--$altdir= '/etc/alternatives';
-+$altdir= $sysconfdir . '/alternatives';
- $admindir= $admindir . '/alternatives';
- $testmode= 0;
- $verbosemode= 0;
diff --git a/archivers/dpkg/files/patch-src_Makefile.in b/archivers/dpkg/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..29478514c902
--- /dev/null
+++ b/archivers/dpkg/files/patch-src_Makefile.in
@@ -0,0 +1,55 @@
+--- 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-src_help.c b/archivers/dpkg/files/patch-src_help.c
deleted file mode 100644
index 271cb2681824..000000000000
--- a/archivers/dpkg/files/patch-src_help.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/help.c.orig	Sun Jun 18 18:22:03 2006
-+++ src/help.c	Mon Nov 13 21:09:32 2006
-@@ -73,7 +73,7 @@
- #ifdef WITH_START_STOP_DAEMON
-     "start-stop-daemon",
- #endif    
--    "install-info", "update-rc.d", 0
-+    "dpkg-install-info", 0
-   };
- 
-   struct stat stab;
diff --git a/archivers/dpkg/files/patch-src_remove.c b/archivers/dpkg/files/patch-src_remove.c
deleted file mode 100644
index d1a3502e52ac..000000000000
--- a/archivers/dpkg/files/patch-src_remove.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/remove.c.orig	Sun Jun 18 18:22:03 2006
-+++ src/remove.c	Tue Nov 14 09:47:46 2006
-@@ -261,7 +261,18 @@
-         push_leftover(&leftover,namenode);
-         continue;
-       }
--      if (errno != ENOTDIR) ohshite(_("cannot remove `%.250s'"),fnvb.buf);
-+      if (errno != ENOTDIR) {
-+        /* dpkg includes /. in the packing list.
-+         * rmdir("/.") will return EINVAL. dpkg will
-+         * only attempt to remove /. when uninstalling
-+         * the last package on the system, which is why
-+         * Debian has never run into this issue. */
-+        if (errno == EINVAL && strcmp(fnvb.buf, "/.") == 0) {
-+          continue;
-+        } else {
-+          ohshite(_("cannot remove `%.250s'"),fnvb.buf);
-+        }
-+      }
-       debug(dbg_eachfiledetail, "removal_bulk unlinking `%s'", fnvb.buf);
-       {
-         /*
-@@ -378,7 +389,16 @@
-       push_leftover(&leftover,namenode);
-       continue;
-     }
--    if (errno != ENOTDIR) ohshite(_("cannot remove `%.250s'"),fnvb.buf);
-+    if (errno != ENOTDIR) {
-+      /* As above, packages include /. in their packing list. 
-+       * Even if we are removing the last package on the system, 
-+       * don't try to remove /. */
-+      if (errno == EINVAL && strcmp(fnvb.buf, "/.") == 0) {
-+        continue;
-+      } else {
-+        ohshite(_("cannot remove `%.250s'"),fnvb.buf);
-+      }
-+    }
- 
-     push_leftover(&leftover,namenode);
-     continue;
diff --git a/archivers/dpkg/files/patch-utils_start-stop-daemon.c b/archivers/dpkg/files/patch-utils_start-stop-daemon.c
index 744027e63ef0..5843fefd8fab 100644
--- a/archivers/dpkg/files/patch-utils_start-stop-daemon.c
+++ b/archivers/dpkg/files/patch-utils_start-stop-daemon.c
@@ -1,38 +1,30 @@
---- utils/start-stop-daemon.c.orig	Wed Jun 21 07:59:36 2006
-+++ utils/start-stop-daemon.c	Thu Oct 26 18:59:40 2006
-@@ -48,6 +48,7 @@
+--- 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 @@
  #endif
  
- #if  defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
+ #if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
 +#define _WANT_UCRED
  #include <sys/param.h>
  #include <sys/proc.h>
  #include <sys/stat.h>
-@@ -928,9 +929,15 @@
- 		errx(1, "%s", errbuf);
- 	if ((kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries)) == 0)
+@@ -941,8 +942,8 @@
+ 	kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries);
+ 	if (kp == NULL)
  		errx(1, "%s", kvm_geterr(kd));
-+#if defined(OSOpenBSD) || (defined(OSFreeBSD) && __FreeBSD_version < 500014)
- 	if (kp->kp_proc.p_cred )
- 		kvm_read(kd, (u_long)&(kp->kp_proc.p_cred->p_ruid),
- 			&proc_uid, sizeof(uid_t));
-+#elif defined(OSFreeBSD)
-+	if ( kp->ki_paddr->p_ucred )
+-	if (kp->kp_proc.p_cred)
+-		kvm_read(kd, (u_long)&(kp->kp_proc.p_cred->p_ruid),
++	if (kp->ki_paddr->p_ucred)
 +		kvm_read(kd, (u_long)&(kp->ki_paddr->p_ucred->cr_ruid),
-+			&proc_uid, sizeof(uid_t));
-+#endif
+ 		         &proc_uid, sizeof(uid_t));
  	else
  		return 0;
- 	return (proc_uid == (uid_t)uid);
-@@ -949,7 +956,11 @@
- 		errx(1, "%s", errbuf);
- 	if ((kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries)) == 0)
+@@ -963,7 +964,7 @@
+ 	kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries);
+ 	if (kp == NULL)
  		errx(1, "%s", kvm_geterr(kd));
-+#if defined(OSOpenBSD) || (defined(OSFreeBSD) && __FreeBSD_version < 500014)
- 	pidexec = (&kp->kp_proc)->p_comm;
-+#elif defined(OSFreeBSD)
+-	pidexec = (&kp->kp_proc)->p_comm;
 +	pidexec = kp->ki_paddr->p_comm;
-+#endif
  	if (strlen(name) != strlen(pidexec))
  		return 0;
  	return (strcmp(name, pidexec) == 0) ? 1 : 0;
diff --git a/archivers/dpkg/pkg-plist b/archivers/dpkg/pkg-plist
index f2d2b0983e3c..1f181ec53e46 100644
--- a/archivers/dpkg/pkg-plist
+++ b/archivers/dpkg/pkg-plist
@@ -1,3 +1,41 @@
+%%DATADIR%%/cputable
+%%DATADIR%%/ostable
+%%DATADIR%%/triplettable
+%%SITE_PERL%%/Dpkg.pm
+%%SITE_PERL%%/Dpkg/Arch.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/Checksums.pm
+%%SITE_PERL%%/Dpkg/Compression.pm
+%%SITE_PERL%%/Dpkg/Control.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/Path.pm
+%%SITE_PERL%%/Dpkg/Shlibs.pm
+%%SITE_PERL%%/Dpkg/Shlibs/Objdump.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
+%%SITE_PERL%%/Dpkg/Source/Package/V2.pm
+%%SITE_PERL%%/Dpkg/Source/Package/V3/bzr.pm
+%%SITE_PERL%%/Dpkg/Source/Package/V3/custom.pm
+%%SITE_PERL%%/Dpkg/Source/Package/V3/git.pm
+%%SITE_PERL%%/Dpkg/Source/Package/V3/native.pm
+%%SITE_PERL%%/Dpkg/Source/Package/V3/quilt.pm
+%%SITE_PERL%%/Dpkg/Source/Patch.pm
+%%SITE_PERL%%/Dpkg/Substvars.pm
+%%SITE_PERL%%/Dpkg/Vars.pm
+%%SITE_PERL%%/Dpkg/Version.pm
 bin/822-date
 bin/dpkg
 bin/dpkg-architecture
@@ -7,6 +45,7 @@ bin/dpkg-deb
 bin/dpkg-distaddfile
 bin/dpkg-genchanges
 bin/dpkg-gencontrol
+bin/dpkg-gensymbols
 bin/dpkg-name
 bin/dpkg-parsechangelog
 bin/dpkg-query
@@ -15,12 +54,10 @@ bin/dpkg-scansources
 bin/dpkg-shlibdeps
 bin/dpkg-source
 bin/dpkg-split
+bin/dpkg-trigger
 bin/dselect
 etc/alternatives/README
 etc/dpkg/origins/debian
-libexec/dpkg/controllib.pl
-libexec/dpkg/dpkg-gettext.pl
-libexec/dpkg/enoent
 libexec/dpkg/methods/disk/desc.cdrom
 libexec/dpkg/methods/disk/desc.harddisk
 libexec/dpkg/methods/disk/desc.mounted
@@ -42,34 +79,33 @@ libexec/dpkg/parsechangelog/debian
 @dirrmtry man/pt_BR
 sbin/cleanup-info
 sbin/dpkg-divert
-sbin/dpkg-statoverride
 sbin/dpkg-install-info
+sbin/dpkg-statoverride
 sbin/start-stop-daemon
 sbin/update-alternatives
-%%DATADIR%%/cputable
-%%DATADIR%%/ostable
 %%NLS%%share/locale/bs/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/dselect.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/dpkg-dev.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/da/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/da/LC_MESSAGES/dselect.mo
+%%NLS%%share/locale/de/LC_MESSAGES/dpkg-dev.mo
 %%NLS%%share/locale/de/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/de/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/dz/LC_MESSAGES/dpkg.mo
-%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/dz
 %%NLS%%share/locale/el/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/el/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/es/LC_MESSAGES/dpkg.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
 %%NLS%%share/locale/eu/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/dselect.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/dpkg-dev.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/dselect.mo
@@ -82,10 +118,11 @@ sbin/update-alternatives
 %%NLS%%share/locale/ja/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/km/LC_MESSAGES/dpkg.mo
-%%NLS%%@dirrmtry share/locale/km/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/km
 %%NLS%%share/locale/ko/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/dselect.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/dpkg.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/dpkg.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/ne/LC_MESSAGES/dpkg.mo
@@ -94,6 +131,7 @@ sbin/update-alternatives
 %%NLS%%share/locale/nn/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/dpkg.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/dpkg-dev.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/dpkg.mo
@@ -102,39 +140,113 @@ sbin/update-alternatives
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/dselect.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/dpkg-dev.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/dselect.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/dpkg-dev.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/dselect.mo
+%%NLS%%share/locale/th/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/tl/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/tl/LC_MESSAGES/dselect.mo
-%%NLS%%@dirrmtry share/locale/tl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tl
 %%NLS%%share/locale/vi/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/dselect.mo
-@dirrm %%DATADIR%%/origins
-@dirrm %%DATADIR%%
-@dirrm libexec/dpkg/parsechangelog
-@dirrm libexec/dpkg/methods/floppy
-@dirrm libexec/dpkg/methods/disk
-@dirrm libexec/dpkg/methods
-@dirrm libexec/dpkg
-@dirrm etc/dpkg/origins
-@dirrm etc/dpkg
-@dirrm etc/alternatives
+%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_TW
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%@dirrmtry share/locale/vi/LC_MESSAGES
+%%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
+@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%%
 @cwd /
-@dirrm %%DPKGDIR%%/updates
-@dirrm %%DPKGDIR%%/parts
-@dirrm %%DPKGDIR%%/methods/mnt
-@dirrm %%DPKGDIR%%/methods/floppy
-@dirrm %%DPKGDIR%%/methods/disk
-@dirrm %%DPKGDIR%%/methods
-@dirrm %%DPKGDIR%%/info
-@dirrm %%DPKGDIR%%/alternatives
-@dirrm %%DPKGDIR%%
+@dirrmtry %%DPKGDIR%%/updates
+@dirrmtry %%DPKGDIR%%/parts
+@dirrmtry %%DPKGDIR%%/methods/mnt
+@dirrmtry %%DPKGDIR%%/methods/floppy
+@dirrmtry %%DPKGDIR%%/methods/disk
+@dirrmtry %%DPKGDIR%%/methods
+@dirrmtry %%DPKGDIR%%/info
+@dirrmtry %%DPKGDIR%%/alternatives
+@dirrmtry %%DPKGDIR%%