CVS commit: pkgsrc/misc/dpkg

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri May 22 01:24:36 UTC 2020

Modified Files:
        pkgsrc/misc/dpkg: Makefile distinfo
Added Files:
        pkgsrc/misc/dpkg/patches: patch-lib_dpkg_libdpkg.map
            patch-src_Makefile.in

Log Message:
Fix various build issues.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/misc/dpkg/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/misc/dpkg/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/dpkg/patches/patch-lib_dpkg_libdpkg.map \
    pkgsrc/misc/dpkg/patches/patch-src_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/dpkg/Makefile
diff -u pkgsrc/misc/dpkg/Makefile:1.49 pkgsrc/misc/dpkg/Makefile:1.50
--- pkgsrc/misc/dpkg/Makefile:1.49      Sat Apr 11 11:53:42 2020
+++ pkgsrc/misc/dpkg/Makefile   Fri May 22 01:24:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2020/04/11 11:53:42 adam Exp $
+# $NetBSD: Makefile,v 1.50 2020/05/22 01:24:36 joerg Exp $
 
 DISTNAME=      dpkg_1.20.0
 PKGNAME=       ${DISTNAME:S/_/-/}
@@ -25,6 +25,7 @@ USE_TOOLS+=           gmake msgfmt perl:run gtar:
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-admindir=${VARBASE}/db/dpkg
 CONFIGURE_ARGS+=       --sysconfdir=${PREFIX}/share/dpkg
+CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS.Darwin+=        --enable-linker-optimizations=no
 CONFIGURE_ENV+=                PATCH=${PREFIX}/bin/gpatch
 TEST_TARGET=           check
@@ -32,6 +33,8 @@ INCOMPAT_CURSES+=     NetBSD-[0-5].*-*
 
 REPLACE_PERL=          scripts/*.pl
 
+CONFIGURE_ARGS+=       DPKG_DEVEL_MODE=1
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/misc/dpkg/distinfo
diff -u pkgsrc/misc/dpkg/distinfo:1.15 pkgsrc/misc/dpkg/distinfo:1.16
--- pkgsrc/misc/dpkg/distinfo:1.15      Sat Apr 11 11:53:43 2020
+++ pkgsrc/misc/dpkg/distinfo   Fri May 22 01:24:36 2020
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.15 2020/04/11 11:53:43 adam Exp $
+$NetBSD: distinfo,v 1.16 2020/05/22 01:24:36 joerg Exp $
 
 SHA1 (dpkg_1.20.0.tar.xz) = eda82352ba507bc7d7749b44579983ace07064c8
 RMD160 (dpkg_1.20.0.tar.xz) = e0a2ca3232723d4e0927e6ae1a7f92648cc917da
 SHA512 (dpkg_1.20.0.tar.xz) = 5dd7961bde19ccc891fd5b77ca0085f7fc0308c20380e20b393397ff92e50d1c0f54e7b57676c05876021b44aa3788af8258c21ff2b672110ac92c7ce0b408f9
 Size (dpkg_1.20.0.tar.xz) = 4738556 bytes
+SHA1 (patch-lib_dpkg_libdpkg.map) = f2cf79ab4aa0bbe834a1d8d7183d08b7f6829fb3
+SHA1 (patch-src_Makefile.in) = 24e1ab4dcb73268ba84eec1072d813b5f0b7adf9
 SHA1 (patch-utils_start-stop-daemon.c) = 7927b364851b039e44279157aa783afde4508af9

Added files:

Index: pkgsrc/misc/dpkg/patches/patch-lib_dpkg_libdpkg.map
diff -u /dev/null pkgsrc/misc/dpkg/patches/patch-lib_dpkg_libdpkg.map:1.1
--- /dev/null   Fri May 22 01:24:36 2020
+++ pkgsrc/misc/dpkg/patches/patch-lib_dpkg_libdpkg.map Fri May 22 01:24:36 2020
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_dpkg_libdpkg.map,v 1.1 2020/05/22 01:24:36 joerg Exp $
+
+--- lib/dpkg/libdpkg.map.orig  2020-05-22 00:11:43.620737999 +0000
++++ lib/dpkg/libdpkg.map
+@@ -353,6 +353,7 @@ LIBDPKG_PRIVATE {
+       pkg_format_parse;
+       pkg_format_show;
+       pkg_format_free;
++      pkg_format_needs_db_fsys;
+ 
+       # Package specifiers
+       pkg_spec_is_illegal;
Index: pkgsrc/misc/dpkg/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/misc/dpkg/patches/patch-src_Makefile.in:1.1
--- /dev/null   Fri May 22 01:24:36 2020
+++ pkgsrc/misc/dpkg/patches/patch-src_Makefile.in      Fri May 22 01:24:36 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2020/05/22 01:24:36 joerg Exp $
+
+For the obstack support
+
+--- src/Makefile.in.orig       2020-05-22 00:13:15.779186497 +0000
++++ src/Makefile.in
+@@ -430,6 +430,7 @@ AM_CPPFLAGS = \
+ 
+ LDADD = \
+       ../lib/dpkg/libdpkg.la \
++      ../lib/compat/libcompat.la \
+       $(LIBINTL)
+ 
+ EXTRA_DIST = \