ports/152461: [PATCH] x11-toolkits/ocaml-lablgtk2: upgrade to 2.14.2 and unbreak

[Guido Falsi]

>Number:         152461
>Category:       ports
>Synopsis:       [PATCH] x11-toolkits/ocaml-lablgtk2: upgrade to 2.14.2 and unbreak
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 21 22:40:11 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Guido Falsi
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
none
>Environment:
System: FreeBSD megatron.madpilot.net 8.1-STABLE FreeBSD 8.1-STABLE #23: Sun Nov 14 14:54:14 CET 2010 root at megatron.madpilot.net:/usr/obj/usr/src/sys/MEGATRON amd64

>Description:

unbreak by upgrading to latest version, 2.14.2.

This version includes patches solving the issue described in PR
ports/148419

added dir:

files

added files:

files/patch-configure

>How-To-Repeat:
>Fix:

diff -ruN ocaml-lablgtk2.old/Makefile ocaml-lablgtk2/Makefile
--- ocaml-lablgtk2.old/Makefile	2010-11-21 23:19:48.000000000 +0100
+++ ocaml-lablgtk2/Makefile	2010-11-21 23:20:13.000000000 +0100
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/x11-toolkits/ocaml-lablgtk2/Makefile,v 1.27 2010/11/20 15:37:06 kwm Exp $
 
 PORTNAME=	lablgtk2
-PORTVERSION=	2.14.0
-PORTREVISION=	2
+PORTVERSION=	2.14.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/olabl/ \
 		http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \
@@ -18,8 +17,6 @@
 MAINTAINER=	stas at FreeBSD.org
 COMMENT=	An Objective Caml interface to GTK+ 2.x
 
-BROKEN=		Doesn't build with Glib 2.26
-
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_OCAML=	yes
diff -ruN ocaml-lablgtk2.old/distinfo ocaml-lablgtk2/distinfo
--- ocaml-lablgtk2.old/distinfo	2010-11-21 23:19:48.000000000 +0100
+++ ocaml-lablgtk2/distinfo	2010-11-21 23:20:13.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (lablgtk-2.14.0.tar.gz) = 8a26ab3b749ea86d06b2868112332c33
-SHA256 (lablgtk-2.14.0.tar.gz) = 22a0dcf1b268c32023eee8a10346debc724961474f0c08958c1a53934917156a
-SIZE (lablgtk-2.14.0.tar.gz) = 775221
+SHA256 (lablgtk-2.14.2.tar.gz) = 4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba
+SIZE (lablgtk-2.14.2.tar.gz) = 779803
diff -ruN ocaml-lablgtk2.old/files/patch-configure ocaml-lablgtk2/files/patch-configure
--- ocaml-lablgtk2.old/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
+++ ocaml-lablgtk2/files/patch-configure	2010-11-21 23:20:13.000000000 +0100
@@ -0,0 +1,11 @@
+--- configure.orig	2010-01-15 14:55:24.866388457 +0100
++++ configure	2010-01-15 14:56:11.795951770 +0100
+@@ -2450,7 +2450,7 @@
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_CAMLP4O="camlp4o"
++    ac_cv_prog_CAMLP4O="camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo"
+     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
>Release-Note:
>Audit-Trail:
>Unformatted: