Tue Nov 5 02:34:33 2019 UTC ()
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.)


(gdt)
diff -r1.1 -r0 pkgsrc/net/unison2.51/ALTERNATIVES
diff -r1.18 -r1.19 pkgsrc/net/unison2.51/Makefile
diff -r1.2 -r1.3 pkgsrc/net/unison2.51/PLIST
File Deleted: pkgsrc/net/unison2.51/Attic/ALTERNATIVES
cvs diff -r1.18 -r1.19 pkgsrc/net/unison2.51/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/unison2.51/Attic/Makefile 2019/11/03 11:45:56 1.18
+++ pkgsrc/net/unison2.51/Attic/Makefile 2019/11/05 02:34:33 1.19
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.18 2019/11/03 11:45:56 rillig Exp $ 1# $NetBSD: Makefile,v 1.19 2019/11/05 02:34:33 gdt Exp $
2 2
3# This package is "unison-2.51.x" because 2.51 is the standard 3# This package is "unison-2.51.x" because 2.51 is the standard
4# approach, and hence uses the bare name. 4# approach, and hence uses the bare name as the package name. For the
 5# same reason, it installs as "unison", rather than unison-X.Y.
5DISTNAME= unison-2.51.2 6DISTNAME= unison-2.51.2
6PKGREVISION= 14 7PKGREVISION= 15
7CATEGORIES= net 8CATEGORIES= net
8MASTER_SITES= ${MASTER_SITE_GITHUB:=bcpierce00/} 9MASTER_SITES= ${MASTER_SITE_GITHUB:=bcpierce00/}
9GITHUB_TAG= v${PKGVERSION_NOREV} 10GITHUB_TAG= v${PKGVERSION_NOREV}
10 11
11MAINTAINER= gdt@NetBSD.org 12MAINTAINER= gdt@NetBSD.org
12HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/ 13HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
13COMMENT= File-synchronization tool 14COMMENT= File-synchronization tool
14LICENSE= gnu-gpl-v3 15LICENSE= gnu-gpl-v3
15 16
16# File "/data/scratch/net/unison/work/src/fswatch.mli", line 18, characters 17-29: 17# File "/data/scratch/net/unison/work/src/fswatch.mli", line 18, characters 17-29:
17# Error: Unbound module Prefs 18# Error: Unbound module Prefs
18#MAKE_JOBS_SAFE= no 19#MAKE_JOBS_SAFE= no
19 20
@@ -33,27 +34,26 @@ MAKE_FLAGS+= NATIVE=true @@ -33,27 +34,26 @@ MAKE_FLAGS+= NATIVE=true
33.else 34.else
34MAKE_FLAGS+= NATIVE=false 35MAKE_FLAGS+= NATIVE=false
35.endif 36.endif
36 37
37.include "../../mk/pthread.buildlink3.mk" 38.include "../../mk/pthread.buildlink3.mk"
38 39
39.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none") 40.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
40MAKE_FLAGS+= THREADS=true 41MAKE_FLAGS+= THREADS=true
41.endif 42.endif
42 43
43BUILD_TARGET= buildexecutable 44BUILD_TARGET= buildexecutable
44 45
45INSTALLATION_DIRS= bin 46INSTALLATION_DIRS= bin
46INSTALLATION_DIRS+= share/doc/unison-2.51 47INSTALLATION_DIRS+= share/doc/unison
47 48
48post-install: 49post-install:
49 ${MV} ${DESTDIR}${PREFIX}/bin/unison ${DESTDIR}${PREFIX}/bin/unison-2.51 50 ${INSTALL_MAN} ${WRKSRC}/src/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison
50 ${INSTALL_MAN} ${WRKSRC}/src/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.51 51 ${INSTALL_MAN} ${WRKSRC}/src/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison
51 ${INSTALL_MAN} ${WRKSRC}/src/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison-2.51 52 ${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
52 ${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison-2.51 53 ${INSTALL_MAN} ${WRKSRC}/src/NEWS ${DESTDIR}${PREFIX}/share/doc/unison
53 ${INSTALL_MAN} ${WRKSRC}/src/NEWS ${DESTDIR}${PREFIX}/share/doc/unison-2.51 54 ${INSTALL_MAN} ${WRKSRC}/src/README ${DESTDIR}${PREFIX}/share/doc/unison
54 ${INSTALL_MAN} ${WRKSRC}/src/README ${DESTDIR}${PREFIX}/share/doc/unison-2.51 55 ${INSTALL_MAN} ${WRKSRC}/src/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison
55 ${INSTALL_MAN} ${WRKSRC}/src/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.51 56 ${INSTALL_MAN} ${WRKSRC}/src/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison
56 ${INSTALL_MAN} ${WRKSRC}/src/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison-2.51 
57 57
58.include "../../lang/ocaml/buildlink3.mk" 58.include "../../lang/ocaml/buildlink3.mk"
59.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/net/unison2.51/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/net/unison2.51/Attic/PLIST 2019/10/18 11:47:17 1.2
+++ pkgsrc/net/unison2.51/Attic/PLIST 2019/11/05 02:34:33 1.3
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1@comment $NetBSD: PLIST,v 1.2 2019/10/18 11:47:17 pho Exp $ 1@comment $NetBSD: PLIST,v 1.3 2019/11/05 02:34:33 gdt Exp $
2bin/unison-2.51 2bin/unison
3share/doc/unison-2.51/BUGS.txt 3share/doc/unison/BUGS.txt
4share/doc/unison-2.51/CONTRIB 4share/doc/unison/CONTRIB
5share/doc/unison-2.51/COPYING 5share/doc/unison/COPYING
6share/doc/unison-2.51/NEWS 6share/doc/unison/NEWS
7share/doc/unison-2.51/README 7share/doc/unison/README
8share/doc/unison-2.51/ROADMAP.txt 8share/doc/unison/ROADMAP.txt
9share/doc/unison-2.51/TODO.txt 9share/doc/unison/TODO.txt