Update to 1.20130710. From the changelog:

* The package is renamed to myrepos. It Provides mr, so can still
  be installed by that name. The mr command is not renamed.
* Add make install rule. Thanks, v4hn

4 files changed, 48 insertions, 22 deletions

diff --git a/devel/mr/Makefile b/devel/mr/Makefile
index 0742a3993cd..2a30f1f4314 100644
--- a/devel/mr/Makefile
+++ b/devel/mr/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2013/05/31 12:40:01 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2013/07/15 19:47:42 schmonz Exp $
 #
 
-DISTNAME=		mr_1.15
+DISTNAME=		myrepos_1.20130710
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		1
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/m/mr/}
+MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/m/myrepos/}
 
 MAINTAINER=		schmonz@NetBSD.org
-HOMEPAGE=		http://kitenet.net/~joey/code/mr/
+HOMEPAGE=		http://myrepos.branchable.com/
 COMMENT=		Treat multiple repositories as one combined repository
 LICENSE=		gnu-gpl-v2
 
@@ -16,27 +15,21 @@ DEPENDS+=		p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=		p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 DEPENDS+=		p5-ack-[0-9]*:../../textproc/p5-ack
 
-NO_BUILD=		yes
-
 WRKSRC=			${WRKDIR}/${PKGBASE}
 USE_LANGUAGES=		# none
 
+BUILD_TARGET+=		build
+TEST_TARGET+=		test
 USE_TOOLS+=		perl:run
 
 REPLACE_PERL+=  	mr webcheckout
 
-EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-SHAREDIR=		${PREFIX}/share/${PKGBASE}
-INSTALLATION_DIRS=	bin ${EGDIR} ${SHAREDIR}
+EGDIR=			${PREFIX}/share/examples/mr
+INSTALLATION_DIRS=	bin ${PKGMANDIR} ${EGDIR}
 
-do-install:
+post-install:
 	set -e; cd ${WRKSRC};						\
 	${INSTALL_DATA} mrconfig ${DESTDIR}${EGDIR};			\
-	${INSTALL_DATA} mrconfig.complex ${DESTDIR}${EGDIR};		\
-	for i in lib/*; do						\
-	${INSTALL_DATA} $${i} ${DESTDIR}${SHAREDIR};			\
-	done;								\
-	${INSTALL_SCRIPT} mr ${DESTDIR}${PREFIX}/bin;			\
-	${INSTALL_SCRIPT} webcheckout ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} mrconfig.complex ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/mr/PLIST b/devel/mr/PLIST
index 93afa956907..b56ee4cc46e 100644
--- a/devel/mr/PLIST
+++ b/devel/mr/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2013/05/05 20:43:42 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/07/15 19:47:42 schmonz Exp $
 bin/mr
 bin/webcheckout
+man/man1/mr.1
+man/man1/webcheckout.1
 share/examples/mr/mrconfig
 share/examples/mr/mrconfig.complex
 share/mr/git-fake-bare
diff --git a/devel/mr/distinfo b/devel/mr/distinfo
index 8a00d015c81..a17155bb242 100644
--- a/devel/mr/distinfo
+++ b/devel/mr/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2013/05/05 20:43:42 schmonz Exp $
+$NetBSD: distinfo,v 1.11 2013/07/15 19:47:42 schmonz Exp $
 
-SHA1 (mr_1.15.tar.gz) = 663b709887fcada5ffea4d52f38d8d45503f9f79
-RMD160 (mr_1.15.tar.gz) = 3574ac983c68879f8fd1e04e1addbbd9d202fba4
-Size (mr_1.15.tar.gz) = 40028 bytes
+SHA1 (myrepos_1.20130710.tar.gz) = 0916a46b7e488ef671f131bc804b292d3d18a97e
+RMD160 (myrepos_1.20130710.tar.gz) = a51164d059e1d84b8f5a26dd0378049a8781f9f4
+Size (myrepos_1.20130710.tar.gz) = 42425 bytes
+SHA1 (patch-Makefile) = 621d99130490700bc6cd7ac776f98251fa609bae
 SHA1 (patch-mr) = 9e53c78cda93e39fb91ced9f83144b4ac138ea32
diff --git a/devel/mr/patches/patch-Makefile b/devel/mr/patches/patch-Makefile
new file mode 100644
index 00000000000..8ed4a4ac80f
--- /dev/null
+++ b/devel/mr/patches/patch-Makefile
@@ -0,0 +1,30 @@
+$NetBSD: patch-Makefile,v 1.1 2013/07/15 19:47:42 schmonz Exp $
+
+Use pkgsrc paths.
+
+--- Makefile.orig	2013-07-05 17:35:32.000000000 +0000
++++ Makefile
+@@ -1,4 +1,4 @@
+-PREFIX:=/usr
++# PREFIX:=/usr
+ 
+ mans=mr.1 webcheckout.1
+ 
+@@ -17,14 +17,14 @@ test:
+ 
+ install: build
+ 	install -d ${DESTDIR}${PREFIX}/bin
+-	install -d ${DESTDIR}${PREFIX}/share/man/man1
++	install -d ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+ 	install -d ${DESTDIR}${PREFIX}/share/mr
+ 
+ 	install -m0755 mr ${DESTDIR}${PREFIX}/bin/
+ 	install -m0755 webcheckout ${DESTDIR}${PREFIX}/bin/
+ 
+-	install -m0644 mr.1 ${DESTDIR}${PREFIX}/share/man/man1/
+-	install -m0644 webcheckout.1 ${DESTDIR}${PREFIX}/share/man/man1/
++	install -m0644 mr.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
++	install -m0644 webcheckout.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+ 
+ 	install -m0644 lib/* ${DESTDIR}${PREFIX}/share/mr/
+