From 7ae5bc58070b97d664fbbe06cf34a49eb34ca247 Mon Sep 17 00:00:00 2001 From: dcoppa Date: Tue, 22 May 2012 13:56:33 +0000 Subject: [PATCH] Fix double definition of 'directory'. From Christopher Zimmermann, thanks OK jasper@ --- x11/lablgtk2/Makefile | 4 ++-- x11/lablgtk2/patches/patch-META | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile index 7f577fc0a95..0675cb2de66 100644 --- a/x11/lablgtk2/Makefile +++ b/x11/lablgtk2/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.18 2011/09/16 12:29:16 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2012/05/22 13:56:33 dcoppa Exp $ COMMENT = OCaml interface to GTK+2 V = 2.14.2 DISTNAME = lablgtk-$V PKGNAME = lablgtk2-$V -REVISION = 4 +REVISION = 5 CATEGORIES = x11 devel HOMEPAGE = http://lablgtk.forge.ocamlcore.org/ diff --git a/x11/lablgtk2/patches/patch-META b/x11/lablgtk2/patches/patch-META index 184ef95163b..cb5175f6adc 100644 --- a/x11/lablgtk2/patches/patch-META +++ b/x11/lablgtk2/patches/patch-META @@ -1,7 +1,7 @@ -$OpenBSD: patch-META,v 1.2 2009/10/27 09:25:38 giovanni Exp $ +$OpenBSD: patch-META,v 1.3 2012/05/22 13:56:33 dcoppa Exp $ --- META.orig Fri Feb 13 03:39:14 2009 -+++ META Wed Oct 21 17:30:00 2009 -@@ -1,8 +1,14 @@ ++++ META Tue May 22 15:50:54 2012 +@@ -1,8 +1,13 @@ requires="" -version="2.12.0" -archive(byte)="lablgtk.cma" @@ -12,7 +12,6 @@ $OpenBSD: patch-META,v 1.2 2009/10/27 09:25:38 giovanni Exp $ +version="2.14.0" directory="+lablgtk2" +requires(lablGL)="lablGL" -+directory="+lablgtk2" +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"