[pkgsrc/trunk]: pkgsrc/net/unison2.51 net/unison2.51: Return to installing as...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/006cbfc6bacf
branches:  trunk
changeset: 404027:006cbfc6bacf
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Tue Nov 05 02:34:33 2019 +0000

description:
net/unison2.51: Return to installing as "unison".

The short summary is that there is now one unison package which
installs a binary named "unison".

unison has multiple branches, but upstream only maintains 2.51.
Because the wire protocol also depends (sometimes, such as in the case
of 4.08) on the ocaml version because of serialization, older unison
built with 4.08 will not interoperate with those older versions built
with earlier ocaml.  Therefore older versions in pkgsrc have no
utility, and have been removed.  (In addition, zero people commented
about using them.)

Until recently, this package used to install as "unison", as opposed
to to the 2.32, 2.40, and 2.48 packages which installed as
"unison-2.xx", because 2.51 is the standard approach and the others
were an accomodation for those interoperating with systems with old
software.  Now, with only one unison package, this is
counterproductive.  (In addition, the change to install as 2.51 was
not discussed, was objected to, and no reply comments were received.)

diffstat:

 net/unison2.51/ALTERNATIVES |   1 -
 net/unison2.51/Makefile     |  24 ++++++++++++------------
 net/unison2.51/PLIST        |  18 +++++++++---------
 3 files changed, 21 insertions(+), 22 deletions(-)

diffs (70 lines):

diff -r d8178ee265d2 -r 006cbfc6bacf net/unison2.51/ALTERNATIVES
--- a/net/unison2.51/ALTERNATIVES       Tue Nov 05 02:24:15 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-bin/unison @PREFIX@/bin/unison-2.51
diff -r d8178ee265d2 -r 006cbfc6bacf net/unison2.51/Makefile
--- a/net/unison2.51/Makefile   Tue Nov 05 02:24:15 2019 +0000
+++ b/net/unison2.51/Makefile   Tue Nov 05 02:34:33 2019 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2019/11/03 11:45:56 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/05 02:34:33 gdt Exp $
 
 # This package is "unison-2.51.x" because 2.51 is the standard
-# approach, and hence uses the bare name.
+# approach, and hence uses the bare name as the package name.  For the
+# same reason, it installs as "unison", rather than unison-X.Y.
 DISTNAME=      unison-2.51.2
-PKGREVISION=   14
+PKGREVISION=   15
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=bcpierce00/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -43,17 +44,16 @@
 BUILD_TARGET=  buildexecutable
 
 INSTALLATION_DIRS=     bin
-INSTALLATION_DIRS+=    share/doc/unison-2.51
+INSTALLATION_DIRS+=    share/doc/unison
 
 post-install:
-       ${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
+       ${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
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d8178ee265d2 -r 006cbfc6bacf net/unison2.51/PLIST
--- a/net/unison2.51/PLIST      Tue Nov 05 02:24:15 2019 +0000
+++ b/net/unison2.51/PLIST      Tue Nov 05 02:34:33 2019 +0000
@@ -1,9 +1,9 @@
-@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
+@comment $NetBSD: PLIST,v 1.3 2019/11/05 02:34:33 gdt 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