diff --git a/net/unison/2.4x/pkg/PLIST b/net/unison/2.4x/pkg/PLIST index 545a4334602..bcb9fea32f2 100644 --- a/net/unison/2.4x/pkg/PLIST +++ b/net/unison/2.4x/pkg/PLIST @@ -1,9 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.2 2018/09/04 12:46:19 espie Exp $ +@comment $OpenBSD: PLIST,v 1.3 2020/11/03 19:45:30 bket Exp $ +@option is-branch +@conflict unison-* @pkgpath net/unison/stable${FLAVOR_COMMA} @pkgpath net/unison/snapshot${FLAVOR_COMMA} @pkgpath net/unison${FLAVOR_COMMA} -@option is-branch -@conflict unison-* @bin bin/unison share/doc/pkg-readmes/${PKGSTEM} share/doc/unison/ diff --git a/net/unison/2.5x/Makefile b/net/unison/2.5x/Makefile index d1ceec4e81c..8eca993c137 100644 --- a/net/unison/2.5x/Makefile +++ b/net/unison/2.5x/Makefile @@ -1,8 +1,5 @@ -# $OpenBSD: Makefile,v 1.8 2020/06/09 17:34:14 chrisz Exp $ - -GH_TAGNAME= v2.51.2 -REVISION= 5 +# $OpenBSD: Makefile,v 1.9 2020/11/03 19:45:30 bket Exp $ -WRKDIST= ${WRKDIR}/${PKGNAME}/src +GH_TAGNAME= v2.51.3 .include diff --git a/net/unison/2.5x/distinfo b/net/unison/2.5x/distinfo index 395d7568172..d558147c4ba 100644 --- a/net/unison/2.5x/distinfo +++ b/net/unison/2.5x/distinfo @@ -1,2 +1,2 @@ -SHA256 (unison-2.51.2.tar.gz) = ou/L6rZRvm32nMmyUwEaB5Vey5H7QHohlxlFEZeEnV4= -SIZE (unison-2.51.2.tar.gz) = 1398790 +SHA256 (unison-2.51.3.tar.gz) = DCh9F/UnKUQLK9wo7fTRmy1epYaZg9eOeA1QHFhmkUs= +SIZE (unison-2.51.3.tar.gz) = 1370060 diff --git a/net/unison/2.5x/patches/patch-files_ml b/net/unison/2.5x/patches/patch-files_ml deleted file mode 100644 index 0889457f3f4..00000000000 --- a/net/unison/2.5x/patches/patch-files_ml +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-files_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $ - -Index: files.ml ---- files.ml.orig -+++ 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/net/unison/2.5x/patches/patch-recon_ml b/net/unison/2.5x/patches/patch-recon_ml deleted file mode 100644 index 101fd1efd4a..00000000000 --- a/net/unison/2.5x/patches/patch-recon_ml +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-recon_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $ - -Index: recon.ml ---- recon.ml.orig -+++ recon.ml -@@ -661,9 +661,7 @@ 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) -- pathUpdatesList -+ List.sort Path.compare pathUpdatesList - - let rec enterPath p1 p2 t = - match Path.deconstruct p1, Path.deconstruct p2 with diff --git a/net/unison/2.5x/patches/patch-system_system_generic_ml b/net/unison/2.5x/patches/patch-system_system_generic_ml deleted file mode 100644 index 5b095f864f7..00000000000 --- a/net/unison/2.5x/patches/patch-system_system_generic_ml +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-system_system_generic_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $ - -Index: system/system_generic.ml ---- system/system_generic.ml.orig -+++ 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 source dest = Unix.link source dest - let openfile = Unix.openfile - let opendir f = - let h = Unix.opendir f in diff --git a/net/unison/2.5x/patches/patch-uicommon_ml b/net/unison/2.5x/patches/patch-uicommon_ml index cab5a5b44ae..98b402f31d3 100644 --- a/net/unison/2.5x/patches/patch-uicommon_ml +++ b/net/unison/2.5x/patches/patch-uicommon_ml @@ -1,9 +1,9 @@ -$OpenBSD: patch-uicommon_ml,v 1.1 2018/04/26 21:34:23 bket Exp $ +$OpenBSD: patch-uicommon_ml,v 1.2 2020/11/03 19:45:30 bket Exp $ Index: uicommon.ml --- uicommon.ml.orig +++ uicommon.ml -@@ -494,7 +494,7 @@ let promptForRoots getFirstRoot getSecondRoot = +@@ -506,7 +506,7 @@ let promptForRoots getFirstRoot getSecondRoot = (* ---- *) let makeTempDir pattern = diff --git a/net/unison/2.5x/patches/patch-uigtk2_ml b/net/unison/2.5x/patches/patch-uigtk2_ml deleted file mode 100644 index 0920619bf7c..00000000000 --- a/net/unison/2.5x/patches/patch-uigtk2_ml +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-uigtk2_ml,v 1.1 2019/03/04 12:51:16 chrisz Exp $ - -Index: uigtk2.ml ---- uigtk2.ml.orig -+++ uigtk2.ml -@@ -94,7 +94,7 @@ let icon = - 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/unison/Makefile.inc b/net/unison/Makefile.inc index 52cf2daf68a..53090e1d256 100644 --- a/net/unison/Makefile.inc +++ b/net/unison/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.30 2019/07/12 20:48:51 sthen Exp $ +# $OpenBSD: Makefile.inc,v 1.31 2020/11/03 19:45:30 bket Exp $ COMMENT= multi-platform file synchronization tool @@ -14,7 +14,7 @@ MAINTAINER= Bjorn Ketelaars # GPLv3 PERMIT_PACKAGE= Yes -WANTLIB= c m pthread util +WANTLIB= c m util MODULES= lang/ocaml TEST_DEPENDS+= emacs->=24:editors/emacs @@ -36,9 +36,10 @@ BUILD_DEPENDS+= x11/lablgtk2 LIB_DEPENDS+= x11/gtk+2 MAKE_FLAGS+= UISTYLE=gtk2 WANTLIB+= X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB+= Xrandr Xrender atk-1.0 cairo fontconfig freetype fribidi -WANTLIB+= gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 -WANTLIB+= gtk-x11-2.0 intl pango-1.0 pangocairo-1.0 pangoft2-1.0 z +WANTLIB+= Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0 +WANTLIB+= gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 +WANTLIB+= harfbuzz intl pango-1.0 pangocairo-1.0 pangoft2-1.0 +WANTLIB+= z .endif FLAVOR_COMMA= ${FLAVOR_EXT:S/-/,/g}