pkg/36640: misc/dpkg: compilation error

[cheusov%tut.by@localhost]

>Number:         36640
>Category:       pkg
>Synopsis:       misc/dpkg: compilation error
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jul 12 21:45:00 +0000 2007
>Originator:     cheusov%tut.by@localhost
>Release:        NetBSD 4.0_BETA2
>Organization:
Best regards, Aleksey Cheusov.
>Environment:
System: NetBSD chen.chizhovka.net 4.0_BETA2 NetBSD 4.0_BETA2 (GENERIC) #20: Wed 
Jun 20 19:58:12 EEST 2007 
cheusov%chen.chizhovka.net@localhost:/srv/src/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
Both HEAD and pkgsrc-2007Q2 versions of misc/dpkg cannot be compiled
on NetBSD-4.
Either apply the following patch or try to upgrade
to the latest version of dpkg.

>Fix:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/misc/dpkg/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo    21 May 2006 11:27:23 -0000      1.4
+++ distinfo    12 Jul 2007 20:03:40 -0000
@@ -8,3 +8,5 @@
 SHA1 (patch-ac) = 130359aeeafc5c8bc10f38eac7335c2781f3c503
 SHA1 (patch-ad) = 95c64b2d0c6872b75151f2e8ca4c3d0a3206b6a0
 SHA1 (patch-ae) = 0df7982b097b3476542df3e812ab22c33a4a5d28
+SHA1 (patch-af) = 337b9258089bb970f6864b0a93a91d02459c161c
+SHA1 (patch-ag) = 349d313109743d9adf203d047f6100f7c1698bba
Index: patches/patch-af
===================================================================
RCS file: patches/patch-af
diff -N patches/patch-af
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-af    12 Jul 2007 20:03:40 -0000
@@ -0,0 +1,24 @@
+$NetBSD$
+
+--- include/parsedump.h.orig   2004-11-11 05:16:33.000000000 +0200
++++ include/parsedump.h
+@@ -30,10 +30,6 @@ struct nickname {
+   const char *canon;
+ };
+ 
+-extern const struct fieldinfo fieldinfos[];
+-extern const struct nickname nicknames[];
+-extern const int nfields; /* = elements in fieldinfos, including the 
sentinels */
+-
+ #define PKGIFPOFF(f) ((char*)(&(((struct pkginfoperfile *)0x1000)->f)) - \
+                       (char*)(struct pkginfoperfile *)0x1000)
+ #define PKGPFIELD(pifp,of,type) (*(type*)((char*)(pifp)+(of)))
+@@ -78,4 +74,8 @@ void parsemustfield(FILE *file, const ch
+ 
+ #define MSDOS_EOF_CHAR '\032' /* ^Z */
+ 
++extern const struct fieldinfo fieldinfos[];
++extern const struct nickname nicknames[];
++extern const int nfields; /* = elements in fieldinfos, including the 
sentinels */
++
+ #endif /* DPKG_PARSEDUMP_H */
Index: patches/patch-ag
===================================================================
RCS file: patches/patch-ag
diff -N patches/patch-ag
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ag    12 Jul 2007 20:03:40 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- lib/mlib.c.orig    2004-11-11 05:16:33.000000000 +0200
++++ lib/mlib.c
+@@ -189,7 +189,7 @@ off_t buffer_write(buffer_data_t data, v
+   switch(data->type) {
+     case BUFFER_WRITE_BUF:
+       memcpy(data->data.ptr, buf, length);
+-      (char*)data->data.ptr += length;
++      data->data.ptr = ((char*) data->data.ptr) + length;
+       break;
+     case BUFFER_WRITE_VBUF:
+       varbufaddbuf((struct varbuf *)data->data.ptr, buf, length);