Import of pkgsrc-2015Q1

sysutils/bup/Makefile

@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2014/03/19 17:50:00 gdt Exp $
+# $NetBSD: Makefile,v 1.19 2014/09/06 21:29:45 wiz Exp $
 
-DISTNAME=	bup-0.25
-PKGREVISION=	3
+DISTNAME=	bup-0.26
 CATEGORIES=	sysutils
-MASTER_SITES=	# manually packaged since master site is git repository
-# and only available via https
-# https://github.com/bup/bup/releases/
+MASTER_SITES=	# https://github.com/bup/bup/releases/
 # doc tarball: switch to "man" branch before downloading
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/bup/bup-man/}.zip
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/bup/bup-man/}${EXTRACT_SUFX}
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://github.com/bup/bup
@@ -16,11 +13,12 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	par2-[0-9]*:../../archivers/par2
 DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
+DEPENDS+=	${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
 DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-fuse-bindings
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-fuse-bindings
 
-DOCDIR=		${WRKDIR}/bup-man
+DOCDIR=		${WRKDIR}/bup-0.26
 
 TEST_TARGET=	test
 
@@ -62,37 +60,23 @@ REPLACE_PYTHON+=	cmd/tick-cmd.py
 REPLACE_PYTHON+=	cmd/version-cmd.py
 REPLACE_PYTHON+=	cmd/web-cmd.py
 REPLACE_PYTHON+=	cmd/xstat-cmd.py
-REPLACE_PYTHON+=	lib/tornado/__init__.py
-REPLACE_PYTHON+=	lib/tornado/auth.py
-REPLACE_PYTHON+=	lib/tornado/autoreload.py
-REPLACE_PYTHON+=	lib/tornado/database.py
-REPLACE_PYTHON+=	lib/tornado/escape.py
-REPLACE_PYTHON+=	lib/tornado/httpclient.py
-REPLACE_PYTHON+=	lib/tornado/httpserver.py
-REPLACE_PYTHON+=	lib/tornado/httputil.py
-REPLACE_PYTHON+=	lib/tornado/ioloop.py
-REPLACE_PYTHON+=	lib/tornado/iostream.py
-REPLACE_PYTHON+=	lib/tornado/locale.py
-REPLACE_PYTHON+=	lib/tornado/options.py
-REPLACE_PYTHON+=	lib/tornado/s3server.py
-REPLACE_PYTHON+=	lib/tornado/template.py
-REPLACE_PYTHON+=	lib/tornado/test/test_ioloop.py
-REPLACE_PYTHON+=	lib/tornado/web.py
-REPLACE_PYTHON+=	lib/tornado/websocket.py
-REPLACE_PYTHON+=	lib/tornado/wsgi.py
 REPLACE_PYTHON+=	main.py
 REPLACE_PYTHON+=	wvtest.py
 
+REPLACE_PYTHON+=	t/cleanup-mounts-under
 REPLACE_PYTHON+=	t/hardlink-sets
 REPLACE_PYTHON+=	t/id-other-than
 REPLACE_PYTHON+=	t/mksock
+REPLACE_PYTHON+=	t/ns-timestamp-resolutions
 REPLACE_PYTHON+=	t/root-status
+REPLACE_PYTHON+=	t/test-ls.sh
 REPLACE_PYTHON+=	t/unknown-owner
 
 SUBST_CLASSES+=		python-c
 SUBST_SED.python-c+=	-e 's,python -c,${PYTHONBIN} -c,'
 SUBST_STAGE.python-c=	pre-configure
 SUBST_FILES.python-c+=	t/lib.sh
+SUBST_FILES.python-c+=	t/test-ls.sh
 SUBST_FILES.python-c+=	t/test-meta.sh
 SUBST_MESSAGE.python-c=	Fixing python executable in tests.
 

sysutils/bup/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/12/31 11:03:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/09/06 21:29:45 wiz Exp $
 bin/bup
 lib/bup/bup/__init__.py
 lib/bup/bup/_helpers.so
@@ -56,24 +56,6 @@ lib/bup/cmd/bup-tick
 lib/bup/cmd/bup-version
 lib/bup/cmd/bup-web
 lib/bup/cmd/bup-xstat
-lib/bup/tornado/__init__.py
-lib/bup/tornado/auth.py
-lib/bup/tornado/autoreload.py
-lib/bup/tornado/database.py
-lib/bup/tornado/escape.py
-lib/bup/tornado/httpclient.py
-lib/bup/tornado/httpserver.py
-lib/bup/tornado/httputil.py
-lib/bup/tornado/ioloop.py
-lib/bup/tornado/iostream.py
-lib/bup/tornado/locale.py
-lib/bup/tornado/options.py
-lib/bup/tornado/s3server.py
-lib/bup/tornado/template.py
-lib/bup/tornado/web.py
-lib/bup/tornado/websocket.py
-lib/bup/tornado/win32_support.py
-lib/bup/tornado/wsgi.py
 lib/bup/web/list-directory.html
 lib/bup/web/static/styles.css
 man/man1/bup-bloom.1

sysutils/bup/distinfo

@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.6 2014/03/19 17:50:00 gdt Exp $
+$NetBSD: distinfo,v 1.7 2014/09/06 21:29:45 wiz Exp $
 
-SHA1 (bup-0.25.tar.gz) = f32ba39582d0e8875632f282c54f7377ed2a4df9
-RMD160 (bup-0.25.tar.gz) = d578dc87330c49090c25a212d6c5fe4561c8ad0c
-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) = b37a1f2d584c987430e948c5c04d97def8a5334c
+SHA1 (bup-0.26.tar.gz) = 86e636818590fe40e1074c67545bb74de6e8306b
+RMD160 (bup-0.26.tar.gz) = 206d301677a359b3e904e89d5a12e82829d12565
+Size (bup-0.26.tar.gz) = 342754 bytes
+SHA1 (bup-man-0.26.tar.gz) = 17dc3136b56cd7427c1668681f86565e42ff1a74
+RMD160 (bup-man-0.26.tar.gz) = ff8cfc15609134055c651679ad7b6609a3959c23
+Size (bup-man-0.26.tar.gz) = 4410896 bytes
+SHA1 (patch-Makefile) = 3208d663af3e5e129499282d14e10abd94f56805
 SHA1 (patch-config_configure) = 9360a8be2cef559d93f1a5301f1f397f31da7d72
-SHA1 (patch-lib_bup___helpers.c) = df146a325e4ca912552f09176a605c26267cfe8b

sysutils/bup/patches/patch-Makefile

@@ -1,16 +1,9 @@
-$NetBSD: patch-Makefile,v 1.5 2014/03/19 13:15:13 gdt Exp $
+$NetBSD: patch-Makefile,v 1.6 2014/09/06 21:29:45 wiz Exp $
 
 Pass PYTHON through to configure.
 
---- Makefile.orig	2013-12-10 01:30:45.000000000 +0000
+--- Makefile.orig	2013-12-20 09:43:15.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 \

sysutils/bup/patches/patch-lib_bup___helpers.c

@@ -1,51 +0,0 @@
-$NetBSD: patch-lib_bup___helpers.c,v 1.2 2014/03/19 17:50:00 gdt Exp $
-
-First and third hunks are from upstream.
-
-Second hunk is to work around broken utimensat in NetBSD 6.
-Should be applied upstream.
-
---- 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)
- {
-@@ -763,6 +765,14 @@ static PyObject *bup_set_linux_file_attr
- #endif /* def BUP_HAVE_FILE_ATTRS */
- 
- 
-+/*
-+ * Check for defective UTIMENSAT support (NetBSD 6), and if so,
-+ * pretend we don't have it.
-+ */
-+#if !defined(AT_FDCWD) || !defined(AT_SYMLINK_NOFOLLOW)
-+#undef HAVE_UTIMENSAT
-+#endif
-+
- #if defined(HAVE_UTIMENSAT) || defined(HAVE_FUTIMES) || defined(HAVE_LUTIMES)
- 
- static int bup_parse_xutime_args(char **path,
-@@ -990,6 +1000,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 +1041,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)
- {