Remove unnecessary REPLACE_PYTHON lines and patch.

Add perl to run-time depends, at least one subcommand uses it.
(should perhaps be replaced, it's just for stat())
Fix path to REPLACE_PERL files.
Add rsync to BUILD_DEPENDS, it's needed for some tests.

3 files changed, 7 insertions, 67 deletions

diff --git a/sysutils/bup/Makefile b/sysutils/bup/Makefile
index 3f98d0ccf96..5f20f53f34b 100644
--- a/sysutils/bup/Makefile
+++ b/sysutils/bup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/09/18 23:02:48 gdt Exp $
+# $NetBSD: Makefile,v 1.27 2016/09/19 08:52:24 wiz Exp $
 
 DISTNAME=	bup-0.28.1
 CATEGORIES=	sysutils
@@ -22,6 +22,9 @@ DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 DEPENDS+=	${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
 DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 
+# TEST_DEPENDS
+BUILD_DEPENDS+=	rsync-[0-9]*:../../net/rsync
+
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-fuse-bindings
 
 DOCDIR=		${WRKDIR}/bup-man
@@ -32,55 +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
-
-# In 0.28.1, there is "bup-python" which calls the python found by
-# configure.  Arguably many of these are no longer necessary.
-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
+USE_TOOLS+=		bash gmake perl:run
+REPLACE_PERL+=		wvtest
 
 REPLACE_BASH+=		cmd/import-rdiff-backup-cmd.sh
 REPLACE_BASH+=		t/compare-trees
diff --git a/sysutils/bup/distinfo b/sysutils/bup/distinfo
index 4878b5de882..d69461d558b 100644
--- a/sysutils/bup/distinfo
+++ b/sysutils/bup/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2016/09/18 23:02:48 gdt Exp $
+$NetBSD: distinfo,v 1.11 2016/09/19 08:52:24 wiz Exp $
 
 SHA1 (bup-0.28.1.tar.gz) = c280255eeb7e7a4fa9b6fbdbf4526ca7c8a40443
 RMD160 (bup-0.28.1.tar.gz) = 0a1c7c605632f9146f34ba4ed12718043e2e3c09
@@ -8,4 +8,3 @@ 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
-SHA1 (patch-Makefile) = ed60fc2bfcd6aeb885895eeee7ae48bf779ca13a
diff --git a/sysutils/bup/patches/patch-Makefile b/sysutils/bup/patches/patch-Makefile
deleted file mode 100644
index 03180dcddf6..00000000000
--- a/sysutils/bup/patches/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile,v 1.7 2016/09/18 23:02:48 gdt Exp $
-
-Pass PYTHON through to configure.
-
---- Makefile.orig	2016-06-12 16:19:26.000000000 +0000
-+++ Makefile
-@@ -44,7 +44,7 @@ initial_setup := $(call shout,$(initial_
- 
- config/config.vars: configure config/configure config/configure.inc \
-   $(wildcard config/*.in)
--	MAKE="$(MAKE)" ./configure
-+	MAKE="$(MAKE)" PYTHON=$(PYTHON) ./configure
- 
- bup_cmds := cmd/bup-python\
-   $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \