3 files changed, 20 insertions, 55 deletions
diff --git a/sysutils/bup/patches/patch-Makefile b/sysutils/bup/patches/patch-Makefile
index 17374e36ef8..134f17cb598 100644
--- a/sysutils/bup/patches/patch-Makefile
+++ b/sysutils/bup/patches/patch-Makefile
@@ -1,13 +1,15 @@
-$NetBSD: patch-Makefile,v 1.3 2012/09/04 13:43:15 wiz Exp $
+$NetBSD: patch-Makefile,v 1.4 2013/12/31 11:03:12 wiz Exp $
 
-Remove CFLAGS override (set from pkgsrc Makefile).
+Pass PYTHON through to configure.
 
---- Makefile.orig	2011-06-09 03:24:45.000000000 +0000
+--- Makefile.orig	2013-12-04 00:39:47.000000000 +0000
 +++ Makefile
-@@ -1,5 +1,5 @@
- OS:=$(shell uname | sed 's/[-_].*//')
--CFLAGS:=-Wall -O2 -Werror $(PYINCLUDE)
-+CFLAGS+=-Wall -O2 -Werror $(PYINCLUDE)
- SOEXT:=.so
+@@ -67,7 +67,7 @@ install: all
  
- ifeq ($(OS),CYGWIN)
+ config/config.h: config/Makefile config/configure config/configure.inc \
+ 		$(wildcard config/*.in)
+-	cd config && $(MAKE) config.h
++	cd config && $(MAKE) PYTHON=$(PYTHON) config.h
+ 
+ lib/bup/_helpers$(SOEXT): \
+ 		config/config.h \
diff --git a/sysutils/bup/patches/patch-config_configure b/sysutils/bup/patches/patch-config_configure
index c6b3c2cdbc8..a2b05d9c07c 100644
--- a/sysutils/bup/patches/patch-config_configure
+++ b/sysutils/bup/patches/patch-config_configure
@@ -1,25 +1,15 @@
-$NetBSD: patch-config_configure,v 1.1 2012/09/04 13:43:15 wiz Exp $
+$NetBSD: patch-config_configure,v 1.2 2013/12/31 11:03:12 wiz Exp $
 
-Use PYTHON from environment.
-Do not check for utimensat. It is found on NetBSD even though unusable
-for now (20120827).
+Use PYTHON passed through from Makefile.
 
---- config/configure.orig	2011-06-09 03:24:45.000000000 +0000
+--- config/configure.orig	2013-11-11 08:52:33.000000000 +0000
 +++ config/configure
-@@ -30,7 +30,7 @@ expr "$MAKE_VERSION" '>=' '3.81' || AC_F
- TLOG " ok"
- 
- TLOGN "checking the python"
--PYTHON=`acLookFor python`
-+[ -n "$PYTHON" ] || PYTHON=`acLookFor python`
- if [ -z "$PYTHON" ]; then
-     AC_FAIL " Cannot find python";
+@@ -42,7 +42,7 @@ if [ -z "$MAKE_VERSION" ]; then
  fi
-@@ -59,7 +59,6 @@ AC_CHECK_HEADERS unistd.h
- AC_CHECK_HEADERS linux/fs.h
- AC_CHECK_HEADERS sys/ioctl.h
+ expr "$MAKE_VERSION" '>=' '3.81' || AC_FAIL "ERROR: $MAKE must be >= version 3.81"
  
--AC_CHECK_FUNCS utimensat 
- AC_CHECK_FUNCS utimes
- AC_CHECK_FUNCS lutimes
+-if test -z "$(bup_find_prog python '')"; then
++if test -z "$(bup_find_prog python "$PYTHON")"; then
+     AC_FAIL "ERROR: unable to find python"
+ fi
  
diff --git a/sysutils/bup/patches/patch-lib_bup_helpers.py b/sysutils/bup/patches/patch-lib_bup_helpers.py
deleted file mode 100644
index 99a460c62f3..00000000000
--- a/sysutils/bup/patches/patch-lib_bup_helpers.py
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-lib_bup_helpers.py,v 1.1 2012/09/04 13:43:15 wiz Exp $
-
-Survive empty GECOS name fields.
-Reported-by: Alper Kanat
-Tested-by: Michael Witten
-Signed-off-by: Michael Witten
----
- lib/bup/helpers.py | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
---- lib/bup/helpers.py.orig	2011-06-09 03:24:45.000000000 +0000
-+++ lib/bup/helpers.py
-@@ -231,9 +231,11 @@ def userfullname():
-     if not _userfullname:
-         uid = os.getuid()
-         try:
--            _userfullname = pwd.getpwuid(uid)[4].split(',')[0]
--        except KeyError:
--            _userfullname = 'user%d' % uid
-+            entry = pwd.getpwuid(uid)
-+            _userfullname = entry[4].split(',')[0] or entry[0]
-+        finally:
-+            if not _userfullname:
-+              _userfullname = 'user %d' % uid
-     return _userfullname
- 
-