Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Jun 2026 20:57:31 +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: d8975e3bcf55 - main - net/unison248: Remove expired port
Message-ID:  <6a442dbb.3377d.6456dbbe@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=d8975e3bcf550327ce7338448ce8ecbaed2238ab

commit d8975e3bcf550327ce7338448ce8ecbaed2238ab
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2026-06-30 20:57:27 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2026-06-30 20:57:27 +0000

    net/unison248: Remove expired port
    
    2026-06-30 net/unison248: Legacy release unsupported by upstream
---
 MOVED                                              |   1 +
 net/Makefile                                       |   1 -
 net/unison248/Makefile                             | 123 ---------------
 net/unison248/distinfo                             |   3 -
 net/unison248/files/patch-Makefile.OCaml           |  43 ------
 net/unison248/files/patch-copy.ml                  |  20 ---
 net/unison248/files/patch-fsmonitor_linux_Makefile |  20 ---
 .../files/patch-fsmonitor_linux_inotify__stubs.c   |  17 ---
 net/unison248/files/patch-hash__compat.c           | 168 ---------------------
 net/unison248/files/patch-ocaml8                   |  52 -------
 net/unison248/files/patch-uigtk2.ml                |  17 ---
 net/unison248/files/patch-uutil.ml                 |  11 --
 net/unison248/files/unison.desktop.in              |  12 --
 net/unison248/pkg-descr                            |   9 --
 net/unison248/pkg-message                          |   8 -
 net/unison248/pkg-message.nox11                    |   7 -
 net/unison248/pkg-plist                            |   8 -
 17 files changed, 1 insertion(+), 519 deletions(-)

diff --git a/MOVED b/MOVED
index e965e100e864..2881d55e786b 100644
--- a/MOVED
+++ b/MOVED
@@ -5447,3 +5447,4 @@ filesystems/moosefs3-master|filesystems/moosefs-master|2026-06-30|Has expired: 3
 textproc/py-elasticsearch5|textproc/py-elasticsearch6|2026-06-30|Has expired: 5.x reached EoL, last version was in 2018 - use textproc/py-elasticsearch 9.3.0 instead
 audio/murmur|audio/mumble-server|2026-06-30|Has expired: 1.3 is deprecated by upstream and renamed - use audio/mumble-server instead
 www/forgejo14|www/forgejo-lts|2026-06-30|Has expired: Unsupported, please switch to www/forgejo or www/forgejo-lts
+net/unison248||2026-06-30|Has expired: Legacy release unsupported by upstream
diff --git a/net/Makefile b/net/Makefile
index 160be4932311..e58617b4566c 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1663,7 +1663,6 @@
     SUBDIR += ulxmlrpcpp
     SUBDIR += unfs3
     SUBDIR += unison
-    SUBDIR += unison248
     SUBDIR += unison251
     SUBDIR += unison253
     SUBDIR += unix2tcp
diff --git a/net/unison248/Makefile b/net/unison248/Makefile
deleted file mode 100644
index 9afa8fb12c6b..000000000000
--- a/net/unison248/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-PORTNAME=	unison
-PORTVERSION=	2.48.15
-PORTREVISION=	5
-DISTVERSIONPREFIX=	v
-DISTVERSIONSUFFIX=	v4
-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
-
-FLAVORS=	x11 nox11
-FLAVOR?=	${FLAVORS:[1]}
-
-VERSIONSUFFIX=	248
-
-DEPRECATED=	Legacy release unsupported by upstream
-EXPIRATION_DATE=	2026-06-30
-
-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 localbase ocaml:build
-USE_GITHUB=	yes
-GH_ACCOUNT=	bcpierce00
-
-MAKE_ENV=	CLIBS="${LIBS:S/^-/-ccopt -/}" \
-		COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}"
-MAKE_JOBS_UNSAFE=	yes
-ALL_TARGET=	unison all
-
-DOCS=		BUGS.txt NEWS README
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-
-WRKSRC_SUBDIR=	src
-
-PLIST_SUB=	PORTVERSION=${PORTVERSION} \
-		VERSIONSUFFIX=${VERSIONSUFFIX}
-
-OPTIONS_DEFINE=		DOCS FSMONITOR
-OPTIONS_DEFAULT=	FSMONITOR
-OPTIONS_SUB=		YES
-
-FSMONITOR_DESC=	Compile and install fsmonitor plugin
-
-FSMONITOR_LIB_DEPENDS=	libinotify.so:devel/libinotify
-
-.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
-SUB_LIST=	PORTVERSION=${PORTVERSION} \
-		VERSIONSUFFIX=${VERSIONSUFFIX}
-USE_GNOME+=	atk cairo gdkpixbuf glib20 gtk20 pango
-USES+=		gettext-runtime gnome
-PLIST_SUB+=	X11=""
-.endif
-
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == powerpc
-USE_BINUTILS=	yes
-.endif
-
-post-patch-FSMONITOR-off:
-	@${REINPLACE_CMD} -e 's/-include fsmonitor/#&/' \
-		${WRKSRC}/Makefile.OCaml
-
-post-patch-FSMONITOR-on:
-	@${REINPLACE_CMD} \
-		-e '/let suffix = if Util.osType/s/else "" in/else "${VERSIONSUFFIX}" in/' \
-		${WRKSRC}/fswatch.ml
-
-post-patch:
-# remove unconditional raise, which causes self tests to always fail
-	${REINPLACE_CMD} -e '/remove me/d' ${WRKSRC}/test.ml
-.if ${FLAVOR} == nox11
-	@${REINPLACE_CMD} -e 's/CFLAGS/COFLAGS/g' \
-		${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile
-.else
-	@${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \
-		-e 's/CFLAGS/COFLAGS/g' \
-		${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile
-.endif
-
-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} 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}
-
-do-install-FSMONITOR-on:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-fsmonitor ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-fsmonitor${VERSIONSUFFIX}
-
-.include <bsd.port.mk>
diff --git a/net/unison248/distinfo b/net/unison248/distinfo
deleted file mode 100644
index 1dbdd4d9ac85..000000000000
--- a/net/unison248/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1518118647
-SHA256 (bcpierce00-unison-v2.48.15v4_GH0.tar.gz) = f8c7e982634bbe1ed6510fe5b36b6c5c55c06caefddafdd9edc08812305fdeec
-SIZE (bcpierce00-unison-v2.48.15v4_GH0.tar.gz) = 1911781
diff --git a/net/unison248/files/patch-Makefile.OCaml b/net/unison248/files/patch-Makefile.OCaml
deleted file mode 100644
index 73ff7ac83133..000000000000
--- a/net/unison248/files/patch-Makefile.OCaml
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.OCaml.orig	2017-12-18 12:23:54 UTC
-+++ Makefile.OCaml
-@@ -32,7 +32,11 @@ ifeq ($(shell uname),NetBSD)
- else
- ifeq ($(shell uname),NetBSD)
-   OSARCH=NetBSD
-+else
-+ifeq ($(shell uname),FreeBSD)
-+  OSARCH=FreeBSD
- endif
-+endif
- ifeq ($(shell uname),Linux)
-   OSARCH=Linux
- endif
-@@ -240,7 +244,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
-@@ -311,6 +315,10 @@ endif
- -include fsmonitor/linux/Makefile src/fsmonitor/linux/Makefile
- endif
- 
-+ifeq ($(OSARCH),FreeBSD)
-+-include fsmonitor/linux/Makefile src/fsmonitor/linux/Makefile
-+endif
-+
- ifeq ($(OSARCH),win32gnuc)
- -include fsmonitor/windows/Makefile src/fsmonitor/windows/Makefile
- endif
-@@ -436,7 +444,7 @@ win32rc/unison.res.lib: win32rc/unison.res
- 
- %.o %.obj: %.c
- 	@echo "$(OCAMLOPT): $< ---> $@"
--	$(CAMLC) $(CAMLFLAGS) -ccopt $(OUTPUT_SEL)$(CWD)/$@ -c $(CWD)/$<
-+	$(CAMLC) $(CAMLFLAGS) -ccopt $(OUTPUT_SEL)$(CWD)/$@ -c $(CFLAGS) $(CWD)/$<
- 
- $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS)
- 	@echo Linking $@
diff --git a/net/unison248/files/patch-copy.ml b/net/unison248/files/patch-copy.ml
deleted file mode 100644
index 3c961c6773ee..000000000000
--- a/net/unison248/files/patch-copy.ml
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/copy.ml b/src/copy.ml
-index b9e10f6..19c2370 100644
---- copy.ml
-+++ copy.ml
-@@ -1004,7 +1004,14 @@ let recursively fspathFrom pathFrom fspathTo pathTo =
-         let ch = Os.childrenOf fspathFrom pFrom in
-         Safelist.iter
-           (fun n -> copy (Path.child pFrom n) (Path.child pTo n)) ch
--    | `ABSENT -> assert false in
-+    | `ABSENT ->
-+        (* BCP 4/16: Was "assert false", but this causes unison to
-+           crash when (1) the copyonconflict preference is used, (2) 
-+           there is a conflict between a deletion and a change, and
-+           (3) the change is propagated on top of the deletion.  Seems
-+           better to silently ignore the copy request. *)
-+        ()
-+    in
-   debug (fun () -> Util.msg "  Copying recursively %s / %s\n"
-     (Fspath.toDebugString fspathFrom) (Path.toString pathFrom));
-   copy pathFrom pathTo;
diff --git a/net/unison248/files/patch-fsmonitor_linux_Makefile b/net/unison248/files/patch-fsmonitor_linux_Makefile
deleted file mode 100644
index 820041472d23..000000000000
--- a/net/unison248/files/patch-fsmonitor_linux_Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- fsmonitor/linux/Makefile.orig	2017-03-23 16:47:46 UTC
-+++ fsmonitor/linux/Makefile
-@@ -18,6 +18,10 @@ else
-   FSMCAMLLIBS=$(FSMOCAMLLIBS)
- endif
- 
-+ifeq ($(OSARCH),FreeBSD)
-+  CLIBS+=-cclib -linotify
-+endif
-+
- buildexecutable:: $(FSMONITOR)$(EXEC_EXT)
- 
- $(FSMONITOR)$(EXEC_EXT): $(FSMCAMLOBJS) $(FSMCOBJS)
-@@ -26,4 +30,4 @@ $(FSMONITOR)$(EXEC_EXT): $(FSMCAMLOBJS) $(FSMCOBJS)
- 
- clean::
- 	rm -f $(DIR)/*.cm[iox] $(DIR)/*.o $(DIR)/*~
--	rm -f $(FSMONITOR)$(EXEC_EXT)
-\ No newline at end of file
-+	rm -f $(FSMONITOR)$(EXEC_EXT)
diff --git a/net/unison248/files/patch-fsmonitor_linux_inotify__stubs.c b/net/unison248/files/patch-fsmonitor_linux_inotify__stubs.c
deleted file mode 100644
index fa0be0ade537..000000000000
--- a/net/unison248/files/patch-fsmonitor_linux_inotify__stubs.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- fsmonitor/linux/inotify_stubs.c.orig	2017-03-23 16:25:03 UTC
-+++ fsmonitor/linux/inotify_stubs.c
-@@ -27,9 +27,13 @@
- #include <caml/signals.h>
- #include <caml/callback.h>
- 
-+#include <sys/param.h>
-+
-+#if !defined(__FreeBSD__)
- #include <features.h>
-+#endif
- 
--#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 4
-+#if (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 4) || defined(__FreeBSD__)
- #define GLIBC_SUPPORT_INOTIFY 1
- #else
- #define GLIBC_SUPPORT_INOTIFY 0
diff --git a/net/unison248/files/patch-hash__compat.c b/net/unison248/files/patch-hash__compat.c
deleted file mode 100644
index ba746e41d22b..000000000000
--- a/net/unison248/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/unison248/files/patch-ocaml8 b/net/unison248/files/patch-ocaml8
deleted file mode 100644
index 446c260564d7..000000000000
--- a/net/unison248/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/unison248/files/patch-uigtk2.ml b/net/unison248/files/patch-uigtk2.ml
deleted file mode 100644
index 3fcc653c3fac..000000000000
--- a/net/unison248/files/patch-uigtk2.ml
+++ /dev/null
@@ -1,17 +0,0 @@
---- uigtk2.ml.orig	2009-05-14 15:59:33 UTC
-+++ uigtk2.ml
-@@ -93,12 +93,12 @@ let fontMonospaceMediumPango = lazy (Pango.Font.from_s
- (* 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
- 
- (*********************************************************************
diff --git a/net/unison248/files/patch-uutil.ml b/net/unison248/files/patch-uutil.ml
deleted file mode 100644
index cf364ade3fcf..000000000000
--- a/net/unison248/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/unison248/files/unison.desktop.in b/net/unison248/files/unison.desktop.in
deleted file mode 100644
index eb48bf8116c0..000000000000
--- a/net/unison248/files/unison.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Unison %%PORTVERSION%%
-GenericName=File-synchronization tool
-Type=Application
-Terminal=false
-StartupNotify=true
-Categories=GTK;Utility;
-Exec=unison%%VERSIONSUFFIX%%
-Icon=unison%%VERSIONSUFFIX%%.png
-Comment=Synchronize files (directories) over different disks (hosts)
-Comment[ru]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах)
diff --git a/net/unison248/pkg-descr b/net/unison248/pkg-descr
deleted file mode 100644
index c96194d13db8..000000000000
--- a/net/unison248/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/unison248/pkg-message b/net/unison248/pkg-message
deleted file mode 100644
index 1795b612e0a8..000000000000
--- a/net/unison248/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/unison248/pkg-message.nox11 b/net/unison248/pkg-message.nox11
deleted file mode 100644
index 31b179babd46..000000000000
--- a/net/unison248/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/unison248/pkg-plist b/net/unison248/pkg-plist
deleted file mode 100644
index 7496e9435cec..000000000000
--- a/net/unison248/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/unison%%VERSIONSUFFIX%%
-%%FSMONITOR%%bin/unison-fsmonitor%%VERSIONSUFFIX%%
-%%X11%%share/applications/unison%%VERSIONSUFFIX%%.desktop
-%%X11%%bin/unison%%VERSIONSUFFIX%%-text
-%%X11%%share/pixmaps/unison%%VERSIONSUFFIX%%.png
-%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a442dbb.3377d.6456dbbe>