Re: [update] lablgtk2-2.16.0

2012-10-08 Thread Anil Madhavapeddy
On 19 Sep 2012, at 01:52, David Coppa dco...@openbsd.org wrote:

 -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-META22 May 2012 13:56:33 -  1.3
 +++ /dev/null 1 Jan 1970 00:00:00 -
 @@ -1,23 +0,0 @@
 -$OpenBSD: patch-META,v 1.3 2012/05/22 13:56:33 dcoppa Exp $
  META.origFri 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

I'm happy except for this... is this an upstream bug in the META file?
Shouldn't it be 2.16.0 ?

-anil


 - directory=+lablgtk2
 -+requires(lablGL)=lablGL
 -+archive(byte)=lablgtk.cma  lablgnomecanvas.cma  gtkInit.cmo



Re: [update] lablgtk2-2.16.0

2012-10-08 Thread David Coppa
On Mon, Oct 8, 2012 at 5:03 PM, Anil Madhavapeddy a...@recoil.org wrote:
 On 19 Sep 2012, at 01:52, David Coppa dco...@openbsd.org wrote:

 -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-META22 May 2012 13:56:33 -  1.3
 +++ /dev/null 1 Jan 1970 00:00:00 -
 @@ -1,23 +0,0 @@
 -$OpenBSD: patch-META,v 1.3 2012/05/22 13:56:33 dcoppa Exp $
  META.origFri 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

 I'm happy except for this... is this an upstream bug in the META file?
 Shouldn't it be 2.16.0 ?

This is the old META file.

patches/patch-META is gone:

--- patches/patch-META  22 May 2012 13:56:33 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -



Re: [update] lablgtk2-2.16.0

2012-10-08 Thread Anil Madhavapeddy
On 8 Oct 2012, at 08:08, David Coppa dco...@gmail.com wrote:
 This is the old META file.
 
 patches/patch-META is gone:
 
 --- patches/patch-META  22 May 2012 13:56:33 -  1.3
 +++ /dev/null   1 Jan 1970 00:00:00 -
 

oops, diffsofdiffs...sorry!

-anil



[update] lablgtk2-2.16.0

2012-09-19 Thread David Coppa

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
--- Makefile22 May 2012 13:56:33 -  1.19
+++ Makefile19 Sep 2012 08:42:50 -
@@ -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
--- distinfo17 Sep 2010 15:44:55 -  1.4
+++ distinfo19 Sep 2012 08:42:50 -
@@ -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 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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 -  1.1.1.1
+++ patches/patch-src_Makefile  19 Sep 2012 08:42:50 -
@@ -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