Date: Sat, 28 Feb 2026 14:20:53 +0000 From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 21d10b6f8e1d - main - net/unison240: Remove expired port Message-ID: <69a2f9c5.253ad.1b330522@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=21d10b6f8e1d4294bdfeea1ea6c1bd08de1f0ed1 commit 21d10b6f8e1d4294bdfeea1ea6c1bd08de1f0ed1 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2026-02-28 14:20:48 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2026-02-28 14:20:48 +0000 net/unison240: Remove expired port 2026-02-28 net/unison240: Legacy release unsupported by upstream --- MOVED | 1 + net/Makefile | 1 - net/unison240/Makefile | 93 ---------------- net/unison240/distinfo | 3 - net/unison240/files/patch-Makefile.OCaml | 38 ------- net/unison240/files/patch-hash__compat.c | 168 ----------------------------- net/unison240/files/patch-mkProjectInfo.ml | 11 -- net/unison240/files/patch-ocaml8 | 52 --------- net/unison240/files/patch-uigtk2.ml | 17 --- net/unison240/files/patch-uutil.ml | 11 -- net/unison240/files/unison.desktop.in | 12 --- net/unison240/pkg-descr | 9 -- net/unison240/pkg-message | 8 -- net/unison240/pkg-message.nox11 | 7 -- net/unison240/pkg-plist | 7 -- 15 files changed, 1 insertion(+), 437 deletions(-) diff --git a/MOVED b/MOVED index 2e6299399e64..0e6aab452645 100644 --- a/MOVED +++ b/MOVED @@ -5156,3 +5156,4 @@ graphics/imlib2-jxl|graphics/imlib2|2026-02-28|Has expired: jxl support is handl graphics/imlib2-webp|graphics/imlib2|2026-02-28|Has expired: webp support is handled by graphics/imlib2 and it is enabled by default devel/godot35|devel/godot|2026-02-28|Has expired: Legacy version should have been removed with devel/godot35-tools, consider migrating to devel/godot www/nginx-vts-exporter|www/nginx-prometheus-exporter|2026-02-28|Has expired: Upstream is unmaintained; use www/nginx-prometheus-exporter instead +net/unison240||2026-02-28|Has expired: Legacy release unsupported by upstream diff --git a/net/Makefile b/net/Makefile index 74797b5532d4..796bd645faa4 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1645,7 +1645,6 @@ SUBDIR += ulxmlrpcpp SUBDIR += unfs3 SUBDIR += unison - SUBDIR += unison240 SUBDIR += unison248 SUBDIR += unison251 SUBDIR += unix2tcp diff --git a/net/unison240/Makefile b/net/unison240/Makefile deleted file mode 100644 index dcd1f225dca3..000000000000 --- a/net/unison240/Makefile +++ /dev/null @@ -1,93 +0,0 @@ -PORTNAME= unison -PORTVERSION= 2.40.128 -PORTREVISION= 8 -CATEGORIES= net - -MAINTAINER= madpilot@FreeBSD.org -COMMENT= User-level file synchronization tool -WWW= https://www.cis.upenn.edu/~bcpierce/unison/ - -LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING - -VERSIONSUFFIX= 240 - -DEPRECATED= Legacy release unsupported by upstream -EXPIRATION_DATE= 2026-02-28 - -FLAVORS= x11 nox11 -FLAVOR?= ${FLAVORS:[1]} - -nox11_PKGNAMESUFFIX= ${VERSIONSUFFIX}-nox11 -nox11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX} - -x11_PKGNAMESUFFIX= ${VERSIONSUFFIX} -x11_BUILD_DEPENDS= icotool:graphics/icoutils \ - lablgtk2:x11-toolkits/ocaml-lablgtk2 -x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 -x11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX}-nox11 -USES= gmake ocaml:build -USE_GITHUB= yes -GH_ACCOUNT= bcpierce00 -GH_TAGNAME= 2.40 - -MAKE_ARGS= CFLAGS="" -ALL_TARGET= unison all -TEST_TARGET= selftest - -DOCS= BUGS.txt NEWS README -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} - -WRKSRC_SUBDIR= src - -PLIST_SUB= PORTVERSION=${PORTVERSION} \ - VERSIONSUFFIX=${VERSIONSUFFIX} - -.if ${FLAVOR} == nox11 -MAKE_ARGS+= UISTYLE=text -PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 -PLIST_SUB+= X11="@comment " -.else -MAKE_ARGS+= UISTYLE=gtk2 -SUB_FILES= ${PORTNAME}.desktop -USE_GNOME+= atk cairo gdkpixbuf glib20 gtk20 pango -USES+= gettext-runtime gnome -PLIST_SUB+= X11="" -.endif - -OPTIONS_DEFINE= DOCS - -.include <bsd.port.options.mk> - -.if ${ARCH} == powerpc -USE_BINUTILS= yes -.endif - -pre-patch: -# BCP 5/16: Eta-expand for backward compatibility with OCaml >4.02 - @${REINPLACE_CMD} -e 's,= Unix\.symlink,s1 s2 & s1 s2,' \ - ${WRKSRC}/system/system_generic.ml - -post-build: - (cd ${WRKSRC} && HOME=${WRKSRC} ./unison -selftest -ui text -batch) -.if ${FLAVOR} == x11 - @${ECHO} Building text-only version - @${ECHO} ${WRKSRC} - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} CFLAGS="" UISTYLE=text NAME=unison-text - @cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${VERSIONSUFFIX} -.if ${FLAVOR} == x11 - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${VERSIONSUFFIX}-text - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}${VERSIONSUFFIX}.desktop - ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${VERSIONSUFFIX}.png -.endif - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/net/unison240/distinfo b/net/unison240/distinfo deleted file mode 100644 index 4a61c58373ca..000000000000 --- a/net/unison240/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1763914825 -SHA256 (bcpierce00-unison-2.40.128-2.40_GH0.tar.gz) = 7e8ed59b1ceacc67fdfb5c585dbefd12cb81d8da8b338ac3e105867553b135cd -SIZE (bcpierce00-unison-2.40.128-2.40_GH0.tar.gz) = 3438271 diff --git a/net/unison240/files/patch-Makefile.OCaml b/net/unison240/files/patch-Makefile.OCaml deleted file mode 100644 index 624f4afe967d..000000000000 --- a/net/unison240/files/patch-Makefile.OCaml +++ /dev/null @@ -1,38 +0,0 @@ ---- Makefile.OCaml.orig 2014-12-30 02:21:28 UTC -+++ Makefile.OCaml -@@ -72,7 +72,7 @@ LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk - # This should be set to an appropriate value automatically, depending - # on whether the lablgtk library is available - LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk --LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk2 -+LABLGTK2LIB=$(OCAMLLIBDIR)/site-lib/lablgtk2 - ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well - ## at the moment and we don't want to confuse people by building it by default - ifeq ($(OSARCH),osx) -@@ -91,7 +91,7 @@ INCLFLAGS=-I lwt -I ubase -I system - ### Default parameters - - INCLFLAGS=-I lwt -I ubase -I system --CAMLFLAGS+=$(INCLFLAGS) -+CAMLFLAGS+=$(INCLFLAGS) -unsafe-string - CAMLFLAGS+=-I system/$(SYSTEM) -I lwt/$(SYSTEM) - - ifeq ($(OSARCH),win32) -@@ -233,7 +233,7 @@ OCAMLLIBS+=unix.cma str.cma bigarray.cma - # File extensions will be substituted for the native code version - OCAMLLIBS+=unix.cma str.cma bigarray.cma - --COBJS+=osxsupport$(OBJ_EXT) pty$(OBJ_EXT) bytearray_stubs$(OBJ_EXT) -+COBJS+=osxsupport$(OBJ_EXT) pty$(OBJ_EXT) bytearray_stubs$(OBJ_EXT) hash_compat$(OBJ_EXT) - - ######################################################################## - ### User Interface setup -@@ -292,7 +292,7 @@ ifeq ($(UISTYLE), gtk2) - - # Gtk2 GUI - ifeq ($(UISTYLE), gtk2) -- CAMLFLAGS+=-I +lablgtk2 -+ CAMLFLAGS+=-I +site-lib/lablgtk2 - OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo - OCAMLLIBS+=lablgtk.cma - endif diff --git a/net/unison240/files/patch-hash__compat.c b/net/unison240/files/patch-hash__compat.c deleted file mode 100644 index ba746e41d22b..000000000000 --- a/net/unison240/files/patch-hash__compat.c +++ /dev/null @@ -1,168 +0,0 @@ ---- hash_compat.c.orig 2024-02-06 20:29:47 UTC -+++ hash_compat.c -@@ -0,0 +1,165 @@ -+/* The pre-OCaml 4.00 hash implementation */ -+/* FIXME: This is included for backwards compatibility only and must be -+ * REMOVED when a new hash function included in a stable release has been -+ * available for a few years. The removal of this function will break -+ * Unison version compatibility. There must be plenty of time given -+ * for users to upgrade (most users don't compile themselves and are at -+ * mercy of whatever package repositories they use). */ -+ -+/* Code copied from OCaml sources */ -+/**************************************************************************/ -+/* */ -+/* OCaml */ -+/* */ -+/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */ -+/* */ -+/* Copyright 1996 Institut National de Recherche en Informatique et */ -+/* en Automatique. */ -+/* */ -+/* All rights reserved. This file is distributed under the terms of */ -+/* the GNU Lesser General Public License version 2.1, with the */ -+/* special exception on linking described in the file LICENSE. */ -+/* */ -+/**************************************************************************/ -+ -+#include <caml/mlvalues.h> -+#include <caml/custom.h> -+#include <caml/address_class.h> -+ -+struct hash_state { -+ uintnat accu; -+ intnat univ_limit, univ_count; -+}; -+ -+static void hash_aux(struct hash_state*, value obj); -+ -+CAMLprim value unsn_hash_univ_param(value count, value limit, value obj) -+{ -+ struct hash_state h; -+ h.univ_limit = Long_val(limit); -+ h.univ_count = Long_val(count); -+ h.accu = 0; -+ hash_aux(&h, obj); -+ return Val_long(h.accu & 0x3FFFFFFF); -+ /* The & has two purposes: ensure that the return value is positive -+ and give the same result on 32 bit and 64 bit architectures. */ -+} -+ -+#define Alpha 65599 -+#define Beta 19 -+#define Combine(new) (h->accu = h->accu * Alpha + (new)) -+#define Combine_small(new) (h->accu = h->accu * Beta + (new)) -+ -+static void hash_aux(struct hash_state* h, value obj) -+{ -+ unsigned char * p; -+ mlsize_t i, j; -+ tag_t tag; -+ -+ h->univ_limit--; -+ if (h->univ_count < 0 || h->univ_limit < 0) return; -+ -+ again: -+ if (Is_long(obj)) { -+ h->univ_count--; -+ Combine(Long_val(obj)); -+ return; -+ } -+ if (! Is_in_value_area(obj)) { -+ /* obj is a pointer outside the heap, to an object with -+ a priori unknown structure. Use its physical address as hash key. */ -+ Combine((intnat) obj); -+ return; -+ } -+ /* Pointers into the heap are well-structured blocks. So are atoms. -+ We can inspect the block contents. */ -+ /* The code needs reindenting later. Leaving as is to facilitate review. */ -+ tag = Tag_val(obj); -+ switch (tag) { -+ case String_tag: -+ h->univ_count--; -+ i = caml_string_length(obj); -+ for (p = &Byte_u(obj, 0); i > 0; i--, p++) -+ Combine_small(*p); -+ break; -+ case Double_tag: -+ /* For doubles, we inspect their binary representation, LSB first. -+ The results are consistent among all platforms with IEEE floats. */ -+ h->univ_count--; -+#ifdef ARCH_BIG_ENDIAN -+ for (p = &Byte_u(obj, sizeof(double) - 1), i = sizeof(double); -+ i > 0; -+ p--, i--) -+#else -+ for (p = &Byte_u(obj, 0), i = sizeof(double); -+ i > 0; -+ p++, i--) -+#endif -+ Combine_small(*p); -+ break; -+ case Double_array_tag: -+ h->univ_count--; -+ for (j = 0; j < Bosize_val(obj); j += sizeof(double)) { -+#ifdef ARCH_BIG_ENDIAN -+ for (p = &Byte_u(obj, j + sizeof(double) - 1), i = sizeof(double); -+ i > 0; -+ p--, i--) -+#else -+ for (p = &Byte_u(obj, j), i = sizeof(double); -+ i > 0; -+ p++, i--) -+#endif -+ Combine_small(*p); -+ } -+ break; -+ case Abstract_tag: -+ /* We don't know anything about the contents of the block. -+ Better do nothing. */ -+ break; -+ case Infix_tag: -+ hash_aux(h, obj - Infix_offset_val(obj)); -+ break; -+ case Forward_tag: -+ obj = Forward_val (obj); -+ goto again; -+ case Object_tag: -+ h->univ_count--; -+ Combine(Oid_val(obj)); -+ break; -+ case Custom_tag: -+ /* If no hashing function provided, do nothing */ -+ if (Custom_ops_val(obj)->hash != NULL) { -+ h->univ_count--; -+ Combine(Custom_ops_val(obj)->hash(obj)); -+ } -+ break; -+#ifdef NO_NAKED_POINTERS -+ case Closure_tag: -+ h->univ_count--; -+ Combine_small(tag); -+ /* Recursively hash the environment fields */ -+ i = Wosize_val(obj); -+ j = Start_env_closinfo(Closinfo_val(obj)); -+ while (i > j) { -+ i--; -+ hash_aux(h, Field(obj, i)); -+ } -+ /* Combine the code pointers, closure info fields, and infix headers */ -+ while (i > 0) { -+ i--; -+ Combine(Field(obj, i)); -+ h->univ_count--; -+ } -+ break; -+#endif -+ default: -+ h->univ_count--; -+ Combine_small(tag); -+ i = Wosize_val(obj); -+ while (i != 0) { -+ i--; -+ hash_aux(h, Field(obj, i)); -+ } -+ break; -+ } -+} diff --git a/net/unison240/files/patch-mkProjectInfo.ml b/net/unison240/files/patch-mkProjectInfo.ml deleted file mode 100644 index 107131fe8dbf..000000000000 --- a/net/unison240/files/patch-mkProjectInfo.ml +++ /dev/null @@ -1,11 +0,0 @@ ---- mkProjectInfo.ml.orig 2014-12-30 02:21:28 UTC -+++ mkProjectInfo.ml -@@ -42,7 +42,7 @@ let pointVersionOrigin = 409 (* Revision that correspo - (* ---------------------------------------------------------------------- *) - (* You shouldn't need to edit below. *) - --let revisionString = "$Rev$";; -+let revisionString = "$Rev: 537 $";; - - (* BCP (1/10): This bit was added to help with getting Unison via bazaar, but it - was never used much and I'm not confident it's working. I'll comment it out diff --git a/net/unison240/files/patch-ocaml8 b/net/unison240/files/patch-ocaml8 deleted file mode 100644 index 446c260564d7..000000000000 --- a/net/unison240/files/patch-ocaml8 +++ /dev/null @@ -1,52 +0,0 @@ -From 23fa129254a3304902739fc989950cc747d1e0b3 Mon Sep 17 00:00:00 2001 -From: Jaap Boender <jaapb@kerguelen.org> -Date: Thu, 21 Mar 2019 12:26:51 +0000 -Subject: [PATCH] Compatibility with OCaml 4.08 - ---- - src/files.ml | 2 +- - src/recon.ml | 4 ++-- - src/system/system_generic.ml | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/files.ml b/src/files.ml -index 72cd33875..bc162b12e 100644 ---- files.ml -+++ files.ml -@@ -734,7 +734,7 @@ let get_files_in_directory dir = - with End_of_file -> - dirh.System.closedir () - end; -- Sort.list (<) !files -+ List.sort String.compare !files - - let ls dir pattern = - Util.convertUnixErrorsToTransient -diff --git a/src/recon.ml b/src/recon.ml -index 490baf15a..7a6186bb8 100644 ---- recon.ml -+++ recon.ml -@@ -662,8 +662,8 @@ let rec reconcile - - (* Sorts the paths so that they will be displayed in order *) - let sortPaths pathUpdatesList = -- Sort.list -- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) -+ List.sort -+ Path.compare - pathUpdatesList - - let rec enterPath p1 p2 t = -diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml -index 453027d06..c2288b82b 100755 ---- system/system_generic.ml -+++ system/system_generic.ml -@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen - let chmod = Unix.chmod - let chown = Unix.chown - let utimes = Unix.utimes --let link = Unix.link -+let link s d = Unix.link s d - let openfile = Unix.openfile - let opendir f = - let h = Unix.opendir f in diff --git a/net/unison240/files/patch-uigtk2.ml b/net/unison240/files/patch-uigtk2.ml deleted file mode 100644 index 2e6839e8b480..000000000000 --- a/net/unison240/files/patch-uigtk2.ml +++ /dev/null @@ -1,17 +0,0 @@ ---- uigtk2.ml.orig 2014-12-30 02:21:28 UTC -+++ uigtk2.ml -@@ -89,12 +89,12 @@ let icon = - (* This does not work with the current version of Lablgtk, due to a bug - let icon = - GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true -- (Gpointer.region_of_string Pixmaps.icon_data) -+ (Gpointer.region_of_bytes Pixmaps.icon_data) - *) - let icon = - let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in - Gpointer.blit -- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); -+ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); - p - - let leftPtrWatch = diff --git a/net/unison240/files/patch-uutil.ml b/net/unison240/files/patch-uutil.ml deleted file mode 100644 index cf364ade3fcf..000000000000 --- a/net/unison240/files/patch-uutil.ml +++ /dev/null @@ -1,11 +0,0 @@ ---- uutil.ml.orig 2024-02-06 20:32:31 UTC -+++ uutil.ml -@@ -34,7 +34,7 @@ let hash2 x y = (17 * x + 257 * y) land 0x3FFFFFFF - - let hash2 x y = (17 * x + 257 * y) land 0x3FFFFFFF - --external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc" -+external hash_param : int -> int -> 'a -> int = "unsn_hash_univ_param" "noalloc" - - let hash x = hash_param 10 100 x - diff --git a/net/unison240/files/unison.desktop.in b/net/unison240/files/unison.desktop.in deleted file mode 100644 index 0f8a0aef730c..000000000000 --- a/net/unison240/files/unison.desktop.in +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Unison 2.40 -GenericName=File-synchronization tool -Type=Application -Terminal=false -StartupNotify=true -Categories=GTK;Utility; -Exec=unison240 -Icon=unison240.png -Comment=Synchronize files (directories) over different disks (hosts) -Comment[ru]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах) diff --git a/net/unison240/pkg-descr b/net/unison240/pkg-descr deleted file mode 100644 index c96194d13db8..000000000000 --- a/net/unison240/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -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 shares a number of features with tools such as configuration -management packages (CVS, PRCS, etc.) distributed filesystems (Coda, etc.) -uni-directional mirroring utilities (rsync, etc.) and other synchronizers -(Intellisync, Reconcile, etc). diff --git a/net/unison240/pkg-message b/net/unison240/pkg-message deleted file mode 100644 index 1795b612e0a8..000000000000 --- a/net/unison240/pkg-message +++ /dev/null @@ -1,8 +0,0 @@ -[ -{ type: install - message: <<EOM -Together with a gtk-enabled version, a text-only unison-text binary -is installed as it depends on a smaller number of libraries. -EOM -} -] diff --git a/net/unison240/pkg-message.nox11 b/net/unison240/pkg-message.nox11 deleted file mode 100644 index 31b179babd46..000000000000 --- a/net/unison240/pkg-message.nox11 +++ /dev/null @@ -1,7 +0,0 @@ -[ -{ type: install - message: <<EOM -A text-only unison binary is installed. -EOM -} -] diff --git a/net/unison240/pkg-plist b/net/unison240/pkg-plist deleted file mode 100644 index b28583a61db5..000000000000 --- a/net/unison240/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/unison%%VERSIONSUFFIX%% -%%X11%%bin/unison%%VERSIONSUFFIX%%-text -%%X11%%share/applications/unison%%VERSIONSUFFIX%%.desktop -%%X11%%share/pixmaps/unison%%VERSIONSUFFIX%%.png -%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/READMEhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69a2f9c5.253ad.1b330522>