4 files changed, 61 insertions, 50 deletions
diff --git a/sysutils/bup/patches/patch-Makefile b/sysutils/bup/patches/patch-Makefile
index a1f86453e56..17374e36ef8 100644
--- a/sysutils/bup/patches/patch-Makefile
+++ b/sysutils/bup/patches/patch-Makefile
@@ -1,25 +1,13 @@
-$NetBSD: patch-Makefile,v 1.2 2011/05/31 12:01:18 wiz Exp $
+$NetBSD: patch-Makefile,v 1.3 2012/09/04 13:43:15 wiz Exp $
 
-Install into PREFIX, and remove PYTHON override (set from pkgsrc Makefile).
+Remove CFLAGS override (set from pkgsrc Makefile).
 
---- Makefile.orig	2011-03-20 07:40:42.000000000 +0000
+--- Makefile.orig	2011-06-09 03:24:45.000000000 +0000
 +++ Makefile
-@@ -15,13 +15,12 @@ bup: lib/bup/_version.py lib/bup/_helper
- Documentation/all: bup
+@@ -1,5 +1,5 @@
+ OS:=$(shell uname | sed 's/[-_].*//')
+-CFLAGS:=-Wall -O2 -Werror $(PYINCLUDE)
++CFLAGS+=-Wall -O2 -Werror $(PYINCLUDE)
+ SOEXT:=.so
  
- INSTALL=install
--PYTHON=python
--MANDIR=$(DESTDIR)/usr/share/man
--DOCDIR=$(DESTDIR)/usr/share/doc/bup
--BINDIR=$(DESTDIR)/usr/bin
--LIBDIR=$(DESTDIR)/usr/lib/bup
-+MANDIR=$(DESTDIR)$(PREFIX)/man
-+DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/bup
-+BINDIR=$(DESTDIR)$(PREFIX)/bin
-+LIBDIR=$(DESTDIR)$(PREFIX)/lib/bup
- install: all
--	$(INSTALL) -d $(MANDIR)/man1 $(DOCDIR) $(BINDIR) \
-+	$(INSTALL) -d $(BINDIR) \
- 		$(LIBDIR)/bup $(LIBDIR)/cmd $(LIBDIR)/tornado \
- 		$(LIBDIR)/web $(LIBDIR)/web/static
- 	[ ! -e Documentation/.docs-available ] || \
+ ifeq ($(OS),CYGWIN)
diff --git a/sysutils/bup/patches/patch-config_configure b/sysutils/bup/patches/patch-config_configure
new file mode 100644
index 00000000000..c6b3c2cdbc8
--- /dev/null
+++ b/sysutils/bup/patches/patch-config_configure
@@ -0,0 +1,25 @@
+$NetBSD: patch-config_configure,v 1.1 2012/09/04 13:43:15 wiz Exp $
+
+Use PYTHON from environment.
+Do not check for utimensat. It is found on NetBSD even though unusable
+for now (20120827).
+
+--- config/configure.orig	2011-06-09 03:24:45.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";
+ fi
+@@ -59,7 +59,6 @@ AC_CHECK_HEADERS unistd.h
+ AC_CHECK_HEADERS linux/fs.h
+ AC_CHECK_HEADERS sys/ioctl.h
+ 
+-AC_CHECK_FUNCS utimensat 
+ AC_CHECK_FUNCS utimes
+ AC_CHECK_FUNCS lutimes
+ 
diff --git a/sysutils/bup/patches/patch-lib_bup_helpers.py b/sysutils/bup/patches/patch-lib_bup_helpers.py
new file mode 100644
index 00000000000..99a460c62f3
--- /dev/null
+++ b/sysutils/bup/patches/patch-lib_bup_helpers.py
@@ -0,0 +1,27 @@
+$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
+ 
+ 
diff --git a/sysutils/bup/patches/patch-lib_bup_t_tgit.py b/sysutils/bup/patches/patch-lib_bup_t_tgit.py
deleted file mode 100644
index cb17eca1837..00000000000
--- a/sysutils/bup/patches/patch-lib_bup_t_tgit.py
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-lib_bup_t_tgit.py,v 1.1.1.1 2011/05/16 13:52:56 wiz Exp $
-
-Fix test case, from upstream git.
-
---- lib/bup/t/tgit.py.orig	2011-05-12 16:51:44.000000000 +0000
-+++ lib/bup/t/tgit.py
-@@ -145,17 +145,18 @@ def test_long_index():
- @wvtest
- def test_check_repo_or_die():
-     git.check_repo_or_die()
--    WVPASS('check_repo_or_die')  # if we reach this point the call above passed
-+    WVPASS('check_repo_or_die') # if we reach this point the call above passed
- 
--    mode = os.stat('pybuptest.tmp').st_mode
--    os.chmod('pybuptest.tmp', 0000)
-+    os.rename('pybuptest.tmp/objects/pack', 'pybuptest.tmp/objects/pack.tmp')
-+    open('pybuptest.tmp/objects/pack', 'w').close()
-     try:
-         git.check_repo_or_die()
-     except SystemExit, e:
-         WVPASSEQ(e.code, 14)
-     else:
-         WVFAIL()
--    os.chmod('pybuptest.tmp', mode)
-+    os.unlink('pybuptest.tmp/objects/pack')
-+    os.rename('pybuptest.tmp/objects/pack.tmp', 'pybuptest.tmp/objects/pack')
- 
-     try:
-         git.check_repo_or_die('nonexistantbup.tmp')