CVS commit: pkgsrc/net/unison

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Nov  8 01:07:09 UTC 2022

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

Log Message:
net/unison: Update to 2.53.0

Change to lablgkt3.
Drop MAKE_JOBS_SAFE because the issue was fixed upstream.

## Changes in 2.53.0

Released 2022-11-07

  * OCaml >= 4.08 is required to build unison.
  * unison can be built with (unreleased) OCaml 5.
  * Change GUI to use GTK3 (via lablgtk3) instead of GTK2 (via lablgtk2)
  * Add support for syncing extended attributes.
  * Add support for syncing ACLs.
  * On Windows, add the ability to build unison as a hybrid
    application (GUI application attached to a text console) by
    defining UI_WINOS=hybrid (see src/Makefile).  Add this to CI.
    (Doing this for non-Windows is unnecessary as all applications,
    both GUI and non-GUI, are always executed with a connection to
    stdout/stderr. GUI-only applications (ie, no stdout/stderr) is a
    Windows-only concept.)
  * Notable bugfixes
    - Merge results are stored in archive more accurately.
    - Windows `\\?\` paths now work correctly (including `\\?\Volume{GUID}\` paths).
  * CI changes
    - The macOS binaries are properly signed.
    - Add workaround for bugs in the github CI Windows builds, one of
      which resulted in the 2.52.1 GUI version failing, in the Windows
      CI build artifacts.  (This does not affect platforms other than
      Windows, and may not affect other Windows builds.)
  * Changes that should not affect behavior
    - Clean up a variety of unmaintained and unused bits, mainly
      build-related.
    - OCaml's Unix library is now extensively used also on
      Windows. This allowed removal of large amount of
      Windows-specific OCaml and mainly C code.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/unison/DESCR
cvs rdiff -u -r1.142 -r1.143 pkgsrc/net/unison/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/unison/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/unison/options.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/net/unison/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/unison/DESCR
diff -u pkgsrc/net/unison/DESCR:1.3 pkgsrc/net/unison/DESCR:1.4
--- pkgsrc/net/unison/DESCR:1.3 Sun Mar 13 15:07:13 2022
+++ pkgsrc/net/unison/DESCR     Tue Nov  8 01:07:09 2022
@@ -1,5 +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.
+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 pkgsrc/net/unison/Makefile:1.142 pkgsrc/net/unison/Makefile:1.143
--- pkgsrc/net/unison/Makefile:1.142    Wed Aug 17 20:28:37 2022
+++ pkgsrc/net/unison/Makefile  Tue Nov  8 01:07:09 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.142 2022/08/17 20:28:37 wiz Exp $
+# $NetBSD: Makefile,v 1.143 2022/11/08 01:07:09 gdt Exp $
 
-DISTNAME=      unison-2.52.1
-PKGREVISION=   1
+DISTNAME=      unison-2.53.0
+#PKGREVISION=  0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=bcpierce00/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -15,8 +15,6 @@ LICENSE=      gnu-gpl-v3
 USE_TOOLS+=    gmake bash
 MAKE_FLAGS+=   CFLAGS=""
 MAKE_ENV+=     HOME=${WRKDIR:Q}
-# https://github.com/bcpierce00/unison/issues/774
-MAKE_JOBS_SAFE=        no
 
 .include "../../lang/ocaml/ocaml.mk"
 

Index: pkgsrc/net/unison/distinfo
diff -u pkgsrc/net/unison/distinfo:1.34 pkgsrc/net/unison/distinfo:1.35
--- pkgsrc/net/unison/distinfo:1.34     Sun May  8 15:02:33 2022
+++ pkgsrc/net/unison/distinfo  Tue Nov  8 01:07:09 2022
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.34 2022/05/08 15:02:33 gdt Exp $
+$NetBSD: distinfo,v 1.35 2022/11/08 01:07:09 gdt Exp $
 
-BLAKE2s (unison-2.52.1.tar.gz) = 1e84eba3381f984ddd0c39b73d42d108b37a5fd731aced466fcce7f75fae9146
-SHA512 (unison-2.52.1.tar.gz) = 6b1b44ffb9c1f6373e7250b28c08c26dfc4281ff750f64155872317e1b98fce40fb3adf16ad89ebe0d033c93254c048c8b7d641163219642bfea9b4bb37c9e0a
-Size (unison-2.52.1.tar.gz) = 1360920 bytes
-SHA1 (patch-src_Makefile) = 0a453634bacf03516192128ad653446a3b760537
+BLAKE2s (unison-2.53.0.tar.gz) = 244eecda17852fd742fcddbeadd170e1df3beb88697ff8e619cebb4db53310ce
+SHA512 (unison-2.53.0.tar.gz) = 041398eeb3f5f67f80767cbfc8f1ff1561eb9433735cf3225fbb11bce9a6c068057a2dc749539d5e95a45a8d2fa475563729cf5acc2de1185bd0ecb8f98c17f1
+Size (unison-2.53.0.tar.gz) = 1387266 bytes

Index: pkgsrc/net/unison/options.mk
diff -u pkgsrc/net/unison/options.mk:1.6 pkgsrc/net/unison/options.mk:1.7
--- pkgsrc/net/unison/options.mk:1.6    Sun Mar 13 15:07:13 2022
+++ pkgsrc/net/unison/options.mk        Tue Nov  8 01:07:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2022/03/13 15:07:13 gdt Exp $
+# $NetBSD: options.mk,v 1.7 2022/11/08 01:07:09 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.unison
 PKG_SUPPORTED_OPTIONS= lablgtk
@@ -6,12 +6,11 @@ PKG_SUPPORTED_OPTIONS=        lablgtk
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mlablgtk)
-MAKE_FLAGS+=   UISTYLE=gtk2
+MAKE_FLAGS+=   UISTYLE=gtk3
 
 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"
+.include "../../x11/ocaml-lablgtk3/buildlink3.mk"
 .else
 MAKE_FLAGS+=   UISTYLE=text
 .endif