Index: head/net/unison/Makefile =================================================================== --- head/net/unison/Makefile +++ head/net/unison/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= unison -PORTVERSION= 2.51.2 +PORTVERSION= 2.51.3 DISTVERSIONPREFIX= v CATEGORIES= net @@ -32,7 +32,6 @@ NO_OCAML_RUNDEPENDS=yes CONFLICTS= unison-devel-[0-9]* MAKE_ENV= CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}" -MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all USE_GITHUB= yes @@ -75,8 +74,9 @@ ${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile .endif -.if ${FLAVOR} == x11 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 Index: head/net/unison/distinfo =================================================================== --- head/net/unison/distinfo +++ head/net/unison/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1520431786 -SHA256 (bcpierce00-unison-v2.51.2_GH0.tar.gz) = a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e -SIZE (bcpierce00-unison-v2.51.2_GH0.tar.gz) = 1398790 +TIMESTAMP = 1603288220 +SHA256 (bcpierce00-unison-v2.51.3_GH0.tar.gz) = 0c287d17f52729440b2bdc28edf4d19b2d5ea5869983d78e780d501c5866914b +SIZE (bcpierce00-unison-v2.51.3_GH0.tar.gz) = 1370060 Index: head/net/unison232/Makefile =================================================================== --- head/net/unison232/Makefile +++ head/net/unison232/Makefile @@ -3,7 +3,7 @@ PORTNAME= unison PORTVERSION= 2.32.52 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net MASTER_SITES= https://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${_EXTRA_DOCS} Index: head/net/unison232/files/patch-uigtk2.ml =================================================================== --- head/net/unison232/files/patch-uigtk2.ml +++ head/net/unison232/files/patch-uigtk2.ml @@ -0,0 +1,17 @@ +--- 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 + + (********************************************************************* Index: head/net/unison240/Makefile =================================================================== --- head/net/unison240/Makefile +++ head/net/unison240/Makefile @@ -3,7 +3,7 @@ PORTNAME= unison PORTVERSION= 2.40.128 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} @@ -37,8 +37,8 @@ USE_OCAML= yes NO_OCAML_RUNDEPENDS=yes MAKE_ARGS= CFLAGS="" -MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all +TEST_TARGET= selftest DOCS= BUGS.txt NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} @@ -64,12 +64,13 @@ @${REINPLACE_CMD} -e 's,= Unix\.symlink,s1 s2 & s1 s2,' \ ${WRKSRC}/system/system_generic.ml -.if ${FLAVOR} == x11 post-patch: @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/Makefile.OCaml 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 Index: head/net/unison240/files/patch-uigtk2.ml =================================================================== --- head/net/unison240/files/patch-uigtk2.ml +++ head/net/unison240/files/patch-uigtk2.ml @@ -0,0 +1,17 @@ +--- 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 + + (********************************************************************* Index: head/net/unison248/Makefile =================================================================== --- head/net/unison248/Makefile +++ head/net/unison248/Makefile @@ -3,7 +3,7 @@ PORTNAME= unison PORTVERSION= 2.48.15 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= v4 CATEGORIES= net @@ -37,7 +37,6 @@ NO_OCAML_RUNDEPENDS=yes CONFLICTS= unison-devel-[0-9]* MAKE_ENV= CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}" -MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all USE_GITHUB= yes @@ -78,6 +77,8 @@ ${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 @@ -87,8 +88,9 @@ ${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile .endif -.if ${FLAVOR} == x11 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 Index: head/net/unison248/files/patch-uigtk2.ml =================================================================== --- head/net/unison248/files/patch-uigtk2.ml +++ head/net/unison248/files/patch-uigtk2.ml @@ -0,0 +1,17 @@ +--- 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 + + (********************************************************************* Index: head/x11-toolkits/ocaml-lablgtk2/Makefile =================================================================== --- head/x11-toolkits/ocaml-lablgtk2/Makefile +++ head/x11-toolkits/ocaml-lablgtk2/Makefile @@ -2,12 +2,10 @@ # $FreeBSD$ PORTNAME= lablgtk2 -PORTVERSION= 2.18.5 +PORTVERSION= 2.18.11 PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= https://download.ocamlcore.org/lablgtk/Lablgtk2/${PORTVERSION}/ PKGNAMEPREFIX= ocaml- -DISTNAME= lablgtk-${PORTVERSION} MAINTAINER= danfe@FreeBSD.org COMMENT= Objective Caml interface to GTK+ 2.x @@ -38,6 +36,10 @@ HAS_CONFIGURE= yes ALL_TARGET= all opt MAKE_JOBS_UNSAFE= yes + +USE_GITHUB= yes +GH_ACCOUNT= garrigue +GH_PROJECT= lablgtk CONFIGURE_ARGS= --prefix=${PREFIX} --with-libdir=${PREFIX}/${OCAML_LIBDIR} \ --without-gtksourceview Index: head/x11-toolkits/ocaml-lablgtk2/distinfo =================================================================== --- head/x11-toolkits/ocaml-lablgtk2/distinfo +++ head/x11-toolkits/ocaml-lablgtk2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559922306 -SHA256 (lablgtk-2.18.5.tar.gz) = 2bf251db21c077fdd26c035ea03edd8fe609187f908e520e87a8ffdd9c36d233 -SIZE (lablgtk-2.18.5.tar.gz) = 808005 +TIMESTAMP = 1603308851 +SHA256 (garrigue-lablgtk-2.18.11_GH0.tar.gz) = ff3c551df4e220b0c0fb9a3da6429413bff14f8fc93f4dd6807a35463982c863 +SIZE (garrigue-lablgtk-2.18.11_GH0.tar.gz) = 1068587 Index: head/x11-toolkits/ocaml-lablgtk2/files/patch-fno-common =================================================================== --- head/x11-toolkits/ocaml-lablgtk2/files/patch-fno-common +++ head/x11-toolkits/ocaml-lablgtk2/files/patch-fno-common @@ -1,22 +0,0 @@ ---- src/ml_gdk.c.orig -+++ src/ml_gdk.c -@@ -48,6 +48,8 @@ - #include "gdk_tags.h" - - -+lookup_info *ml_table_extension_events; -+ - CAMLprim void ml_raise_gdk (const char *errmsg) - { - static const value * exn = NULL; ---- src/ml_gdk.h.orig -+++ src/ml_gdk.h -@@ -86,7 +86,7 @@ CAMLexport value Val_GdkEvent (GdkEvent *); - CAMLexport int OptFlags_GdkModifier_val (value); - CAMLexport int Flags_GdkModifier_val (value); - CAMLexport int Flags_Event_mask_val (value); --CAMLexport lookup_info *ml_table_extension_events; -+CAMLextern lookup_info *ml_table_extension_events; - #define Extension_events_val(key) ml_lookup_to_c(ml_table_extension_events,key) - - #define GdkDragContext_val(val) check_cast(GDK_DRAG_CONTEXT,val)