CVS commit: pkgsrc/net

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Mar 13 15:07:13 UTC 2022

Modified Files:
        pkgsrc/net: Makefile
Added Files:
        pkgsrc/net/unison: DESCR Makefile PLIST distinfo options.mk
        pkgsrc/net/unison/patches: patch-src_Makefile
Removed Files:
        pkgsrc/net/unison2.51: DESCR Makefile PLIST distinfo options.mk
        pkgsrc/net/unison2.51/patches: patch-src_Makefile

Log Message:
net/unison*: Rename unison2.51 to unison

During the 2.51 branch, upstream decided that unison will have
backwards compatibility, so that there is no longer any reason to run
old versions.  With 2.52, not only can it interop with 2.51 (and
2.48!), but it does not need to have matching ocaml version when
interoperating with other 2.52.x or newer.  Thus, unison will now have
a single version in pkgsrc, and this is expected to continue.


To generate a diff of this commit:
cvs rdiff -u -r1.1445 -r1.1446 pkgsrc/net/Makefile
cvs rdiff -u -r0 -r1.3 pkgsrc/net/unison/DESCR
cvs rdiff -u -r0 -r1.136 pkgsrc/net/unison/Makefile
cvs rdiff -u -r0 -r1.6 pkgsrc/net/unison/PLIST pkgsrc/net/unison/options.mk
cvs rdiff -u -r0 -r1.32 pkgsrc/net/unison/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/net/unison/patches/patch-src_Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/net/unison2.51/DESCR
cvs rdiff -u -r1.40 -r0 pkgsrc/net/unison2.51/Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/net/unison2.51/PLIST
cvs rdiff -u -r1.11 -r0 pkgsrc/net/unison2.51/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/net/unison2.51/options.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/net/unison2.51/patches/patch-src_Makefile

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

Modified files:

Index: pkgsrc/net/Makefile
diff -u pkgsrc/net/Makefile:1.1445 pkgsrc/net/Makefile:1.1446
--- pkgsrc/net/Makefile:1.1445  Wed Feb 23 16:57:13 2022
+++ pkgsrc/net/Makefile Sun Mar 13 15:07:13 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1445 2022/02/23 16:57:13 pho Exp $
+# $NetBSD: Makefile,v 1.1446 2022/03/13 15:07:13 gdt Exp $
 #
 
 COMMENT=       Networking tools
@@ -979,8 +979,8 @@ SUBDIR+=    uftp
 SUBDIR+=       unbound
 SUBDIR+=       unfs3
 SUBDIR+=       unifi
+SUBDIR+=       unison
 SUBDIR+=       unison-snapshot
-SUBDIR+=       unison2.51
 SUBDIR+=       unworkable
 SUBDIR+=       upclient
 SUBDIR+=       upnpinspector

Added files:

Index: pkgsrc/net/unison/DESCR
diff -u /dev/null pkgsrc/net/unison/DESCR:1.3
--- /dev/null   Sun Mar 13 15:07:13 2022
+++ pkgsrc/net/unison/DESCR     Sun Mar 13 15:07:13 2022
@@ -0,0 +1,5 @@
+Unison is a file-synchronization tool for Unix and Windows. It allows
+two replicas of a collection of files and directories to be stored
+on different hosts (or different disks on the same host), modified
+separately, and then brought up to date by propagating the changes
+in each replica to the other.

Index: pkgsrc/net/unison/Makefile
diff -u /dev/null pkgsrc/net/unison/Makefile:1.136
--- /dev/null   Sun Mar 13 15:07:13 2022
+++ pkgsrc/net/unison/Makefile  Sun Mar 13 15:07:13 2022
@@ -0,0 +1,51 @@
+       # $NetBSD: Makefile,v 1.136 2022/03/13 15:07:13 gdt Exp $
+
+DISTNAME=      unison-2.52.0
+#PKGREVISION=  0
+CATEGORIES=    net
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=bcpierce00/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
+
+MAINTAINER=    gdt%NetBSD.org@localhost
+HOMEPAGE=      https://www.cis.upenn.edu/~bcpierce/unison/
+COMMENT=       File-synchronization tool
+LICENSE=       gnu-gpl-v3
+
+USE_TOOLS+=    gmake bash
+MAKE_FLAGS+=   CFLAGS=""
+MAKE_ENV+=     HOME=${WRKDIR:Q}
+
+.include "../../mk/ocaml.mk"
+
+.if (${OCAML_USE_OPT_COMPILER} == "yes")
+MAKE_FLAGS+=   NATIVE=true
+.else
+MAKE_FLAGS+=   NATIVE=false
+.endif
+
+# bsd.prefs.mk, included also by options, must be after ocaml to get
+# _PKGSRC_MKPIE set correctly.
+.include "options.mk"
+.include "../../mk/bsd.prefs.mk"
+
+TEST_TARGET=           test
+
+INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS+=    share/doc/unison
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/unison ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/src/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison
+       ${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
+       ${INSTALL_MAN} ${WRKSRC}/NEWS.md ${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 "../../mk/pthread.buildlink3.mk"
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
+MAKE_FLAGS+=   THREADS=true
+.endif
+
+.include "../../lang/ocaml/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/unison/PLIST
diff -u /dev/null pkgsrc/net/unison/PLIST:1.6
--- /dev/null   Sun Mar 13 15:07:13 2022
+++ pkgsrc/net/unison/PLIST     Sun Mar 13 15:07:13 2022
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST,v 1.6 2022/03/13 15:07:13 gdt Exp $
+bin/unison
+share/doc/unison/CONTRIB
+share/doc/unison/COPYING
+share/doc/unison/NEWS.md
+share/doc/unison/README
+share/doc/unison/ROADMAP.txt
+share/doc/unison/TODO.txt
Index: pkgsrc/net/unison/options.mk
diff -u /dev/null pkgsrc/net/unison/options.mk:1.6
--- /dev/null   Sun Mar 13 15:07:13 2022
+++ pkgsrc/net/unison/options.mk        Sun Mar 13 15:07:13 2022
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.6 2022/03/13 15:07:13 gdt Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.unison
+PKG_SUPPORTED_OPTIONS= lablgtk
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mlablgtk)
+MAKE_FLAGS+=   UISTYLE=gtk2
+
+DEPENDS+=      font-schumacher-misc>=1.0:../../fonts/font-schumacher-misc
+
+BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.16.0
+.include "../../x11/ocaml-lablgtk/buildlink3.mk"
+.else
+MAKE_FLAGS+=   UISTYLE=text
+.endif

Index: pkgsrc/net/unison/distinfo
diff -u /dev/null pkgsrc/net/unison/distinfo:1.32
--- /dev/null   Sun Mar 13 15:07:13 2022
+++ pkgsrc/net/unison/distinfo  Sun Mar 13 15:07:13 2022
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.32 2022/03/13 15:07:13 gdt Exp $
+
+BLAKE2s (unison-2.52.0.tar.gz) = 59129fa38b89e23e2defdb7163754153b497d828a69c5d7f6695465d002390fe
+SHA512 (unison-2.52.0.tar.gz) = 24cfb43b40a05f85164c43e8744216142db4cd74d9d09ba7178f25f794b0dcce252597fa1eb49a4133e63d891c8d23fd7472669cf9f52777bc6aa86b0a50e6f5
+Size (unison-2.52.0.tar.gz) = 1354200 bytes
+SHA1 (patch-src_Makefile) = ff73628825232b9494844c020b78d2978f753d07

Index: pkgsrc/net/unison/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/net/unison/patches/patch-src_Makefile:1.3
--- /dev/null   Sun Mar 13 15:07:13 2022
+++ pkgsrc/net/unison/patches/patch-src_Makefile        Sun Mar 13 15:07:13 2022
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_Makefile,v 1.3 2022/03/13 15:07:13 gdt Exp $
+
+Correct installation procedure
+--- src/Makefile.orig  2020-10-18 12:56:47.000000000 +0000
++++ src/Makefile
+@@ -49,7 +49,7 @@ all:: INSTALL
+ 
+ INSTALL: $(NAME)$(EXEC_EXT)
+ # file isn't made for OS X, so check that it's there first
+-      (if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi)
++##    (if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi)
+ 
+ ########################################################################
+ ## Miscellaneous developer-only switches
+@@ -68,7 +68,7 @@ include Makefile.OCaml
+ ######################################################################
+ # Installation
+ 
+-INSTALLDIR = $(HOME)/bin/
++INSTALLDIR = ${DESTDIR}$(PREFIX)/bin/
+ 
+ # This has two names because on OSX the file INSTALL shadows the target 'install'!
+ install: doinstall
+@@ -86,9 +86,7 @@ doinstall: buildexecutable
+           echo "makefile variable NAME not bound"; \
+           exit 1 \
+         ; fi
+-      -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
+       cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
+-      cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
+ 
+ ######################################################################
+ # Demo