Updated package to newest version, 2.18.2 and renamed ocaml-lablgtk for

clarity. Package uses ocaml.mk framework.

Changes:
  * Revert old commit which broke notify signals
  * Quote $(FLINSTALLDIR) in Makefile
  * Update applications/browser for 4.02
  * 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
  * fix GtkTree.IconView.get_path_at_pos (Thomas Leonard)
  * add gtksourceview2 to windows binaries

3 files changed, 24 insertions, 25 deletions

diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 4456882bba9..5be09a4fe80 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.91 2014/10/07 16:47:15 adam Exp $
+# $NetBSD: Makefile,v 1.92 2014/10/09 22:24:15 jaapb Exp $
 #
 
-DISTNAME=	lablgtk-2.18.0
-PKGREVISION=	5
+DISTNAME=	lablgtk-2.18.2
 CATEGORIES=	x11
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1261/
+MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1456/
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://lablgtk.forge.ocamlcore.org/
@@ -14,6 +13,7 @@ LICENSE=	gnu-lgpl-v2
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config
+OCAML_USE_FINDLIB=	yes
 
 MAKE_JOBS_SAFE=		no
 BUILD_TARGET=		world
@@ -21,6 +21,7 @@ BUILD_TARGET=		world
 BUILDLINK_DEPMETHOD.ocaml=	full
 
 CONFLICTS=	lablgtk2-2.*{,nb*}
+SUPERSEDES=	lablgtk-2.*{,nb*}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -33,16 +34,14 @@ PLIST_VARS+=	stubs opt
 PLIST.stubs=	yes
 .endif
 
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
+.include "../../mk/ocaml.mk"
+
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
 PLIST.opt=      yes
 .endif
 
 .include "options.mk"
 
-INSTALLATION_DIRS+=	lib/ocaml/site-lib
-
-.include "../../lang/ocaml/buildlink3.mk"
-.include "../../devel/ocaml-findlib/buildlink3.mk"
+.include "../../lang/camlp4/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lablgtk/buildlink3.mk b/x11/lablgtk/buildlink3.mk
index c51b55f4684..7a8ec885fb0 100644
--- a/x11/lablgtk/buildlink3.mk
+++ b/x11/lablgtk/buildlink3.mk
@@ -1,22 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.38 2014/10/07 16:47:15 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2014/10/09 22:24:15 jaapb Exp $
 
-BUILDLINK_TREE+=	lablgtk
+BUILDLINK_TREE+=	ocaml-lablgtk
 
-.if !defined(LABLGTK_BUILDLINK3_MK)
-LABLGTK_BUILDLINK3_MK:=
+.if !defined(OCAML_LABLGTK_BUILDLINK3_MK)
+OCAML_LABLGTK_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.lablgtk+=	lablgtk>=2.6.0nb3
-BUILDLINK_ABI_DEPENDS.lablgtk+=	lablgtk>=2.18.0nb5
-BUILDLINK_PKGSRCDIR.lablgtk?=	../../x11/lablgtk
+BUILDLINK_API_DEPENDS.ocaml-lablgtk+=	ocaml-lablgtk>=2.6.0nb3
+BUILDLINK_ABI_DEPENDS.ocaml-lablgtk+=	ocaml-lablgtk>=2.18.2
+BUILDLINK_PKGSRCDIR.ocaml-lablgtk?=	../../x11/lablgtk
 
 # gnome-panel must be exposed if and only if we built with it
-pkgbase := lablgtk
+pkgbase := ocaml-lablgtk
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.lablgtk:Mgnomecanvas)
+.if !empty(PKG_BUILD_OPTIONS.ocaml-lablgtk:Mgnomecanvas)
 .  include "../../x11/gnome-panel/buildlink3.mk"
 .endif
 
-.endif # LABLGTK_BUILDLINK3_MK
+.endif # OCAML_LABLGTK_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-lablgtk
+BUILDLINK_TREE+=	-ocaml-lablgtk
diff --git a/x11/lablgtk/distinfo b/x11/lablgtk/distinfo
index 233076ff2c5..31f423634d8 100644
--- a/x11/lablgtk/distinfo
+++ b/x11/lablgtk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2013/11/01 21:41:45 jaapb Exp $
+$NetBSD: distinfo,v 1.20 2014/10/09 22:24:15 jaapb Exp $
 
-SHA1 (lablgtk-2.18.0.tar.gz) = df65c72783dc20c364b8a2e2ee5aa07042e68eae
-RMD160 (lablgtk-2.18.0.tar.gz) = af5d64cbcaa0bee3ad58954a74cd99096fe57152
-Size (lablgtk-2.18.0.tar.gz) = 789507 bytes
+SHA1 (lablgtk-2.18.2.tar.gz) = 329f7f5eeccc14d6819425dde3be5cf6901cda34
+RMD160 (lablgtk-2.18.2.tar.gz) = 165f78a560dcf050ed6237639a14b176bdeffab0
+Size (lablgtk-2.18.2.tar.gz) = 787674 bytes
 SHA1 (patch-src_Makefile) = a24fafdbc273863e110d4becb79f849053ec9a9c