bup-git: Adapt to upstream changes.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat Dec 19 17:52:44 2015 +0100
Changeset:	a3293e55bce9d9bf751abd9964ba22f1f59713b6

Modified Files:
	bup-git/Makefile
Removed Files:
	bup-git/distinfo
	bup-git/patches/patch-format-subst.pl

Log Message:
bup-git: Adapt to upstream changes.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a3293e55bce9d9bf751abd9964ba22f1f59713b6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bup-git/Makefile                      | 15 ++++-----------
 bup-git/distinfo                      |  3 ---
 bup-git/patches/patch-format-subst.pl | 16 ----------------
 3 files changed, 4 insertions(+), 30 deletions(-)

diffs:
diff --git a/bup-git/Makefile b/bup-git/Makefile
index 495eff2..8ae4b4e 100644
--- a/bup-git/Makefile
+++ b/bup-git/Makefile
@@ -10,6 +10,7 @@ COMMENT=	Highly efficient file backup system based on the git packfile format
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	par2-[0-9]*:../../archivers/par2
+DEPENDS+=	${PYPKGPREFIX}-fuse-bindings-[0-9]*:../../filesystems/py-fuse-bindings
 DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 DEPENDS+=	${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
 DEPENDS+=	git-base-[0-9]*:../../devel/git-base
@@ -32,17 +33,9 @@ MAKE_FLAGS+=	PYTHON=${PYTHONBIN}
 MAKE_FLAGS+=	MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 USE_TOOLS+=		bash gmake perl
-REPLACE_PERL=		format-subst.pl
-REPLACE_PYTHON+=	main.py
-REPLACE_PYTHON+=	wvtest.py
-
-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.
+#REPLACE_PERL=		format-subst.pl
+#REPLACE_PYTHON+=	main.py
+#REPLACE_PYTHON+=	wvtest.py
 
 REPLACE_BASH+=		cmd/import-rdiff-backup-cmd.sh
 REPLACE_BASH+=		config/configure
diff --git a/bup-git/distinfo b/bup-git/distinfo
deleted file mode 100644
index e060dd8..0000000
--- a/bup-git/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: distinfo,v 1.31 2015/07/15 12:53:51 thomasklausner Exp $
-
-SHA1 (patch-format-subst.pl) = 86f5a59e7680718c663878a3197f50bb071724dd
diff --git a/bup-git/patches/patch-format-subst.pl b/bup-git/patches/patch-format-subst.pl
deleted file mode 100644
index 1e532f8..0000000
--- a/bup-git/patches/patch-format-subst.pl
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-format-subst.pl,v 1.2 2015/03/09 22:36:41 thomasklausner Exp $
-
-The shallow checkouts used by pkgsrc do not have tag information,
-so git describe will always fail. Ignore the error.
-
---- format-subst.pl.orig	2015-03-09 18:56:24.000000000 +0000
-+++ format-subst.pl
-@@ -19,7 +19,7 @@ while (<>) {
-     s{
- 	\$Format:\%d\$
-     }{
--	my $tag = fix(ex('git describe --always --match="[0-9]*"'));
-+	my $tag = fix('git describe --always --match="[0-9]*"');
- 	"(tag: bup-$tag)"
-     }ex;
-