Hi all, This is an update to the latest lablgtk.
Tested on amd64 and sparc64, both mldonkey and unison build fine. Hope I did the native/non-native/dynlink dance well... Please, have a look at it. Ciao David Index: Makefile =================================================================== RCS file: /cvs/ports/x11/lablgtk2/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile 22 May 2012 13:56:33 -0000 1.19 +++ Makefile 19 Sep 2012 08:42:50 -0000 @@ -2,14 +2,13 @@ COMMENT = OCaml interface to GTK+2 -V = 2.14.2 +V = 2.16.0 DISTNAME = lablgtk-$V PKGNAME = lablgtk2-$V -REVISION = 5 CATEGORIES = x11 devel HOMEPAGE = http://lablgtk.forge.ocamlcore.org/ -MASTER_SITES = https://forge.ocamlcore.org/frs/download.php/561/ +MASTER_SITES = https://forge.ocamlcore.org/frs/download.php/979/ # LGPL PERMIT_PACKAGE_CDROM = Yes @@ -17,13 +16,15 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes -WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo drm -WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 -WANTLIB += gio-2.0 glade-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += gthread-2.0 gtk-x11-2.0 gtksourceview-2.0 m pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs -WANTLIB += rsvg-2 xcb xcb-render xcb-shm xml2 z +WANTLIB = GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi \ + Xinerama Xrandr Xrender atk-1.0 cairo expat \ + fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \ + gio-2.0 glade-2.0 glib-2.0 gobject-2.0 \ + gtk-x11-2.0 gtksourceview-2.0 m pango-1.0 \ + pangocairo-1.0 pangoft2-1.0 pixman-1 png \ + pthread-stubs rsvg-2 xcb xcb-render xcb-shm xml2 z + +BUILD_DEPENDS = sysutils/findlib LIB_DEPENDS = x11/gtk+2 \ devel/libglade2 \ Index: distinfo =================================================================== RCS file: /cvs/ports/x11/lablgtk2/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 17 Sep 2010 15:44:55 -0000 1.4 +++ distinfo 19 Sep 2012 08:42:50 -0000 @@ -1,5 +1,2 @@ -MD5 (lablgtk-2.14.2.tar.gz) = utd2gKctq4uRXK6Z0eybHw== -RMD160 (lablgtk-2.14.2.tar.gz) = qkY3BTmOtgcSGH72olKEn7Wcv/I= -SHA1 (lablgtk-2.14.2.tar.gz) = /RhEGMy8VCgldIymP7p1E40upWE= -SHA256 (lablgtk-2.14.2.tar.gz) = SYGr7avcRiMD80UQQELIivInzNUP0wqb9I/TU6sC0Lo= -SIZE (lablgtk-2.14.2.tar.gz) = 779803 +SHA256 (lablgtk-2.16.0.tar.gz) = oOqXUuslfa3PwpFECP/zOdTDQ1eALwLGMyndQbd33i8= +SIZE (lablgtk-2.16.0.tar.gz) = 787217 Index: patches/patch-META =================================================================== RCS file: patches/patch-META diff -N patches/patch-META --- patches/patch-META 22 May 2012 13:56:33 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-META,v 1.3 2012/05/22 13:56:33 dcoppa Exp $ ---- META.orig Fri Feb 13 03:39:14 2009 -+++ META Tue May 22 15:50:54 2012 -@@ -1,8 +1,13 @@ - requires="" --version="2.12.0" --archive(byte)="lablgtk.cma" --archive(byte,init)="lablgtk.cma gtkInit.cmo" --archive(native)="lablgtk.cmxa" --archive(native,init)="lablgtk.cmxa gtkInit.cmx" --linkopts="" -+version="2.14.0" - directory="+lablgtk2" -+requires(lablGL)="lablGL" -+archive(byte)="lablgtk.cma lablgnomecanvas.cma gtkInit.cmo" -+archive(native)="lablgtk.cmxa lablgnomecanvas.cmxa gtkInit.cmx" -+archive(byte,lablGL)="lablgtk.cma lablgtkgl.cma lablgnomecanvas.cma gtkInit.cmo" -+archive(native,lablGL)="lablgtk.cmxa lablgtkgl.cmxa lablgnomecanvas.cmxa gtkInit.cmx" -+archive(byte,mt) += "gtkThread.cmo" -+archive(native,mt) += "gtkThread.cmx" -+archive(byte,lablGL,mt) += "gtkThread.cmo" -+archive(native,lablGL,mt) += "gtkThread.cmx" -+archive(toploop,mt) += "gtkThInit.cmo" Index: patches/patch-src_Makefile =================================================================== RCS file: /cvs/ports/x11/lablgtk2/patches/patch-src_Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_Makefile --- patches/patch-src_Makefile 28 May 2009 09:18:24 -0000 1.1.1.1 +++ patches/patch-src_Makefile 19 Sep 2012 08:42:50 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_Makefile,v 1.1.1.1 2009/05/28 09:18:24 giovanni Exp $ ---- src/Makefile.orig Fri Dec 26 05:28:27 2008 -+++ src/Makefile Tue May 19 18:38:19 2009 -@@ -46,7 +46,7 @@ CUSTOM = -custom +--- src/Makefile.orig Thu Aug 23 12:37:48 2012 ++++ src/Makefile Fri Aug 24 12:06:15 2012 +@@ -48,7 +48,7 @@ CUSTOM = -custom #MLLINK += -cclib -lcamlrund MLBYTEFLAGS = -g -dtypes else @@ -10,7 +10,7 @@ $OpenBSD: patch-src_Makefile,v 1.1.1.1 2 ifneq ($(TOOLCHAIN),msvc) CFLAGS += -O endif -@@ -61,7 +61,7 @@ endif +@@ -63,7 +63,7 @@ endif THLINK = unix.cma threads.cma ifdef USE_CC Index: pkg/PFRAG.dynlink-native =================================================================== RCS file: pkg/PFRAG.dynlink-native diff -N pkg/PFRAG.dynlink-native --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/PFRAG.dynlink-native 19 Sep 2012 08:42:50 -0000 @@ -0,0 +1,5 @@ +@comment $OpenBSD$ +@bin lib/ocaml/lablgtk2/lablglade.cmxs +@bin lib/ocaml/lablgtk2/lablgtk.cmxs +@bin lib/ocaml/lablgtk2/lablgtksourceview2.cmxs +@bin lib/ocaml/lablgtk2/lablrsvg.cmxs Index: pkg/PFRAG.native =================================================================== RCS file: /cvs/ports/x11/lablgtk2/pkg/PFRAG.native,v retrieving revision 1.5 diff -u -p -r1.5 PFRAG.native --- pkg/PFRAG.native 19 Jan 2011 23:36:18 -0000 1.5 +++ pkg/PFRAG.native 19 Sep 2012 08:42:50 -0000 @@ -1,4 +1,5 @@ @comment $OpenBSD: PFRAG.native,v 1.5 2011/01/19 23:36:18 jasper Exp $ +%%dynlink%% lib/ocaml/lablgtk2/gAction.cmx lib/ocaml/lablgtk2/gAssistant.cmx lib/ocaml/lablgtk2/gBin.cmx @@ -34,45 +35,71 @@ lib/ocaml/lablgtk2/glib.cmx lib/ocaml/lablgtk2/gobject.cmx lib/ocaml/lablgtk2/gpointer.cmx lib/ocaml/lablgtk2/gtk.cmx +lib/ocaml/lablgtk2/gtkActionProps.cmx lib/ocaml/lablgtk2/gtkAssistant.cmx +lib/ocaml/lablgtk2/gtkAssistantProps.cmx lib/ocaml/lablgtk2/gtkBase.cmx +lib/ocaml/lablgtk2/gtkBaseProps.cmx lib/ocaml/lablgtk2/gtkBin.cmx +lib/ocaml/lablgtk2/gtkBinProps.cmx lib/ocaml/lablgtk2/gtkBroken.cmx +lib/ocaml/lablgtk2/gtkBrokenProps.cmx lib/ocaml/lablgtk2/gtkButton.cmx +lib/ocaml/lablgtk2/gtkButtonProps.cmx lib/ocaml/lablgtk2/gtkData.cmx lib/ocaml/lablgtk2/gtkEdit.cmx +lib/ocaml/lablgtk2/gtkEditProps.cmx lib/ocaml/lablgtk2/gtkEnums.cmx lib/ocaml/lablgtk2/gtkFile.cmx +lib/ocaml/lablgtk2/gtkFileProps.cmx lib/ocaml/lablgtk2/gtkInit.cmx lib/ocaml/lablgtk2/gtkInit.o lib/ocaml/lablgtk2/gtkList.cmx +lib/ocaml/lablgtk2/gtkListProps.cmx lib/ocaml/lablgtk2/gtkMain.cmx lib/ocaml/lablgtk2/gtkMenu.cmx +lib/ocaml/lablgtk2/gtkMenuProps.cmx lib/ocaml/lablgtk2/gtkMisc.cmx +lib/ocaml/lablgtk2/gtkMiscProps.cmx lib/ocaml/lablgtk2/gtkObject.cmx lib/ocaml/lablgtk2/gtkPack.cmx +lib/ocaml/lablgtk2/gtkPackProps.cmx lib/ocaml/lablgtk2/gtkRange.cmx +lib/ocaml/lablgtk2/gtkRangeProps.cmx lib/ocaml/lablgtk2/gtkSignal.cmx lib/ocaml/lablgtk2/gtkSourceView2.cmx lib/ocaml/lablgtk2/gtkStock.cmx lib/ocaml/lablgtk2/gtkText.cmx +lib/ocaml/lablgtk2/gtkTextProps.cmx lib/ocaml/lablgtk2/gtkThread.cmx lib/ocaml/lablgtk2/gtkThread.o lib/ocaml/lablgtk2/gtkTree.cmx +lib/ocaml/lablgtk2/gtkTreeProps.cmx lib/ocaml/lablgtk2/gtkWindow.cmx lib/ocaml/lablgtk2/gutf8.cmx lib/ocaml/lablgtk2/lablglade.a lib/ocaml/lablgtk2/lablglade.cmxa -@bin lib/ocaml/lablgtk2/lablglade.cmxs lib/ocaml/lablgtk2/lablgtk.a lib/ocaml/lablgtk2/lablgtk.cmxa -@bin lib/ocaml/lablgtk2/lablgtk.cmxs lib/ocaml/lablgtk2/lablgtksourceview2.a lib/ocaml/lablgtk2/lablgtksourceview2.cmxa -@bin lib/ocaml/lablgtk2/lablgtksourceview2.cmxs lib/ocaml/lablgtk2/lablrsvg.a lib/ocaml/lablgtk2/lablrsvg.cmxa -@bin lib/ocaml/lablgtk2/lablrsvg.cmxs +lib/ocaml/lablgtk2/ogtkActionProps.cmx +lib/ocaml/lablgtk2/ogtkAssistantProps.cmx +lib/ocaml/lablgtk2/ogtkBaseProps.cmx +lib/ocaml/lablgtk2/ogtkBinProps.cmx +lib/ocaml/lablgtk2/ogtkBrokenProps.cmx +lib/ocaml/lablgtk2/ogtkButtonProps.cmx +lib/ocaml/lablgtk2/ogtkEditProps.cmx +lib/ocaml/lablgtk2/ogtkFileProps.cmx +lib/ocaml/lablgtk2/ogtkListProps.cmx +lib/ocaml/lablgtk2/ogtkMenuProps.cmx +lib/ocaml/lablgtk2/ogtkMiscProps.cmx +lib/ocaml/lablgtk2/ogtkPackProps.cmx +lib/ocaml/lablgtk2/ogtkRangeProps.cmx +lib/ocaml/lablgtk2/ogtkTextProps.cmx +lib/ocaml/lablgtk2/ogtkTreeProps.cmx lib/ocaml/lablgtk2/pango.cmx lib/ocaml/lablgtk2/pangoEnums.cmx lib/ocaml/lablgtk2/rsvg.cmx Index: pkg/PFRAG.shared =================================================================== RCS file: /cvs/ports/x11/lablgtk2/pkg/PFRAG.shared,v retrieving revision 1.2 diff -u -p -r1.2 PFRAG.shared --- pkg/PFRAG.shared 14 Jan 2011 19:38:33 -0000 1.2 +++ pkg/PFRAG.shared 19 Sep 2012 08:42:50 -0000 @@ -1,5 +1,4 @@ @comment $OpenBSD: PFRAG.shared,v 1.2 2011/01/14 19:38:33 jasper Exp $ -lib/ocaml/stublibs/ lib/ocaml/stublibs/dlllablglade2.so lib/ocaml/stublibs/dlllablgtk2.so lib/ocaml/stublibs/dlllablgtksourceview2.so Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/lablgtk2/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 19 Jan 2011 23:36:18 -0000 1.7 +++ pkg/PLIST 19 Sep 2012 08:42:50 -0000 @@ -1,10 +1,16 @@ @comment $OpenBSD: PLIST,v 1.7 2011/01/19 23:36:18 jasper Exp $ %%SHARED%% +%%native%% +@comment lib/ocaml/stublibs/dlllablglade2.so.owner +@comment lib/ocaml/stublibs/dlllablgtk2.so.owner +@comment lib/ocaml/stublibs/dlllablgtksourceview2.so.owner +@comment lib/ocaml/stublibs/dlllablrsvg.so.owner bin/gdk_pixbuf_mlsource bin/lablgladecc2 bin/lablgtk2 -lib/ocaml/ lib/ocaml/lablgtk2/ +lib/ocaml/lablgtk2/META +lib/ocaml/lablgtk2/build.ml lib/ocaml/lablgtk2/gAction.cmi lib/ocaml/lablgtk2/gAction.ml lib/ocaml/lablgtk2/gAction.mli @@ -113,41 +119,67 @@ lib/ocaml/lablgtk2/gpointer.ml lib/ocaml/lablgtk2/gpointer.mli lib/ocaml/lablgtk2/gtk.cmi lib/ocaml/lablgtk2/gtk.ml +lib/ocaml/lablgtk2/gtkActionProps.cmi +lib/ocaml/lablgtk2/gtkActionProps.ml lib/ocaml/lablgtk2/gtkAssistant.cmi lib/ocaml/lablgtk2/gtkAssistant.ml +lib/ocaml/lablgtk2/gtkAssistantProps.cmi +lib/ocaml/lablgtk2/gtkAssistantProps.ml lib/ocaml/lablgtk2/gtkBase.cmi lib/ocaml/lablgtk2/gtkBase.ml +lib/ocaml/lablgtk2/gtkBaseProps.cmi +lib/ocaml/lablgtk2/gtkBaseProps.ml lib/ocaml/lablgtk2/gtkBin.cmi lib/ocaml/lablgtk2/gtkBin.ml +lib/ocaml/lablgtk2/gtkBinProps.cmi +lib/ocaml/lablgtk2/gtkBinProps.ml lib/ocaml/lablgtk2/gtkBroken.cmi lib/ocaml/lablgtk2/gtkBroken.ml +lib/ocaml/lablgtk2/gtkBrokenProps.cmi +lib/ocaml/lablgtk2/gtkBrokenProps.ml lib/ocaml/lablgtk2/gtkButton.cmi lib/ocaml/lablgtk2/gtkButton.ml +lib/ocaml/lablgtk2/gtkButtonProps.cmi +lib/ocaml/lablgtk2/gtkButtonProps.ml lib/ocaml/lablgtk2/gtkData.cmi lib/ocaml/lablgtk2/gtkData.ml lib/ocaml/lablgtk2/gtkEdit.cmi lib/ocaml/lablgtk2/gtkEdit.ml +lib/ocaml/lablgtk2/gtkEditProps.cmi +lib/ocaml/lablgtk2/gtkEditProps.ml lib/ocaml/lablgtk2/gtkEnums.cmi lib/ocaml/lablgtk2/gtkEnums.ml lib/ocaml/lablgtk2/gtkFile.cmi lib/ocaml/lablgtk2/gtkFile.ml +lib/ocaml/lablgtk2/gtkFileProps.cmi +lib/ocaml/lablgtk2/gtkFileProps.ml lib/ocaml/lablgtk2/gtkInit.cmi lib/ocaml/lablgtk2/gtkInit.cmo lib/ocaml/lablgtk2/gtkInit.ml lib/ocaml/lablgtk2/gtkList.cmi lib/ocaml/lablgtk2/gtkList.ml +lib/ocaml/lablgtk2/gtkListProps.cmi +lib/ocaml/lablgtk2/gtkListProps.ml lib/ocaml/lablgtk2/gtkMain.cmi lib/ocaml/lablgtk2/gtkMain.ml lib/ocaml/lablgtk2/gtkMenu.cmi lib/ocaml/lablgtk2/gtkMenu.ml +lib/ocaml/lablgtk2/gtkMenuProps.cmi +lib/ocaml/lablgtk2/gtkMenuProps.ml lib/ocaml/lablgtk2/gtkMisc.cmi lib/ocaml/lablgtk2/gtkMisc.ml +lib/ocaml/lablgtk2/gtkMiscProps.cmi +lib/ocaml/lablgtk2/gtkMiscProps.ml lib/ocaml/lablgtk2/gtkObject.cmi lib/ocaml/lablgtk2/gtkObject.ml lib/ocaml/lablgtk2/gtkPack.cmi lib/ocaml/lablgtk2/gtkPack.ml +lib/ocaml/lablgtk2/gtkPackProps.cmi +lib/ocaml/lablgtk2/gtkPackProps.ml lib/ocaml/lablgtk2/gtkRange.cmi lib/ocaml/lablgtk2/gtkRange.ml +lib/ocaml/lablgtk2/gtkRangeProps.cmi +lib/ocaml/lablgtk2/gtkRangeProps.ml lib/ocaml/lablgtk2/gtkSignal.cmi lib/ocaml/lablgtk2/gtkSignal.ml lib/ocaml/lablgtk2/gtkSignal.mli @@ -160,6 +192,8 @@ lib/ocaml/lablgtk2/gtkStock.cmi lib/ocaml/lablgtk2/gtkStock.ml lib/ocaml/lablgtk2/gtkText.cmi lib/ocaml/lablgtk2/gtkText.ml +lib/ocaml/lablgtk2/gtkTextProps.cmi +lib/ocaml/lablgtk2/gtkTextProps.ml lib/ocaml/lablgtk2/gtkThInit.cmi lib/ocaml/lablgtk2/gtkThInit.cmo lib/ocaml/lablgtk2/gtkThInit.ml @@ -169,6 +203,8 @@ lib/ocaml/lablgtk2/gtkThread.ml lib/ocaml/lablgtk2/gtkThread.mli lib/ocaml/lablgtk2/gtkTree.cmi lib/ocaml/lablgtk2/gtkTree.ml +lib/ocaml/lablgtk2/gtkTreeProps.cmi +lib/ocaml/lablgtk2/gtkTreeProps.ml lib/ocaml/lablgtk2/gtkWindow.cmi lib/ocaml/lablgtk2/gtkWindow.ml lib/ocaml/lablgtk2/gtk_tags.h @@ -194,6 +230,36 @@ lib/ocaml/lablgtk2/ml_gtktext.h lib/ocaml/lablgtk2/ml_gtktree.h lib/ocaml/lablgtk2/ml_gvaluecaml.h lib/ocaml/lablgtk2/ml_pango.h +lib/ocaml/lablgtk2/ogtkActionProps.cmi +lib/ocaml/lablgtk2/ogtkActionProps.ml +lib/ocaml/lablgtk2/ogtkAssistantProps.cmi +lib/ocaml/lablgtk2/ogtkAssistantProps.ml +lib/ocaml/lablgtk2/ogtkBaseProps.cmi +lib/ocaml/lablgtk2/ogtkBaseProps.ml +lib/ocaml/lablgtk2/ogtkBinProps.cmi +lib/ocaml/lablgtk2/ogtkBinProps.ml +lib/ocaml/lablgtk2/ogtkBrokenProps.cmi +lib/ocaml/lablgtk2/ogtkBrokenProps.ml +lib/ocaml/lablgtk2/ogtkButtonProps.cmi +lib/ocaml/lablgtk2/ogtkButtonProps.ml +lib/ocaml/lablgtk2/ogtkEditProps.cmi +lib/ocaml/lablgtk2/ogtkEditProps.ml +lib/ocaml/lablgtk2/ogtkFileProps.cmi +lib/ocaml/lablgtk2/ogtkFileProps.ml +lib/ocaml/lablgtk2/ogtkListProps.cmi +lib/ocaml/lablgtk2/ogtkListProps.ml +lib/ocaml/lablgtk2/ogtkMenuProps.cmi +lib/ocaml/lablgtk2/ogtkMenuProps.ml +lib/ocaml/lablgtk2/ogtkMiscProps.cmi +lib/ocaml/lablgtk2/ogtkMiscProps.ml +lib/ocaml/lablgtk2/ogtkPackProps.cmi +lib/ocaml/lablgtk2/ogtkPackProps.ml +lib/ocaml/lablgtk2/ogtkRangeProps.cmi +lib/ocaml/lablgtk2/ogtkRangeProps.ml +lib/ocaml/lablgtk2/ogtkTextProps.cmi +lib/ocaml/lablgtk2/ogtkTextProps.ml +lib/ocaml/lablgtk2/ogtkTreeProps.cmi +lib/ocaml/lablgtk2/ogtkTreeProps.ml lib/ocaml/lablgtk2/panel.mli lib/ocaml/lablgtk2/pango.cmi lib/ocaml/lablgtk2/pango.ml @@ -214,6 +280,5 @@ lib/ocaml/lablgtk2/xml_lexer.mli lib/ocaml/site-lib/ lib/ocaml/site-lib/lablgtk2/ lib/ocaml/site-lib/lablgtk2/META -%%native%% share/doc/lablgtk2/ share/doc/lablgtk2/README
lablgtk2-2.16.0_v2.diff.gz
Description: Binary data
