Fix broken #elif on OSX. Fix missing prototypes. Don't conflict with

libc mergesort on *BSD. Use system libtool.

6 files changed, 57 insertions, 2 deletions

diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 154f9d66744..efda75d93e8 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2013/09/13 12:41:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.78 2013/09/15 12:32:22 joerg Exp $
 
 DISTNAME=	rpm-4.11.1
 CATEGORIES=	misc
@@ -16,6 +16,7 @@ NOT_FOR_PLATFORM+=	Interix-*-* # getmntent() is nonpublic; needs porting
 
 MAKE_JOBS_SAFE=		no
 
+USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		bash:run gmake msgfmt perl:run
 GNU_CONFIGURE=		yes
diff --git a/misc/rpm/distinfo b/misc/rpm/distinfo
index 87d4239931e..c666467b44b 100644
--- a/misc/rpm/distinfo
+++ b/misc/rpm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2013/09/13 12:41:32 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2013/09/15 12:32:22 joerg Exp $
 
 SHA1 (rpm-4.11.1.tar.bz2) = 31ddc4185137ce3f718c99e91dcb040614fe820c
 RMD160 (rpm-4.11.1.tar.bz2) = 3acb73dffef60c5e98ad23d2551ebca0837c218c
@@ -7,6 +7,10 @@ SHA1 (patch-ac) = a9d4fb93a47f705b9220d886853b805f3b741ca2
 SHA1 (patch-build_rpmfc.c) = dab644d99d7ed43850443433b242d6ec16630b9c
 SHA1 (patch-cb) = c52dfaec6cf89d069f26900265d34f7ad91092f0
 SHA1 (patch-configure.ac) = c9df0915b2c9c08fd059a3c9a2c89fe25d3e194d
+SHA1 (patch-lib_backend_db3.c) = f488c10c75a000a14f3026a2de6f871892ba9222
+SHA1 (patch-lib_rpmdb__internal.h) = 39947c14f9d65c5dc91e5f5979e76800904377d4
+SHA1 (patch-lib_rpmrc.c) = cf9e1349d84dea4f60b7db574e31e14799d4e75c
+SHA1 (patch-misc_fnmatch.c) = ba5db96bb0f473d08a8fda5f32d7df455ce92208
 SHA1 (patch-misc_fts.c) = 26443c47db5e2211a926cf0f8b26b1f70475edda
 SHA1 (patch-misc_fts.h) = ec4ee0ea18f5d210eb32d9f22c90e43d2ede0c53
 SHA1 (patch-system.h) = 21336b9d2a7afbc0573ba0ce09c0849e5bef2548
diff --git a/misc/rpm/patches/patch-lib_backend_db3.c b/misc/rpm/patches/patch-lib_backend_db3.c
new file mode 100644
index 00000000000..a2033ee6c3c
--- /dev/null
+++ b/misc/rpm/patches/patch-lib_backend_db3.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_backend_db3.c,v 1.1 2013/09/15 12:32:22 joerg Exp $
+
+--- lib/backend/db3.c.orig	2013-09-14 20:59:12.000000000 +0000
++++ lib/backend/db3.c
+@@ -7,6 +7,7 @@ static int _debug = 1;	/* XXX if < 0 deb
+ #include "system.h"
+ 
+ #include <errno.h>
++#include <signal.h>
+ #include <sys/wait.h>
+ 
+ #include <rpm/rpmtypes.h>
diff --git a/misc/rpm/patches/patch-lib_rpmdb__internal.h b/misc/rpm/patches/patch-lib_rpmdb__internal.h
new file mode 100644
index 00000000000..b27eef4c37d
--- /dev/null
+++ b/misc/rpm/patches/patch-lib_rpmdb__internal.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_rpmdb__internal.h,v 1.1 2013/09/15 12:32:22 joerg Exp $
+
+--- lib/rpmdb_internal.h.orig	2013-09-14 20:58:16.000000000 +0000
++++ lib/rpmdb_internal.h
+@@ -148,7 +148,7 @@ int rpmdbPruneIterator(rpmdbMatchIterato
+ RPM_GNUC_INTERNAL
+ rpmdbMatchIterator rpmdbNewIterator(rpmdb db, rpmDbiTagVal dbitag);
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ /**
+  *  * Mergesort, same arguments as qsort(2).
+  *   */
diff --git a/misc/rpm/patches/patch-lib_rpmrc.c b/misc/rpm/patches/patch-lib_rpmrc.c
new file mode 100644
index 00000000000..980c8eef73d
--- /dev/null
+++ b/misc/rpm/patches/patch-lib_rpmrc.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_rpmrc.c,v 1.1 2013/09/15 12:32:22 joerg Exp $
+
+--- lib/rpmrc.c.orig	2013-09-14 21:00:41.000000000 +0000
++++ lib/rpmrc.c
+@@ -991,7 +991,7 @@ static void defaultMachine(const char **
+ 	else if(rstreq(un.sysname, "Darwin")) { 
+ #ifdef __ppc__
+ 	    strcpy(un.machine, "ppc");
+-#else ifdef __i386__
++#elif defined(__i386__)
+ 	    strcpy(un.machine, "i386");
+ #endif 
+ 	}
diff --git a/misc/rpm/patches/patch-misc_fnmatch.c b/misc/rpm/patches/patch-misc_fnmatch.c
new file mode 100644
index 00000000000..7d15b8dbb3b
--- /dev/null
+++ b/misc/rpm/patches/patch-misc_fnmatch.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-misc_fnmatch.c,v 1.1 2013/09/15 12:32:22 joerg Exp $
+
+--- misc/fnmatch.c.orig	2013-09-14 20:58:02.000000000 +0000
++++ misc/fnmatch.c
+@@ -17,6 +17,7 @@
+    Boston, MA 02111-1307, USA.  */
+ 
+ # include "system.h"
++#include <ctype.h>
+ # include <stdlib.h>
+ 
+ /* Find the first occurrence of C in S or the final NUL byte.  */