Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_157139923752710"
MIME-Version: 1.0
Date: Fri, 18 Oct 2019 11:47:17 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/net/unison2.51
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
Message-Id: <20191018114717.58ED1FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_157139923752710
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	pho
Date:		Fri Oct 18 11:47:17 UTC 2019

Modified Files:
	pkgsrc/net/unison2.51: Makefile PLIST
Added Files:
	pkgsrc/net/unison2.51: ALTERNATIVES

Log Message:
Rename bin/unison to bin/unison-2.51 so it can co-exist with other versions of unison

Also add ALTERNATIVES file.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/net/unison2.51/ALTERNATIVES
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/unison2.51/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/unison2.51/PLIST

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


--_----------=_157139923752710
Content-Disposition: inline
Content-Length: 3075
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/unison2.51/Makefile
diff -u pkgsrc/net/unison2.51/Makefile:1.14 pkgsrc/net/unison2.51/Makefile:1.15
--- pkgsrc/net/unison2.51/Makefile:1.14	Sun Jul 21 22:25:35 2019
+++ pkgsrc/net/unison2.51/Makefile	Fri Oct 18 11:47:17 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2019/07/21 22:25:35 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/10/18 11:47:17 pho Exp $
 
 DISTNAME=	unison-2.51.2
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bcpierce00/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -48,16 +48,17 @@ MAKE_FLAGS+=	THREADS=true
 BUILD_TARGET=	buildexecutable
 
 INSTALLATION_DIRS=	bin
-INSTALLATION_DIRS+=	share/doc/unison
+INSTALLATION_DIRS+=	share/doc/unison-2.51
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/src/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison
-	${INSTALL_MAN} ${WRKSRC}/src/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison
-	${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
-	${INSTALL_MAN} ${WRKSRC}/src/NEWS ${DESTDIR}${PREFIX}/share/doc/unison
-	${INSTALL_MAN} ${WRKSRC}/src/README ${DESTDIR}${PREFIX}/share/doc/unison
-	${INSTALL_MAN} ${WRKSRC}/src/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison
-	${INSTALL_MAN} ${WRKSRC}/src/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison
+	${MV} ${DESTDIR}${PREFIX}/bin/unison ${DESTDIR}${PREFIX}/bin/unison-2.51
+	${INSTALL_MAN} ${WRKSRC}/src/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.51
+	${INSTALL_MAN} ${WRKSRC}/src/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison-2.51
+	${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison-2.51
+	${INSTALL_MAN} ${WRKSRC}/src/NEWS ${DESTDIR}${PREFIX}/share/doc/unison-2.51
+	${INSTALL_MAN} ${WRKSRC}/src/README ${DESTDIR}${PREFIX}/share/doc/unison-2.51
+	${INSTALL_MAN} ${WRKSRC}/src/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.51
+	${INSTALL_MAN} ${WRKSRC}/src/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.51
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/unison2.51/PLIST
diff -u pkgsrc/net/unison2.51/PLIST:1.1 pkgsrc/net/unison2.51/PLIST:1.2
--- pkgsrc/net/unison2.51/PLIST:1.1	Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/PLIST	Fri Oct 18 11:47:17 2019
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2018/04/30 10:14:29 wiz Exp $
-bin/unison
-share/doc/unison/BUGS.txt
-share/doc/unison/CONTRIB
-share/doc/unison/COPYING
-share/doc/unison/NEWS
-share/doc/unison/README
-share/doc/unison/ROADMAP.txt
-share/doc/unison/TODO.txt
+@comment $NetBSD: PLIST,v 1.2 2019/10/18 11:47:17 pho Exp $
+bin/unison-2.51
+share/doc/unison-2.51/BUGS.txt
+share/doc/unison-2.51/CONTRIB
+share/doc/unison-2.51/COPYING
+share/doc/unison-2.51/NEWS
+share/doc/unison-2.51/README
+share/doc/unison-2.51/ROADMAP.txt
+share/doc/unison-2.51/TODO.txt

Added files:

Index: pkgsrc/net/unison2.51/ALTERNATIVES
diff -u /dev/null pkgsrc/net/unison2.51/ALTERNATIVES:1.1
--- /dev/null	Fri Oct 18 11:47:17 2019
+++ pkgsrc/net/unison2.51/ALTERNATIVES	Fri Oct 18 11:47:17 2019
@@ -0,0 +1 @@
+bin/unison @PREFIX@/bin/unison-2.51


--_----------=_157139923752710--