Hi! The diff below updates lablgtk2 to the latest version, 2.18.0.
Tested with mldonkey, unison, and coq. Oky? Ciao, David Index: Makefile =================================================================== RCS file: /cvs/ports/x11/lablgtk2/Makefile,v retrieving revision 1.25 diff -u -p -u -p -r1.25 Makefile --- Makefile 18 Jun 2013 09:27:37 -0000 1.25 +++ Makefile 13 Nov 2013 16:45:37 -0000 @@ -2,14 +2,13 @@ COMMENT = OCaml interface to GTK+2 -V = 2.16.0 -REVISION= 3 +V = 2.18.0 DISTNAME = lablgtk-$V PKGNAME = lablgtk2-$V CATEGORIES = x11 devel HOMEPAGE = http://lablgtk.forge.ocamlcore.org/ -MASTER_SITES = https://forge.ocamlcore.org/frs/download.php/979/ +MASTER_SITES = https://forge.ocamlcore.org/frs/download.php/1261/ # LGPL PERMIT_PACKAGE_CDROM = Yes Index: distinfo =================================================================== RCS file: /cvs/ports/x11/lablgtk2/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo 9 Oct 2012 09:22:24 -0000 1.5 +++ distinfo 13 Nov 2013 16:45:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (lablgtk-2.16.0.tar.gz) = oOqXUuslfa3PwpFECP/zOdTDQ1eALwLGMyndQbd33i8= -SIZE (lablgtk-2.16.0.tar.gz) = 787217 +SHA256 (lablgtk-2.18.0.tar.gz) = x2p66UVOiTZWZs8Zco27Ue22gQ4uVwMrO+vVPM7FlG4= +SIZE (lablgtk-2.18.0.tar.gz) = 789507 Index: patches/patch-config_make_in =================================================================== RCS file: patches/patch-config_make_in diff -N patches/patch-config_make_in --- patches/patch-config_make_in 31 Jan 2013 21:20:32 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-config_make_in,v 1.1 2013/01/31 21:20:32 dcoppa Exp $ - -Support DESTDIR with findlib-install; unbreak systraced builds -(adapted from upstream git 58e15c3a33ee747e3e58a2c9687f22234f0055b6) - ---- config.make.in.orig Thu Aug 23 12:37:48 2012 -+++ config.make.in Thu Jan 31 11:48:57 2013 -@@ -9,6 +9,7 @@ OCAMLDOC=@OCAMLDOC@ - CAMLMKTOP=@CAMLMKTOP@ - CAMLMKLIB=@CAMLMKLIB@ - CAMLP4O=@CAMLP4O@ -+FINDLIBDIR=@FINDLIBDIR@ - CAMLBEST=@OCAMLBEST@ - CAMLWIN32=@OCAMLWIN32@ - CAMLDEP=@OCAMLDEP@ -@@ -56,9 +57,11 @@ BINDIR=$(DESTDIR)@bindir@ - # where to install the man page - MANDIR=$(DESTDIR)@mandir@ - -+LABLGTKDIR=@LIBDIR@/lablgtk2 - INSTALLDIR=$(DESTDIR)@LIBDIR@/lablgtk2 - DLLDIR=$(DESTDIR)@LIBDIR@/stublibs - LABLGLDIR=@LABLGLDIR@ -+FLINSTALLDIR=$(DESTDIR)$(FINDLIBDIR)/lablgtk2 - - FILT = -Wl,--export-dynamic - clean_libs = $(subst -pthread,-ldopt -pthread -ccopt -pthread,$(subst --rpath,-rpath,$(filter-out $(FILT),$(1)))) Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 31 Jan 2013 21:20:32 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -$OpenBSD: patch-configure,v 1.1 2013/01/31 21:20:32 dcoppa Exp $ - -Support DESTDIR with findlib-install; unbreak systraced builds -(adapted from upstream git 58e15c3a33ee747e3e58a2c9687f22234f0055b6) - ---- configure.orig Thu Aug 23 12:37:48 2012 -+++ configure Thu Jan 31 11:49:11 2013 -@@ -568,6 +568,7 @@ DEBUG - USE_CC - HAVE_SVGZ - LABLGLDIR -+FINDLIBDIR - HAS_NATIVE_DYNLINK - HAS_DLL_SUPPORT - THREADS_LIB -@@ -2607,6 +2608,9 @@ fi - if test "$CAMLP4O" = no ; then - as_fn_error $? "Cannot find camlp4o." "$LINENO" 5 - fi -+ -+FINDLIBDIR="`ocamlfind printconf destdir | tr -d '\\r'`" -+echo "ocamlfind library path is $FINDLIBDIR" - - if expr "$OCAMLVERSION" '>=' '4' > /dev/null ; then - ODOC_DEF="-D OCAML_400" Index: patches/patch-src_Makefile =================================================================== RCS file: patches/patch-src_Makefile diff -N patches/patch-src_Makefile --- patches/patch-src_Makefile 31 Jan 2013 21:20:32 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,70 +0,0 @@ -$OpenBSD: patch-src_Makefile,v 1.3 2013/01/31 21:20:32 dcoppa Exp $ - -Support DESTDIR with findlib-install; unbreak systraced builds -(adapted from upstream git 58e15c3a33ee747e3e58a2c9687f22234f0055b6) - ---- src/Makefile.orig Thu Aug 23 12:37:48 2012 -+++ src/Makefile Thu Jan 31 12:00:38 2013 -@@ -48,7 +48,7 @@ CUSTOM = -custom - #MLLINK += -cclib -lcamlrund - MLBYTEFLAGS = -g -dtypes - else --CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) -+CFLAGS += -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) - ifneq ($(TOOLCHAIN),msvc) - CFLAGS += -O - endif -@@ -63,7 +63,7 @@ endif - THLINK = unix.cma threads.cma - - ifdef USE_CC --CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(CFLAGS) -+CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(CFLAGS) -fPIC - else - CCOMPILER = $(CAMLC) -c -ccopt '$(CFLAGS)' -verbose - endif -@@ -274,7 +274,7 @@ lablgtktop$(XE): $(MLLIBS) $(THOBJS) $(CONFIG) - endif - - lablgtk2: Makefile $(CONFIG) lablgtk2.in -- sed -e "s|@INSTALLDIR@|$(INSTALLDIR)|g" \ -+ sed -e "s|@INSTALLDIR@|$(LABLGTKDIR)|g" \ - -e "s|@LABLGLDIR@|$(LABLGLDIR)|g" \ - -e "s|@MLLIBS@|$(MLLINK) $(MLLIBS)|g" \ - -e "s|@INITOBJS@|$(INITOBJS)|g" \ -@@ -391,7 +391,9 @@ old-uninstall: - # Install using ocamlfind - findlib-install: - mkdir -p "$(BINDIR)" -- ocamlfind install lablgtk2 ../META \ -+ mkdir -p "$(DESTDIR)$(FINDLIBDIR)" -+ ocamlfind install -destdir "$(DESTDIR)$(FINDLIBDIR)" \ -+ lablgtk2 ../META \ - build.ml \ - $(CLIBS) \ - $(ALLOBJS:.cmo=.cmi) $(EXTRA_OBJS:.cmo=.cmi) \ -@@ -427,16 +429,19 @@ findlib-install: - then \ - echo $(CLIBS:lib%$(XA)=dll%$(XA)) ; \ - fi` -- $(RANLIB) $(CLIBS:%="`ocamlfind query lablgtk2 | tr -d '\r'`"/%) -- @if test -f lablgtk.cmxa; \ -- then ($(RANLIB) $(MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) $(EXTRA_MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) ); fi -- rm lablgtk2$(XB) -- $(MAKE) INSTALLDIR=`ocamlfind query lablgtk2 | tr -d '\r'` lablgtk2$(XB) -+ rm -f lablgtk2 -+ $(MAKE) lablgtk2 LABLGTKDIR="$(FINDLIBDIR)/lablgtk2" - cp lablgtk2$(XB) "$(BINDIR)" - if test -f lablgladecc$(XE); then \ - cp lablgladecc$(XE) "$(BINDIR)/lablgladecc2$(XE)"; \ - fi - cp gdk_pixbuf_mlsource$(XE) "$(BINDIR)" -+ $(RANLIB) $(CLIBS:%=$(FLINSTALLDIR)/%) -+ @if test -f lablgtk.cmxa; then \ -+ echo "Execute $(RANLIB) in $(FLINSTALLDIR)"; \ -+ $(RANLIB) $(MLLIBS:%.cma=$(FLINSTALLDIR)/%$(XA)) \ -+ $(EXTRA_MLLIBS:%.cma=$(FLINSTALLDIR)/%$(XA)) ; \ -+ fi - - findlib-uninstall: - ocamlfind remove lablgtk2 Index: patches/patch-src_gFile_ml =================================================================== RCS file: patches/patch-src_gFile_ml diff -N patches/patch-src_gFile_ml --- patches/patch-src_gFile_ml 18 Jun 2013 09:27:37 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_gFile_ml,v 1.1 2013/06/18 09:27:37 dcoppa Exp $ - -commit 1a609406b916016bdb1e81971db1d649c857a76a -Author: Jacques Garrigue <garri...@math.nagoya-u.ac.jp> -Date: Tue Feb 19 09:17:06 2013 +0900 - -fix compatibility with ocaml 4.01 - ---- src/gFile.ml.orig Thu Aug 23 12:37:48 2012 -+++ src/gFile.ml Tue Jun 18 10:15:53 2013 -@@ -179,7 +179,7 @@ let chooser_widget ~action ?backend ?packing ?show () - FileChooser.P.file_system_backend backend - [ Gobject.param FileChooser.P.action action ]) in - let o = new chooser_widget w in -- GObj.pack_return o ?packing ?show -+ GObj.pack_return o ~packing ~show - - class chooser_button_signals obj = object - inherit GContainer.container_signals_impl obj Index: patches/patch-src_gMenu_ml =================================================================== RCS file: patches/patch-src_gMenu_ml diff -N patches/patch-src_gMenu_ml --- patches/patch-src_gMenu_ml 18 Jun 2013 09:27:37 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_gMenu_ml,v 1.1 2013/06/18 09:27:37 dcoppa Exp $ - -commit 1a609406b916016bdb1e81971db1d649c857a76a -Author: Jacques Garrigue <garri...@math.nagoya-u.ac.jp> -Date: Tue Feb 19 09:17:06 2013 +0900 - -fix compatibility with ocaml 4.01 - ---- src/gMenu.ml.orig Thu Aug 23 12:37:48 2012 -+++ src/gMenu.ml Tue Jun 18 10:15:53 2013 -@@ -87,9 +87,9 @@ end - - class menu_item_skel = [menu_item] pre_menu_item_skel - --let pack_item self ~packing ~show = -+let pack_item ?packing ?(show=true) self = - may packing ~f:(fun f -> (f (self :> menu_item) : unit)); -- if show <> Some false then self#misc#show (); -+ if show then self#misc#show (); - self - - let menu_item ?use_mnemonic ?label ?right_justified ?packing ?show () = Index: patches/patch-src_gdk_ml =================================================================== RCS file: patches/patch-src_gdk_ml diff -N patches/patch-src_gdk_ml --- patches/patch-src_gdk_ml 1 Feb 2013 10:22:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_gdk_ml,v 1.1 2013/02/01 10:22:01 dcoppa Exp $ - -Add missing handling of new modifier keys (Meta, Super, Hyper) -(upstream git commit 579347d69a83703472ee8a46e522f5bb7b739d6b) - ---- src/gdk.ml.orig Thu Aug 23 12:37:48 2012 -+++ src/gdk.ml Fri Feb 1 09:46:59 2013 -@@ -137,7 +137,8 @@ module Convert = struct - = "ml_test_GdkModifier_val" - let modifier i = - List.filter [`SHIFT;`LOCK;`CONTROL;`MOD1;`MOD2;`MOD3;`MOD4;`MOD5; -- `BUTTON1;`BUTTON2;`BUTTON3;`BUTTON4;`BUTTON5] -+ `BUTTON1;`BUTTON2;`BUTTON3;`BUTTON4;`BUTTON5;`SUPER; -+ `HYPER;`META;`RELEASE] - ~f:(fun m -> test_modifier m i) - external test_window_state : window_state -> int -> bool - = "ml_test_GdkWindowState_val" Index: patches/patch-src_gobject_ml =================================================================== RCS file: patches/patch-src_gobject_ml diff -N patches/patch-src_gobject_ml --- patches/patch-src_gobject_ml 18 Jun 2013 09:27:37 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_gobject_ml,v 1.1 2013/06/18 09:27:37 dcoppa Exp $ - -commit b8d0ac8d321d54c21b1d3b74b6b7d617b3c97411 -Author: Jacques Garrigue <garri...@math.nagoya-u.ac.jp> -Date: Sat May 4 10:43:20 2013 +0900 - -Make Gobject.obj injective - ---- src/gobject.ml.orig Thu Aug 23 12:37:48 2012 -+++ src/gobject.ml Tue Jun 18 10:23:43 2013 -@@ -25,7 +25,8 @@ - open StdLabels - open Gaux - --type -'a obj -+type ghidden -+type -'a obj = private GOBJ of ghidden * ghidden - type g_type - type g_class - type g_value Index: patches/patch-src_gobject_mli =================================================================== RCS file: patches/patch-src_gobject_mli diff -N patches/patch-src_gobject_mli --- patches/patch-src_gobject_mli 18 Jun 2013 09:27:37 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_gobject_mli,v 1.1 2013/06/18 09:27:37 dcoppa Exp $ - -commit b8d0ac8d321d54c21b1d3b74b6b7d617b3c97411 -Author: Jacques Garrigue <garri...@math.nagoya-u.ac.jp> -Date: Sat May 4 10:43:20 2013 +0900 - -Make Gobject.obj injective - ---- src/gobject.mli.orig Thu Aug 23 12:37:48 2012 -+++ src/gobject.mli Tue Jun 18 10:23:43 2013 -@@ -24,3 +24,4 @@ - --type -'a obj -+type ghidden -+type -'a obj = private GOBJ of ghidden * ghidden - type g_type Index: patches/patch-src_gtkSignal_ml4 =================================================================== RCS file: patches/patch-src_gtkSignal_ml4 diff -N patches/patch-src_gtkSignal_ml4 --- patches/patch-src_gtkSignal_ml4 1 Feb 2013 10:22:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_gtkSignal_ml4,v 1.1 2013/02/01 10:22:01 dcoppa Exp $ - -[Bugfix] GtkSignal.connect_property: don't fetch the property value -by hand (upstream git commit adf6b7a5972356eddfdd6cb5243e4eaf8ea59d02) - ---- src/gtkSignal.ml4.orig Thu Aug 23 12:37:48 2012 -+++ src/gtkSignal.ml4 Fri Feb 1 09:46:33 2013 -@@ -200,6 +200,6 @@ let connect ~sgn: ((sgn:('a, _) t)) ~callback ?after ( - - let connect_property ~(prop:('a, _) property) ~callback (obj : 'a obj) = - let name = "notify::" ^ prop.Gobject.name in -- let callback = fun () -> callback (get prop obj) in -- connect_aux ~name ~marshaller:marshal_unit ~callback obj -+ let marshaller = marshal1 prop.conv name in -+ connect_aux ~name ~marshaller ~callback obj - Index: patches/patch-src_ml_glib_c =================================================================== RCS file: patches/patch-src_ml_glib_c diff -N patches/patch-src_ml_glib_c --- patches/patch-src_ml_glib_c 1 Feb 2013 10:22:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_ml_glib_c,v 1.1 2013/02/01 10:22:01 dcoppa Exp $ - -Fix a segmentation fault due to a bad C cast -(upstream git commit 1c20cc7454f3b6f5341ef906fb0bf07ca681fc5e) - ---- src/ml_glib.c.orig Thu Aug 23 12:37:48 2012 -+++ src/ml_glib.c Fri Feb 1 09:47:10 2013 -@@ -243,7 +243,7 @@ ML_2(g_log_set_fatal_mask, String_option_val, Int_val, - - CAMLprim value ml_g_log (value domain, value level, value msg) - { -- g_log (String_option_val(domain), Int_val(level), "%s", String_val(msg)); -+ g_log (String_val(domain), Int_val(level), "%s", String_val(msg)); - return Val_unit; - } - Index: patches/patch-src_ml_gtkstock_c =================================================================== RCS file: patches/patch-src_ml_gtkstock_c diff -N patches/patch-src_ml_gtkstock_c --- patches/patch-src_ml_gtkstock_c 1 Feb 2013 10:22:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_ml_gtkstock_c,v 1.1 2013/02/01 10:22:01 dcoppa Exp $ - -Add missing handling of new modifier keys (Meta, Super, Hyper) -(upstream git commit 579347d69a83703472ee8a46e522f5bb7b739d6b) - ---- src/ml_gtkstock.c.orig Thu Aug 23 12:37:48 2012 -+++ src/ml_gtkstock.c Fri Feb 1 09:46:59 2013 -@@ -139,6 +139,8 @@ CAMLprim value ml_gtk_stock_lookup(value id) - TESTANDCONS(MOD4); TESTANDCONS(MOD5); - TESTANDCONS(BUTTON1); TESTANDCONS(BUTTON2); TESTANDCONS(BUTTON3); - TESTANDCONS(BUTTON4); TESTANDCONS(BUTTON5); -+ TESTANDCONS(SUPER); TESTANDCONS(HYPER); -+ TESTANDCONS(META); TESTANDCONS(RELEASE); - stock_result = alloc_tuple(4); - Store_field(stock_result,0,Val_string(r.stock_id)); - Store_field(stock_result,1,Val_string(r.label));
