[pkgsrc/trunk]: pkgsrc/net/unison net/unison: Update to 2.53.0

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/unison net/unison: Update to 2.53.0
From: gdt <gdt%pkgsrc.org@localhost>
Date: Tue, 08 Nov 2022 03:02:33 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d8bb4242d071
branches:  trunk
changeset: 387812:d8bb4242d071
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Tue Nov 08 01:07:09 2022 +0000

description:
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.

diffstat:

 net/unison/DESCR                      |  10 +++++-----
 net/unison/Makefile                   |   8 +++-----
 net/unison/distinfo                   |   9 ++++-----
 net/unison/options.mk                 |   7 +++----
 net/unison/patches/patch-src_Makefile |  34 ----------------------------------
 5 files changed, 15 insertions(+), 53 deletions(-)

diffs (113 lines):

diff -r 08692566b99b -r d8bb4242d071 net/unison/DESCR
--- a/net/unison/DESCR  Tue Nov 08 00:36:56 2022 +0000
+++ b/net/unison/DESCR  Tue Nov 08 01:07:09 2022 +0000
@@ -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.
diff -r 08692566b99b -r d8bb4242d071 net/unison/Makefile
--- a/net/unison/Makefile       Tue Nov 08 00:36:56 2022 +0000
+++ b/net/unison/Makefile       Tue Nov 08 01:07:09 2022 +0000
@@ -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 @@
 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"
 
diff -r 08692566b99b -r d8bb4242d071 net/unison/distinfo
--- a/net/unison/distinfo       Tue Nov 08 00:36:56 2022 +0000
+++ b/net/unison/distinfo       Tue Nov 08 01:07:09 2022 +0000
@@ -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
diff -r 08692566b99b -r d8bb4242d071 net/unison/options.mk
--- a/net/unison/options.mk     Tue Nov 08 00:36:56 2022 +0000
+++ b/net/unison/options.mk     Tue Nov 08 01:07:09 2022 +0000
@@ -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 @@
 .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
diff -r 08692566b99b -r d8bb4242d071 net/unison/patches/patch-src_Makefile
--- a/net/unison/patches/patch-src_Makefile     Tue Nov 08 00:36:56 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-src_Makefile,v 1.4 2022/03/13 15:20:13 gdt Exp $
-
-\todo: Figure out why these changes exist and file upstream
-
---- 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

Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated net/unison to 2.53.0
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/py-immutabledict py-immutabledict: updated to 2.2.3
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated net/unison to 2.53.0
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/py-immutabledict py-immutabledict: updated to 2.2.3
Indexes:

Home | Main Index | Thread Index | Old Index