bup-git: Remove some workarounds

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

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Dec 14 13:35:57 2015 +0100
Changeset:	8e8caa4282c409c27417cc36c59b13f86f88e2e5

Modified Files:
	bup-git/Makefile
	bup-git/distinfo
Removed Files:
	bup-git/patches/patch-Makefile

Log Message:
bup-git: Remove some workarounds

now upstream handles python executable better.

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

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

diffstat:
 bup-git/Makefile               | 42 ------------------------------------------
 bup-git/distinfo               |  1 -
 bup-git/patches/patch-Makefile | 15 ---------------
 3 files changed, 58 deletions(-)

diffs:
diff --git a/bup-git/Makefile b/bup-git/Makefile
index 4904674..495eff2 100644
--- a/bup-git/Makefile
+++ b/bup-git/Makefile
@@ -33,51 +33,9 @@ MAKE_FLAGS+=	MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 USE_TOOLS+=		bash gmake perl
 REPLACE_PERL=		format-subst.pl
-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
diff --git a/bup-git/distinfo b/bup-git/distinfo
index 3155010..e060dd8 100644
--- a/bup-git/distinfo
+++ b/bup-git/distinfo
@@ -1,4 +1,3 @@
 $NetBSD: distinfo,v 1.31 2015/07/15 12:53:51 thomasklausner Exp $
 
-SHA1 (patch-Makefile) = 3208d663af3e5e129499282d14e10abd94f56805
 SHA1 (patch-format-subst.pl) = 86f5a59e7680718c663878a3197f50bb071724dd
diff --git a/bup-git/patches/patch-Makefile b/bup-git/patches/patch-Makefile
deleted file mode 100644
index 1af6c06..0000000
--- a/bup-git/patches/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile,v 1.4 2013/12/21 12:46:43 thomasklausner 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 \