Import of pkgsrc-2013Q2

sysutils/bup/patches/patch-Makefile

@@ -0,0 +1,13 @@
+$NetBSD: patch-Makefile,v 1.3 2012/09/04 13:43:15 wiz Exp $
+
+Remove CFLAGS override (set from pkgsrc Makefile).
+
+--- Makefile.orig	2011-06-09 03:24:45.000000000 +0000
++++ Makefile
+@@ -1,5 +1,5 @@
+ OS:=$(shell uname | sed 's/[-_].*//')
+-CFLAGS:=-Wall -O2 -Werror $(PYINCLUDE)
++CFLAGS+=-Wall -O2 -Werror $(PYINCLUDE)
+ SOEXT:=.so
+ 
+ ifeq ($(OS),CYGWIN)

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
+ 

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
+ 
+