[pkgsrc/trunk]: pkgsrc Fix x11/labltk for ocaml 3.11.1 [PR pkg/42017]

[tonio <tonio%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9451fb275a77
branches:  trunk
changeset: 398778:9451fb275a77
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Tue Sep 08 18:35:46 2009 +0000

description:
Fix x11/labltk for ocaml 3.11.1 [PR pkg/42017]

diffstat:

 lang/ocaml/Makefile.common  |  6 +++++-
 lang/ocaml/distinfo         |  4 ++--
 lang/ocaml/patches/patch-bc |  4 ++--
 x11/labltk/Makefile         |  3 +--
 4 files changed, 10 insertions(+), 7 deletions(-)

diffs (71 lines):

diff -r 3a98e9f7242b -r 9451fb275a77 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common        Tue Sep 08 18:13:42 2009 +0000
+++ b/lang/ocaml/Makefile.common        Tue Sep 08 18:35:46 2009 +0000
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.common,v 1.23 2009/09/07 21:48:13 tonio Exp $
+# $NetBSD: Makefile.common,v 1.24 2009/09/08 18:35:46 tonio Exp $
 
+# used by x11/labltk/Makefile
+# used by x11/ocaml-graphics/Makefile
 DISTNAME=      ocaml-3.11.1
 CATEGORIES=    lang
 MASTER_SITES=  http://caml.inria.fr/pub/distrib/ocaml-3.11/
@@ -22,6 +24,8 @@
 
 INSTALL_MAKE_FLAGS+=   PREFIX=${DESTDIR}${PREFIX} \
                        MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
+DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
+PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r 3a98e9f7242b -r 9451fb275a77 lang/ocaml/distinfo
--- a/lang/ocaml/distinfo       Tue Sep 08 18:13:42 2009 +0000
+++ b/lang/ocaml/distinfo       Tue Sep 08 18:35:46 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2009/09/07 21:48:13 tonio Exp $
+$NetBSD: distinfo,v 1.46 2009/09/08 18:35:46 tonio Exp $
 
 SHA1 (ocaml-3.11.1.tar.bz2) = 570feab47b34b29f866ecadcc16153d5a4a4f6a1
 RMD160 (ocaml-3.11.1.tar.bz2) = 991147354a85b975a86ce2dffafce669c9338db5
@@ -20,7 +20,7 @@
 SHA1 (patch-az) = 1aa4bfe207eb4348987612576f30490bee2376ff
 SHA1 (patch-ba) = cec240f6d6bf7f22e78e5d945221a41ad10bfb4a
 SHA1 (patch-bb) = 50bd9aa5b46052d8f35c04f6e4c3cbb365d2f93c
-SHA1 (patch-bc) = 7be374dd1503e3f7aab94ab72a6f0d97ea04f113
+SHA1 (patch-bc) = 3b6cab5af3d34b2d25c7ba718e5dd89e2d1f2171
 SHA1 (patch-bd) = 226fd916ee68db9165e15e462bbf38d3d6bac8a6
 SHA1 (patch-be) = 6c7232154b4935b9b4606940fd35799e20fafde2
 SHA1 (patch-bf) = 0b4efd564362b816154bfd7ffacecae27c75c0ee
diff -r 3a98e9f7242b -r 9451fb275a77 lang/ocaml/patches/patch-bc
--- a/lang/ocaml/patches/patch-bc       Tue Sep 08 18:13:42 2009 +0000
+++ b/lang/ocaml/patches/patch-bc       Tue Sep 08 18:35:46 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.2 2009/09/07 21:48:14 tonio Exp $
+$NetBSD: patch-bc,v 1.3 2009/09/08 18:35:46 tonio Exp $
 
 --- otherlibs/labltk/camltk/Makefile.orig      2007-12-12 15:09:45.000000000 +0100
 +++ otherlibs/labltk/camltk/Makefile   2009-05-21 11:13:08.000000000 +0200
@@ -9,7 +9,7 @@
 -      if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
 -      cp $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
 +      if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
-+      ${BSD_ISNTALL_DATA} $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
++      ${BSD_INSTALL_DATA} $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
        chmod 644 $(INSTALLDIR)/*.cmi
  
  installopt:
diff -r 3a98e9f7242b -r 9451fb275a77 x11/labltk/Makefile
--- a/x11/labltk/Makefile       Tue Sep 08 18:13:42 2009 +0000
+++ b/x11/labltk/Makefile       Tue Sep 08 18:35:46 2009 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2007/12/27 16:24:21 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/09/08 18:35:46 tonio Exp $
 
 .include "../../lang/ocaml/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/ocaml/labltk/}
-PKGREVISION=           3
 
 COMMENT=               Tk bindings for ocaml