Import of pkgsrc-2016Q3

sysutils/bup/Makefile

@@ -1,13 +1,18 @@
-# $NetBSD: Makefile,v 1.21 2015/06/12 10:51:11 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2016/09/19 08:52:24 wiz Exp $
 
-DISTNAME=	bup-0.27
-PKGREVISION=	1
+DISTNAME=	bup-0.28.1
 CATEGORIES=	sysutils
-MASTER_SITES=	# https://github.com/bup/bup/releases/
-# doc: switch to "man" branch before downloading
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/bup/bup-man/}.zip
+MASTER_SITES=	${MASTER_SITE_GITHUB:=bup/}
+# bup has two problems that make packaging difficult.  One is that
+# building man pages requires non-portable tools (pandoc).  The other
+# is that it is hosted on github, which makes hosting tarballs
+# difficult.  The combination of this leads to having a branch "man"
+# in bup's git which has autogenerated man pages.  For now, we created
+# a bup-man tarball that contains the built man pages in a bup-man
+# directory, and host it at MASTER_SITES_LOCAL.
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/bup/bup-man/}${EXTRACT_SUFX}
 
-MAINTAINER=	wiz@NetBSD.org
+MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://github.com/bup/bup
 COMMENT=	Highly efficient file backup system based on the git packfile format
 LICENSE=	gnu-gpl-v2
@@ -17,7 +22,10 @@ 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 34 # py-fuse-bindings
+# TEST_DEPENDS
+BUILD_DEPENDS+=	rsync-[0-9]*:../../net/rsync
+
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-fuse-bindings
 
 DOCDIR=		${WRKDIR}/bup-man
 
@@ -27,60 +35,8 @@ MAKE_FLAGS+=	PREFIX=${PREFIX}
 MAKE_FLAGS+=	PYTHON=${PYTHONBIN}
 MAKE_FLAGS+=	MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
-USE_TOOLS+=		bash gmake perl
-REPLACE_PERL=		format-subst.pl wvtestrun
-REPLACE_PYTHON+=	cmd/bloom-cmd.py
-REPLACE_PYTHON+=	cmd/cat-file-cmd.py
-REPLACE_PYTHON+=	cmd/daemon-cmd.py
-REPLACE_PYTHON+=	cmd/damage-cmd.py
-REPLACE_PYTHON+=	cmd/drecurse-cmd.py
-REPLACE_PYTHON+=	cmd/fsck-cmd.py
-REPLACE_PYTHON+=	cmd/ftp-cmd.py
-REPLACE_PYTHON+=	cmd/fuse-cmd.py
-REPLACE_PYTHON+=	cmd/help-cmd.py
-REPLACE_PYTHON+=	cmd/import-duplicity-cmd.py
-REPLACE_PYTHON+=	cmd/index-cmd.py
-REPLACE_PYTHON+=	cmd/init-cmd.py
-REPLACE_PYTHON+=	cmd/join-cmd.py
-REPLACE_PYTHON+=	cmd/list-idx-cmd.py
-REPLACE_PYTHON+=	cmd/ls-cmd.py
-REPLACE_PYTHON+=	cmd/margin-cmd.py
-REPLACE_PYTHON+=	cmd/memtest-cmd.py
-REPLACE_PYTHON+=	cmd/meta-cmd.py
-REPLACE_PYTHON+=	cmd/midx-cmd.py
-REPLACE_PYTHON+=	cmd/mux-cmd.py
-REPLACE_PYTHON+=	cmd/newliner-cmd.py
-REPLACE_PYTHON+=	cmd/on--server-cmd.py
-REPLACE_PYTHON+=	cmd/on-cmd.py
-REPLACE_PYTHON+=	cmd/random-cmd.py
-REPLACE_PYTHON+=	cmd/restore-cmd.py
-REPLACE_PYTHON+=	cmd/save-cmd.py
-REPLACE_PYTHON+=	cmd/server-cmd.py
-REPLACE_PYTHON+=	cmd/split-cmd.py
-REPLACE_PYTHON+=	cmd/tag-cmd.py
-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+=	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.
+USE_TOOLS+=		bash gmake perl:run
+REPLACE_PERL+=		wvtest
 
 REPLACE_BASH+=		cmd/import-rdiff-backup-cmd.sh
 REPLACE_BASH+=		t/compare-trees
@@ -98,6 +54,8 @@ REPLACE_BASH+=		t/test-save-creates-no-unrefs.sh
 REPLACE_BASH+=		t/test.sh
 REPLACE_BASH+=		wvtest-bup.sh
 
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1 share/doc/${PKGBASE}
+
 post-install:
 	${INSTALL_DATA} ${DOCDIR}/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/DESIGN ${DESTDIR}${PREFIX}/share/doc/bup

sysutils/bup/PLIST

@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2015/04/27 09:17:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/09/18 23:02:48 gdt Exp $
 bin/bup
 lib/bup/bup/__init__.py
 lib/bup/bup/_helpers.so
-lib/bup/bup/_version.py
+lib/bup/bup/_release.py
 lib/bup/bup/bloom.py
 lib/bup/bup/client.py
 lib/bup/bup/csetup.py
@@ -19,6 +19,7 @@ lib/bup/bup/options.py
 lib/bup/bup/path.py
 lib/bup/bup/shquote.py
 lib/bup/bup/ssh.py
+lib/bup/bup/version.py
 lib/bup/bup/vfs.py
 lib/bup/bup/vint.py
 lib/bup/bup/xstat.py
@@ -30,6 +31,7 @@ lib/bup/cmd/bup-drecurse
 lib/bup/cmd/bup-fsck
 lib/bup/cmd/bup-ftp
 lib/bup/cmd/bup-fuse
+lib/bup/cmd/bup-gc
 lib/bup/cmd/bup-help
 lib/bup/cmd/bup-import-duplicity
 lib/bup/cmd/bup-import-rdiff-backup
@@ -49,6 +51,7 @@ lib/bup/cmd/bup-on
 lib/bup/cmd/bup-on--server
 lib/bup/cmd/bup-random
 lib/bup/cmd/bup-restore
+lib/bup/cmd/bup-rm
 lib/bup/cmd/bup-save
 lib/bup/cmd/bup-server
 lib/bup/cmd/bup-split
@@ -67,6 +70,7 @@ man/man1/bup-drecurse.1
 man/man1/bup-fsck.1
 man/man1/bup-ftp.1
 man/man1/bup-fuse.1
+man/man1/bup-gc.1
 man/man1/bup-help.1
 man/man1/bup-import-duplicity.1
 man/man1/bup-import-rdiff-backup.1
@@ -84,6 +88,7 @@ man/man1/bup-newliner.1
 man/man1/bup-on.1
 man/man1/bup-random.1
 man/man1/bup-restore.1
+man/man1/bup-rm.1
 man/man1/bup-save.1
 man/man1/bup-server.1
 man/man1/bup-split.1

sysutils/bup/distinfo

@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2015/04/27 09:17:17 wiz Exp $
+$NetBSD: distinfo,v 1.11 2016/09/19 08:52:24 wiz Exp $
 
-SHA1 (bup-0.27.tar.gz) = f082fcda2d60d9cdb6a788fb85c171925d2a1e28
-RMD160 (bup-0.27.tar.gz) = 52a7893008cfd99fbb7088d4f801cf9c0af27af6
-Size (bup-0.27.tar.gz) = 351733 bytes
-SHA1 (bup-man-0.27.zip) = 278b5ab581043f0a40a35a1eb30ac2200f05ff62
-RMD160 (bup-man-0.27.zip) = b6c25e55dea3f2ae9006a052c3c004e6e5cf3b0e
-Size (bup-man-0.27.zip) = 43244 bytes
-SHA1 (patch-Makefile) = 3208d663af3e5e129499282d14e10abd94f56805
-SHA1 (patch-config_configure) = 9360a8be2cef559d93f1a5301f1f397f31da7d72
+SHA1 (bup-0.28.1.tar.gz) = c280255eeb7e7a4fa9b6fbdbf4526ca7c8a40443
+RMD160 (bup-0.28.1.tar.gz) = 0a1c7c605632f9146f34ba4ed12718043e2e3c09
+SHA512 (bup-0.28.1.tar.gz) = b27a94eeee86366f9f97081611d8e0443686ed8c4070d45729ad4efe1d48ee9f528d3257bfd5d37d6243927f5b63d6b613bf5ae2c39117012979ccd5ccecf9d2
+Size (bup-0.28.1.tar.gz) = 377712 bytes
+SHA1 (bup-man-0.28.1.tar.gz) = a85ea1976862f8a0478db283a2c25898b0ec5a08
+RMD160 (bup-man-0.28.1.tar.gz) = cd165ec0c71bdafc6f536db5a40a67893fc53dcc
+SHA512 (bup-man-0.28.1.tar.gz) = ba1eb2e8392ddc685c9fbec33c2342cd21105479834bc056f485fae422a1c5eaae662dbe684e4d3ff72c0f6a2c3ab73723c895cba00b22c4156dceca39502c3c
+Size (bup-man-0.28.1.tar.gz) = 29545 bytes

sysutils/bup/patches/patch-Makefile

@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile,v 1.6 2014/09/06 21:29:45 wiz Exp $
-
-Pass PYTHON through to configure.
-
---- Makefile.orig	2013-12-20 09:43:15.000000000 +0000
-+++ Makefile
-@@ -67,7 +67,7 @@ install: all
- 
- 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 \

sysutils/bup/patches/patch-config_configure

@@ -1,15 +0,0 @@
-$NetBSD: patch-config_configure,v 1.2 2013/12/31 11:03:12 wiz Exp $
-
-Use PYTHON passed through from Makefile.
-
---- config/configure.orig	2013-11-11 08:52:33.000000000 +0000
-+++ config/configure
-@@ -42,7 +42,7 @@ if [ -z "$MAKE_VERSION" ]; then
- fi
- expr "$MAKE_VERSION" '>=' '3.81' || AC_FAIL "ERROR: $MAKE must be >= version 3.81"
- 
--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
-