Add patch from upstream to avoid failures due to clang warnings.

Resolves failure to build on OS X 10.9.

ok wiz@ (as MAINTAINER).

4 files changed, 45 insertions, 6 deletions

diff --git a/sysutils/bup/Makefile b/sysutils/bup/Makefile
index da8bcb4a3bb..f2ed31db7bc 100644
--- a/sysutils/bup/Makefile
+++ b/sysutils/bup/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2014/03/19 12:54:02 gdt Exp $
+# $NetBSD: Makefile,v 1.15 2014/03/19 13:15:13 gdt Exp $
 
 DISTNAME=	bup-0.25
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	# manually packaged since master site is git repository
 # and only available via https
diff --git a/sysutils/bup/distinfo b/sysutils/bup/distinfo
index a5d62b9b277..ea99b4957bb 100644
--- a/sysutils/bup/distinfo
+++ b/sysutils/bup/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2013/12/31 11:03:12 wiz Exp $
+$NetBSD: distinfo,v 1.5 2014/03/19 13:15:13 gdt Exp $
 
 SHA1 (bup-0.25.tar.gz) = f32ba39582d0e8875632f282c54f7377ed2a4df9
 RMD160 (bup-0.25.tar.gz) = d578dc87330c49090c25a212d6c5fe4561c8ad0c
@@ -6,5 +6,6 @@ Size (bup-0.25.tar.gz) = 399332 bytes
 SHA1 (bup-man-0.25.zip) = cd76ad005e85aa568d95b9c2938d2716e3b03365
 RMD160 (bup-man-0.25.zip) = 8d023cc394ae006ec1a24924176d72a52208558f
 Size (bup-man-0.25.zip) = 40779 bytes
-SHA1 (patch-Makefile) = e2e9962ef3bfa7cf73e5fd601ef3c628b07b7e3a
+SHA1 (patch-Makefile) = b37a1f2d584c987430e948c5c04d97def8a5334c
 SHA1 (patch-config_configure) = 9360a8be2cef559d93f1a5301f1f397f31da7d72
+SHA1 (patch-lib_bup___helpers.c) = e803ede14d59d28b97f11bfe5d1536ddc21b999f
diff --git a/sysutils/bup/patches/patch-Makefile b/sysutils/bup/patches/patch-Makefile
index 134f17cb598..0d61c622d8c 100644
--- a/sysutils/bup/patches/patch-Makefile
+++ b/sysutils/bup/patches/patch-Makefile
@@ -1,9 +1,16 @@
-$NetBSD: patch-Makefile,v 1.4 2013/12/31 11:03:12 wiz Exp $
+$NetBSD: patch-Makefile,v 1.5 2014/03/19 13:15:13 gdt Exp $
 
 Pass PYTHON through to configure.
 
---- Makefile.orig	2013-12-04 00:39:47.000000000 +0000
+--- Makefile.orig	2013-12-10 01:30:45.000000000 +0000
 +++ Makefile
+@@ -1,5 +1,5 @@
+ OS:=$(shell uname | sed 's/[-_].*//')
+-CFLAGS := -Wall -O2 -Werror $(PYINCLUDE) $(CFLAGS)
++CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
+ SOEXT:=.so
+ 
+ ifeq ($(OS),CYGWIN)
 @@ -67,7 +67,7 @@ install: all
  
  config/config.h: config/Makefile config/configure config/configure.inc \
diff --git a/sysutils/bup/patches/patch-lib_bup___helpers.c b/sysutils/bup/patches/patch-lib_bup___helpers.c
new file mode 100644
index 00000000000..a0bb6235d11
--- /dev/null
+++ b/sysutils/bup/patches/patch-lib_bup___helpers.c
@@ -0,0 +1,31 @@
+$NetBSD: patch-lib_bup___helpers.c,v 1.1 2014/03/19 13:15:13 gdt Exp $
+
+--- lib/bup/_helpers.c.orig	2013-12-10 01:30:45.000000000 +0000
++++ lib/bup/_helpers.c
+@@ -96,6 +96,8 @@ static void unpythonize_argv(void)
+ 
+ #endif // not __WIN32__ or __CYGWIN__
+ 
++// At the moment any code that calls INTGER_TO_PY() will have to
++// disable -Wtautological-compare for clang.  See below.
+ 
+ static PyObject *selftest(PyObject *self, PyObject *args)
+ {
+@@ -990,6 +992,9 @@ static int normalize_timespec_values(con
+     (((x) >= 0) ? PyLong_FromUnsignedLongLong(x) : PyLong_FromLongLong(x))
+ 
+ 
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wtautological-compare" // For INTEGER_TO_PY().
++
+ static PyObject *stat_struct_to_py(const struct stat *st,
+                                    const char *filename,
+                                    int fd)
+@@ -1028,6 +1033,7 @@ static PyObject *stat_struct_to_py(const
+                          (long) ctime_ns);
+ }
+ 
++#pragma clang diagnostic pop  // ignored "-Wtautological-compare"
+ 
+ static PyObject *bup_stat(PyObject *self, PyObject *args)
+ {