CVS commit: pkgsrc/net/unison

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/unison
From: "Greg Troxel" <gdt%netbsd.org@localhost>
Date: Mon, 19 Feb 2024 19:39:00 +0000

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Feb 19 19:39:00 UTC 2024

Modified Files:
        pkgsrc/net/unison: DESCR Makefile PLIST distinfo options.mk

Log Message:
net/unison: Update to 2.53.4

packaging changes:
  use upstream's 'make install'
  bin/unison is always TUI
  bin/unison-gui is GUI, but installed only if built with lablgtk

## Changes in 2.53.4

Released 2024-02-17

  * Improved and simplified makefiles. Please review your build scripts
    for changed build goals, input variables and build artifact names.
    See INSTALL.md for details.
  * opam build uses the makefile build system.
  * Various fixes in Windows and Cygwin builds.
  * Preferences "force", "prefer" and related "partial" preferences now
    work slightly differently with values "newer" and "older". Previously,
    if mtimes in both replicas were equal then always the second root
    propagated to the first root (possibly reverting user changes). It
    is now made explicit that "newer" and "older" only work when mtimes
    are different.
  * Cleanups in documentation.
  * Bugfixes, minor improvements, cleanups.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/unison/DESCR
cvs rdiff -u -r1.154 -r1.155 pkgsrc/net/unison/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/unison/PLIST pkgsrc/net/unison/options.mk
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/unison/distinfo

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.4 pkgsrc/net/unison/DESCR:1.5
--- pkgsrc/net/unison/DESCR:1.4 Tue Nov  8 01:07:09 2022
+++ pkgsrc/net/unison/DESCR     Mon Feb 19 19:39:00 2024
@@ -3,3 +3,7 @@ allows two replicas of a collection of f
 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.
+
+This package contains a snapshot of the git repository, either to
+allow bugfixes not in the latest release, or testing release
+candidates.

Index: pkgsrc/net/unison/Makefile
diff -u pkgsrc/net/unison/Makefile:1.154 pkgsrc/net/unison/Makefile:1.155
--- pkgsrc/net/unison/Makefile:1.154    Tue Nov 14 14:02:41 2023
+++ pkgsrc/net/unison/Makefile  Mon Feb 19 19:39:00 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.154 2023/11/14 14:02:41 wiz Exp $
+# $NetBSD: Makefile,v 1.155 2024/02/19 19:39:00 gdt Exp $
 
-DISTNAME=      unison-2.53.3
+DISTNAME=      unison-2.53.4
 #PKGREVISION=  0
-PKGREVISION=   4
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=bcpierce00/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -15,6 +14,8 @@ LICENSE=      gnu-gpl-v3
 
 USE_TOOLS+=    gmake bash
 MAKE_FLAGS+=   CFLAGS=""
+ALL_ENV+=      PREFIX=${PREFIX}
+ALL_ENV+=      MANDIR=${PREFIX}/man
 MAKE_ENV+=     HOME=${WRKDIR:Q}
 
 .include "../../lang/ocaml/ocaml.mk"
@@ -30,21 +31,21 @@ MAKE_FLAGS+=        NATIVE=false
 .include "options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-TEST_TARGET=           test
+# \todo
+#   add fsmonitor option, needing python and libinotify, or forcing it off
 
-INSTALLATION_DIRS=     bin
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
+# Unison does not install non-man docs
 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
+post-install:
        ${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
+       ${INSTALL_MAN} ${WRKSRC}/CONTRIBUTING.md ${DESTDIR}${PREFIX}/share/doc/unison
+       ${INSTALL_MAN} ${WRKSRC}/INSTALL.md ${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
-       ${INSTALL_MAN} ${WRKSRC}/man/unison.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       # \todo See fsmonitor above.
+       ${RM} ${DESTDIR}${PREFIX}/bin/fsmonitor.py
+
+TEST_TARGET=           test
 
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")

Index: pkgsrc/net/unison/PLIST
diff -u pkgsrc/net/unison/PLIST:1.7 pkgsrc/net/unison/PLIST:1.8
--- pkgsrc/net/unison/PLIST:1.7 Sun May  8 15:02:33 2022
+++ pkgsrc/net/unison/PLIST     Mon Feb 19 19:39:00 2024
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2022/05/08 15:02:33 gdt Exp $
+@comment $NetBSD: PLIST,v 1.8 2024/02/19 19:39:00 gdt Exp $
 bin/unison
+${PLIST.gtk3}bin/unison-gui
 man/man1/unison.1
-share/doc/unison/CONTRIB
+share/doc/unison/CONTRIBUTING.md
 share/doc/unison/COPYING
+share/doc/unison/INSTALL.md
 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 pkgsrc/net/unison/options.mk:1.7 pkgsrc/net/unison/options.mk:1.8
--- pkgsrc/net/unison/options.mk:1.7    Tue Nov  8 01:07:09 2022
+++ pkgsrc/net/unison/options.mk        Mon Feb 19 19:39:00 2024
@@ -1,16 +1,17 @@
-# $NetBSD: options.mk,v 1.7 2022/11/08 01:07:09 gdt Exp $
+# $NetBSD: options.mk,v 1.8 2024/02/19 19:39:00 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.unison
 PKG_SUPPORTED_OPTIONS= lablgtk
+# ocaml-cairo is broken
+PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mlablgtk)
-MAKE_FLAGS+=   UISTYLE=gtk3
+PLIST_VARS+=   gtk3
 
+.if !empty(PKG_OPTIONS:Mlablgtk)
+PLIST.gtk3=    yes
 DEPENDS+=      font-schumacher-misc>=1.0:../../fonts/font-schumacher-misc
 
 .include "../../x11/ocaml-lablgtk3/buildlink3.mk"
-.else
-MAKE_FLAGS+=   UISTYLE=text
 .endif

Index: pkgsrc/net/unison/distinfo
diff -u pkgsrc/net/unison/distinfo:1.38 pkgsrc/net/unison/distinfo:1.39
--- pkgsrc/net/unison/distinfo:1.38     Fri Apr 28 11:39:41 2023
+++ pkgsrc/net/unison/distinfo  Mon Feb 19 19:39:00 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.38 2023/04/28 11:39:41 gdt Exp $
+$NetBSD: distinfo,v 1.39 2024/02/19 19:39:00 gdt Exp $
 
-BLAKE2s (unison-2.53.3.tar.gz) = 5f85a04432d77294fcd8f9f873d6647891d0865aed0caf4a666260a599420afe
-SHA512 (unison-2.53.3.tar.gz) = f3fafd5e1a2950a00ed8bcc682036180ea40eff1ccfa1fc671cca49954890a535ee48faf1e8e62002563143e5479b9df1eca1db1caf03dffc50449fb467b8e2b
-Size (unison-2.53.3.tar.gz) = 1415490 bytes
+BLAKE2s (unison-2.53.4.tar.gz) = 1868083e523f71792646a0b4dfee72d764306deab6abcd6444d976948794b549
+SHA512 (unison-2.53.4.tar.gz) = 91077955aabbd919e6d6df04a704878238d745ac3693e0e41b8a37a922db4ebfceb204378ab1283303ef5ad9d80445bc8caeafad36f67b8df8c30d8b4e0c6947
+Size (unison-2.53.4.tar.gz) = 1407429 bytes

Prev by Date: CVS commit: pkgsrc/meta-pkgs/texlive-collection-langcyrillic
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/meta-pkgs/texlive-collection-langcyrillic
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index