Updated ocaml-lablgtk to 2.18.4.

Remove camlp4 dependency (see changelog below).

In Lablgtk-2.18.4:

2016.04.27 [Jacques]
  * disable camlp4 make rule when no camlp4o available
  * update applications
  * rename GC module to GMain.Gc_custom

2016.04.11 [Jacques]
  * Fix ml_gnome_canvas_c2w (Didier Le Botlan)

2016.03.06 [Jacques]
  * remove build dependency on camlp4 (still needed for tree version)
  * allow to change the GC speed (i.e. the impact of custom blocks)
    see GMain.GC.set_speed.

2016.03.04 [Jacques]
  * use own definition of alloc_custom, to be sure to allocate in the heap

2015.04.16 [Jacques]
  * fix GtkTree.TreeModel.cast

2015.02.06 [Jacques]
  * add get_image and get_pixbuf to GDraw.drawable.

In Lablgtk-2.18.3:

2014.10.06 [Jacques]
  * add Gdk.Window.create_foreign and set_transient_for functions
    (Tim Cuthbertson)

2014.09.20 [Jacques]
  * CAMLparam initializes with Val_unit rather than 0 since ocaml 4.02.
    Fix a related problem in ml_gobject.
    This caused random crashes with unison (Christopher Zimmermann, PR#1425)

  * Also factorize some code to use Val_option_*
  * Replace XID by GdkNativeWindow where required.
    You may need to insert calls to Gdk.Window.native_of_xid in some places.

In Lablgtk-2.18.2:

2014.09.17 [Jacques]
  * Revert old commit which broke notify signals
  * Quote $(FLINSTALLDIR) in Makefile (cf PR#1342)
  * Update applications/browser for 4.02

2014.08.22 [Jacques]
  * Make Float_val an alias for Double_val, since it was used
    wrongly anyway (Felix Ruess)
  * Make GObj.misc_ops#add_accelerator polymorphic in the widget of
    the signal (Erkki Seppala)
  * Use properties in GtkAdjustment, rather than direct accessors

2013.12.31 [Jacques]
  * fix GtkTree.IconView.get_path_at_pos (Thomas Leonard)

2 files changed, 8 insertions, 13 deletions

diff --git a/x11/ocaml-lablgtk/Makefile b/x11/ocaml-lablgtk/Makefile
index a18de00bfd4..b36db8e30db 100644
--- a/x11/ocaml-lablgtk/Makefile
+++ b/x11/ocaml-lablgtk/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2016/05/05 11:45:42 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2016/05/22 17:42:14 wiz Exp $
 
-DISTNAME=	lablgtk-2.18.3
+DISTNAME=	lablgtk-2.18.4
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	10
 CATEGORIES=	x11
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1479/
+MASTER_SITES=	https://forge.ocamlcore.org/frs/download.php/1602/
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://lablgtk.forge.ocamlcore.org/
@@ -12,9 +11,6 @@ COMMENT=	GTK+ 2.x bindings for Objective Caml
 # for installed files; more restrictions on applications/
 LICENSE=	gnu-lgpl-v2
 
-# remove on next update
-DIST_SUBDIR=	lablgtk-2.18.3
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-debug
 USE_TOOLS+=		gmake pkg-config
@@ -47,6 +43,5 @@ PLIST.opt=	yes
 
 .include "options.mk"
 
-.include "../../lang/camlp4/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/ocaml-lablgtk/distinfo b/x11/ocaml-lablgtk/distinfo
index 7f1941957ef..cafc815490f 100644
--- a/x11/ocaml-lablgtk/distinfo
+++ b/x11/ocaml-lablgtk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 03:28:50 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/05/22 17:42:14 wiz Exp $
 
-SHA1 (lablgtk-2.18.3/lablgtk-2.18.3.tar.gz) = b8ecc3b160fcbce73062f3bad23a2a3b1c2735d3
-RMD160 (lablgtk-2.18.3/lablgtk-2.18.3.tar.gz) = 33fc2a3c126c6cda6db8a9e8d9556fbafcfc13d2
-SHA512 (lablgtk-2.18.3/lablgtk-2.18.3.tar.gz) = b455761cef742579449a46f98bf807732cc6b5384cbccf6d4eca940e351ccb5cbd464e0d81cda2884277b45a8f223838de44cb49878e2f602183c963cdb0defe
-Size (lablgtk-2.18.3/lablgtk-2.18.3.tar.gz) = 788177 bytes
+SHA1 (lablgtk-2.18.4.tar.gz) = 9f730829259240dc935e4c7f76dd4357d5d07961
+RMD160 (lablgtk-2.18.4.tar.gz) = a35b929e9e8f6dc871316b52323cb8d868d91b71
+SHA512 (lablgtk-2.18.4.tar.gz) = 8b400f6467929ee433541e9649bf0301be2c851c9bdbaf3f001fe2bf2e1ee755a6dbc541b8e0b571d567ee8c8a997323aeb731d6f73a54b1594977237ff76d25
+Size (lablgtk-2.18.4.tar.gz) = 800059 bytes
 SHA1 (patch-src_Makefile) = a24fafdbc273863e110d4becb79f849053ec9a9c