Updated dpkg to 1.13.25.

Lots of upstream changes since 1.10.28 (three years ago).

pkgsrc changes:
- the database location has changed to ${VARBASE}/db/dpkg
- man pages are installed

6 files changed, 34 insertions, 62 deletions

diff --git a/misc/dpkg/patches/patch-aa b/misc/dpkg/patches/patch-aa
deleted file mode 100644
index 1677263113b..00000000000
--- a/misc/dpkg/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/29 17:26:18 erh Exp $
-
---- lib/Makefile.in.orig	2004-10-27 09:06:43.000000000 +0000
-+++ lib/Makefile.in	2004-10-29 16:42:38.000000000 +0000
-@@ -20,7 +20,7 @@
- all:: libdpkg.a
- 
- libdpkg.a: $(OBJECTS) 
--	$(AR) r $@ $^
-+	$(AR) r $@ $(OBJECTS) ../optlib/getopt.o ../optlib/getopt1.o ../optlib/long-options.o ../optlib/closeout.o ../optlib/obstack.o
-	$(RANLIB) $@
- 
- .PHONY: install
diff --git a/misc/dpkg/patches/patch-ab b/misc/dpkg/patches/patch-ab
deleted file mode 100644
index d5da260b03a..00000000000
--- a/misc/dpkg/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/10/29 17:26:18 erh Exp $
-
---- Makefile.in.orig	2004-10-29 16:47:00.000000000 +0000
-+++ Makefile.in	2004-10-29 16:46:46.000000000 +0000
-@@ -9,8 +9,8 @@
- default: all
- include Makefile.conf
- 
--SUBDIRS		= include optlib lib dpkg-deb split scripts utils main \
--		  @DSELECTDIR@ po methods man doc
-+SUBDIRS		= include optlib lib dpkg-deb split scripts main \
-+ 		  @DSELECTDIR@ po methods
- 
- all: version.h all-recursive
- 
diff --git a/misc/dpkg/patches/patch-ac b/misc/dpkg/patches/patch-ac
deleted file mode 100644
index ccf795eee35..00000000000
--- a/misc/dpkg/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/10/29 17:26:18 erh Exp $
-
---- dpkg-deb/build.c.orig	2003-06-29 12:59:36.000000000 +0200
-+++ dpkg-deb/build.c	2003-06-29 13:01:34.000000000 +0200
-@@ -445,7 +445,7 @@
-     m_dup2(p1[0],0); close(p1[0]); close(p1[1]);
-     m_dup2(p2[1],1); close(p2[0]); close(p2[1]);
-     if (chdir(directory)) ohshite(_("failed to chdir to `%.255s'"),directory);
--    execlp(TAR,"tar","-cf", "-", "-T", "-", "--null", "--no-recursion", (char*)0);
-+    execlp(TAR,"tar","-cf", "-", "-T", "-", (char*)0);
-     ohshite(_("failed to exec tar -cf"));
-   }
-   close(p1[0]);
diff --git a/misc/dpkg/patches/patch-ae b/misc/dpkg/patches/patch-ae
deleted file mode 100644
index 71f47814c13..00000000000
--- a/misc/dpkg/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/05/21 11:17:28 rillig Exp $
-
-GNU Make does not strip the line-continuation backslashes before
-executing the shell. This confuses Perl.
-
-In addition, it is bad style to pipe directly into the target file in
-Make, since in a second run Make will assume the target file has been
-updated properly.
-
---- main/Makefile.in.orig	2004-10-27 11:06:43.000000000 +0200
-+++ main/Makefile.in	2006-05-21 13:06:28.000000000 +0200
-@@ -72,6 +72,6 @@ enquiry.o: archtable.h
- 
- archtable.h: $(top_srcdir)/archtable
- 	expand $< | \
--	 perl -ne 'print "  { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" \
--		   if m/^(?!\s*#)\s*(\S+)(\s+)(\S+)(\s+)(\S+)\s*$$/' \
--		>$@
-+	 perl -ne 'print "  { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" if m/^(?!\s*#)\s*(\S+)(\s+)(\S+)(\s+)(\S+)\s*$$/' \
-+		>$@.tmp
-+	mv $@.tmp $@
diff --git a/misc/dpkg/patches/patch-af b/misc/dpkg/patches/patch-af
new file mode 100644
index 00000000000..2902c617c13
--- /dev/null
+++ b/misc/dpkg/patches/patch-af
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..5eb24ddd968
--- /dev/null
+++ b/misc/dpkg/patches/patch-ag
@@ -0,0 +1,21 @@
+$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 \