Update lang/ocamlduce to 3.11.1.0 [pkg/41696]

Adds support for ocaml 3.11.1

5 files changed, 120 insertions, 67 deletions

diff --git a/lang/ocamlduce/Makefile b/lang/ocamlduce/Makefile
index 563c813845a..ac6deba5e48 100644
--- a/lang/ocamlduce/Makefile
+++ b/lang/ocamlduce/Makefile
@@ -1,32 +1,43 @@
-# $NetBSD: Makefile,v 1.4 2009/06/30 00:07:18 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/09/07 21:53:30 tonio Exp $
 #
 
-DISTNAME=	ocamlduce-3.10.2
-CATEGORIES=	lang
-MASTER_SITES=	http://gallium.inria.fr/~frisch/ocamlcduce/download/
+DISTNAME=       ocamlduce-3.11.1.0
+CATEGORIES=     lang
+MASTER_SITES=   http://forge.ocamlcore.org/frs/download.php/225/
+DISTFILES=      ${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	jaapb@kerguelen.org
-HOMEPAGE=	http://gallium.inria.fr/~frisch/ocamlcduce/
-COMMENT=	Library to integrate XML features into OCaml
+# we need the OCaml sources too
+DISTFILES+=	ocaml-3.11.1.tar.bz2
+SITES.ocaml-3.11.1.tar.bz2= http://caml.inria.fr/pub/distrib/ocaml-3.11/	
 
-MAKE_JOBS_SAFE=		no
+MAINTAINER=     jaapb@kerguelen.org
+HOMEPAGE=       http://ocamlduce.ocamlcore.org/
+COMMENT=        Library to integrate XML features into OCaml
 
-DEPENDS+=	ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
+DEPENDS+=       ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
 
-USE_TOOLS+=	gmake
-BUILD_TARGET=	all
+USE_TOOLS+=     gmake
+BUILD_TARGET=   all
+INSTALL_TARGET=	installbyte
+MAKE_JOBS_SAFE=	no
+
+MAKE_ENV=	BINDIR=${PREFIX}/bin LIBDIR=${PREFIX}/lib/ocaml/site-lib
+PLIST_SRC=	PLIST
 
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
     (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-MAKE_ENV+=	HAVE_OCAMLOPT=yes
-BUILD_TARGET=	opt
-INSTALL_TARGET=	install
-PLIST_SRC+=	PLIST.opt
+BUILD_TARGET=   world.opt
+INSTALL_TARGET+=        installopt
+PLIST_SRC+=     PLIST.opt
+.else
+BUILD_TARGET=   world
 .endif
 
-PLIST_SRC+=	PLIST
-
-BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.10.2
+BUILDLINK_API_DEPENDS.ocaml+=   ocaml>=3.11.1
+pre-configure:
+	cd ${WRKSRC} && DISTDIR=${DISTDIR} make prepare
+	cd ${WRKSRC}/ocaml-3.11.1 && ./configure -prefix ${PREFIX} -libs ${LDFLAGS:Q} -with-pthread -host ${MACHINE_GNU_PLATFORM:Q} -mandir ${PREFIX}/${PKGMANDIR} -no-tk
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ocamlduce/PLIST b/lang/ocamlduce/PLIST
index 05fe01f92af..c48cc75ef93 100644
--- a/lang/ocamlduce/PLIST
+++ b/lang/ocamlduce/PLIST
@@ -1,20 +1,24 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:03:37 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/09/07 21:53:30 tonio Exp $
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/ocamlduce
-bin/expungeduce
 bin/ocamlduce
 bin/ocamlducec
 bin/ocamlducedep
 bin/ocamlducedoc
 bin/ocamlducefind
-bin/ocamlducemktop
 lib/ocaml/site-lib/ocamlduce/META
 lib/ocaml/site-lib/ocamlduce/cduce_types.cmi
 lib/ocaml/site-lib/ocamlduce/ocamlduce.cma
 lib/ocaml/site-lib/ocamlduce/ocamlduce.cmi
 lib/ocaml/site-lib/ocamlduce/ocamlduce.mli
 lib/ocaml/site-lib/ocamlduce/topdirs.cmi
-lib/ocaml/site-lib/ocamlduce/toplevelducelib.cma
+lib/ocaml/site-lib/ocamlduce/topdirs.cmo
+lib/ocaml/site-lib/ocamlduce/topdirs.mli
+lib/ocaml/site-lib/ocamlduce/toplevellib.cma
 lib/ocaml/site-lib/ocamlduce/toploop.cmi
+lib/ocaml/site-lib/ocamlduce/toploop.cmo
+lib/ocaml/site-lib/ocamlduce/toploop.mli
 lib/ocaml/site-lib/ocamlduce/topmain.cmi
+lib/ocaml/site-lib/ocamlduce/topmain.cmo
+lib/ocaml/site-lib/ocamlduce/topmain.mli
 lib/ocaml/site-lib/ocamlduce/topstart.cmo
 @exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/ocamlduce
diff --git a/lang/ocamlduce/PLIST.opt b/lang/ocamlduce/PLIST.opt
index 110d6706994..40888b5cc9a 100644
--- a/lang/ocamlduce/PLIST.opt
+++ b/lang/ocamlduce/PLIST.opt
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST.opt,v 1.1.1.1 2007/04/08 23:04:53 tonio Exp $
+@comment $NetBSD: PLIST.opt,v 1.2 2009/09/07 21:53:30 tonio Exp $
+bin/ocamlducec.opt
+bin/ocamlducedep.opt
+bin/ocamlducedoc.opt
 bin/ocamlduceopt
-lib/ocaml/site-lib/ocamlduce/cduce_types.o
+bin/ocamlduceopt.opt
 lib/ocaml/site-lib/ocamlduce/ocamlduce.a
 lib/ocaml/site-lib/ocamlduce/ocamlduce.cmxa
-lib/ocaml/site-lib/ocamlduce/ocamlduce.o
diff --git a/lang/ocamlduce/distinfo b/lang/ocamlduce/distinfo
index 489c2e9aaf2..2fc238e04da 100644
--- a/lang/ocamlduce/distinfo
+++ b/lang/ocamlduce/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.3 2008/10/16 12:55:51 taca Exp $
+$NetBSD: distinfo,v 1.4 2009/09/07 21:53:31 tonio Exp $
 
-SHA1 (ocamlduce-3.10.2.tar.gz) = f79e2caa298413dd9513591adcc1e99e6ca6d4ec
-RMD160 (ocamlduce-3.10.2.tar.gz) = 1b95f8e849c36a2fdcf91183c249982fce36c589
-Size (ocamlduce-3.10.2.tar.gz) = 976957 bytes
-SHA1 (patch-aa) = 72aa5005a31eac46c1f6cdd08b8bf9a163d46351
+SHA1 (ocaml-3.11.1.tar.bz2) = 570feab47b34b29f866ecadcc16153d5a4a4f6a1
+RMD160 (ocaml-3.11.1.tar.bz2) = 991147354a85b975a86ce2dffafce669c9338db5
+Size (ocaml-3.11.1.tar.bz2) = 2352236 bytes
+SHA1 (ocamlduce-3.11.1.0.tar.gz) = f387911301318c772cb06a29474c2cdc9eee5084
+RMD160 (ocamlduce-3.11.1.0.tar.gz) = 836a954d5ce6d9ed356021c4d775cc3f7041cb75
+Size (ocamlduce-3.11.1.0.tar.gz) = 138926 bytes
+SHA1 (patch-aa) = 3a80190b17728dffe55843712de8b59174952fe8
diff --git a/lang/ocamlduce/patches/patch-aa b/lang/ocamlduce/patches/patch-aa
index d13240fdac7..54ae83c8ae1 100644
--- a/lang/ocamlduce/patches/patch-aa
+++ b/lang/ocamlduce/patches/patch-aa
@@ -1,38 +1,71 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/04/08 23:04:53 tonio Exp $
+$NetBSD: patch-aa,v 1.2 2009/09/07 21:53:31 tonio Exp $
 
---- Makefile.orig	2007-01-23 09:13:33.000000000 +0100
-+++ Makefile	2007-03-08 10:55:00.000000000 +0100
-@@ -10,12 +10,18 @@
- 
- # The OCaml tools to use
- 
-+ifeq (${HAVE_OCAMLOPT},"yes")
- CAMLC=ocamlc.opt
- CAMLOPT=ocamlopt.opt
-+CAMLDEP=ocamldep.opt
-+else
-+CAMLC=ocamlc
-+CAMLOPT=ocamlopt
-+CAMLDEP=ocamldep
-+endif
- CAMLYACC=ocamlyacc
- YACCFLAGS=-v
- CAMLLEX=ocamllex
--CAMLDEP=ocamldep.opt
- DEPFLAGS=$(INCLUDES)
- 
- OCAML_CONFIG=$(shell $(CAMLC) -where)/Makefile.config
-@@ -489,10 +495,12 @@
- 	for i in $(INSTALL_BINARIES); do \
- 	  cp $$i $(BINDIR)/; \
- 	done
-+	ocamlfind install ocamlduce META -optional $(INSTALL_LIB_FILES)
-+
-+install.opt: FORCE META
- 	for i in $(OPT_VARIANTS); do \
- 	  cp $$i.opt $(BINDIR)/$$i; \
- 	done
--	ocamlfind install ocamlduce META -optional $(INSTALL_LIB_FILES)
- 
- uninstall: FORCE
- 	for i in $(INSTALL_BINARIES); do \
+--- Makefile.orig	2009-06-13 01:49:38.000000000 +0200
++++ Makefile	2009-07-10 10:55:08.000000000 +0200
+@@ -1,7 +1,7 @@
+ #-include config/Makefile
+ 
+ OCAML_VERSION := $(shell ocamlc -version)
+-OCAML_SOURCE := /usr/src/ocaml-source-$(OCAML_VERSION).tar.bz2
++OCAML_SOURCE := $(DISTDIR)/ocaml-$(OCAML_VERSION).tar.bz2
+ OCAML_SRCDIR := ocaml-$(OCAML_VERSION)
+ 
+ DUCE_VERSION := $(shell head -n1 VERSION)
+@@ -36,7 +36,7 @@
+ 	@echo "===> Please explicit what you want <==="
+ 
+ prepare:
+-	tar xf $(OCAML_SOURCE)
++	tar jxf $(OCAML_SOURCE)
+ 	cp -PpR $(DUCEP_FILES) $(OCAML_SRCDIR)
+ 	cp -PpR ocamlduce $(OCAML_SRCDIR)/otherlibs
+ 	cd $(OCAML_SRCDIR) && for X in ../patches/*.diff; do patch -p1 < $$X; done
+@@ -44,15 +44,11 @@
+ 	sed '\@^#-include config/Makefile@s/^#//' $(OCAML_SRCDIR)/Makefile.ocamlduce > $(OCAML_SRCDIR)/Makefile.ocamlduce.new
+ 	mv $(OCAML_SRCDIR)/Makefile.ocamlduce.new $(OCAML_SRCDIR)/Makefile.ocamlduce
+ 
+-config/Makefile:
+-	@echo "===> You should probably run ./configure yourself, trying on my own... <==="
+-	$(shell sed -ne '1s@^.*\(./configure.*\)$$@\1@p' $(shell ocamlc -where)/Makefile.config)
++world: $(OCAML_SRCDIR)/config/Makefile
++	cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh
+ 
+-world: config/Makefile
+-	MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh
+-
+-world.opt: config/Makefile
+-	MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh
++world.opt: $(OCAML_SRCDIR)/config/Makefile
++	cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh
+ 
+ META: META.in
+ 	sed 's/%VER%/$(DUCE_VERSION)/' $< > $@
+@@ -63,20 +59,20 @@
+ 	install -m 755 -d $(DUCE_LIBDIR)
+ 	install -m 755 ocamlducefind $(BINDIR)
+ 	install -m 644 META $(DUCE_LIBDIR)
+-	install -m 644 $(addprefix _build/,$(MLI)) $(DUCE_LIBDIR)
+-	install -m 644 $(addprefix _build/,$(CMI)) $(DUCE_LIBDIR)
++	install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(MLI)) $(DUCE_LIBDIR)
++	install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMI)) $(DUCE_LIBDIR)
+ 
+ installbyte: installcommon-stamp
+ 	@echo "===> Installing non-native files... <==="
+-	for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done
+-	install -m 644 $(addprefix _build/,$(TOPCMO)) $(DUCE_LIBDIR)
+-	install -m 644 $(addprefix _build/,$(TOPCMA)) $(DUCE_LIBDIR)
+-	install -m 644 $(addprefix _build/,$(CMA)) $(DUCE_LIBDIR)
++	for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done
++	install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMO)) $(DUCE_LIBDIR)
++	install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMA)) $(DUCE_LIBDIR)
++	install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMA)) $(DUCE_LIBDIR)
+ 
+ installopt: installcommon-stamp
+ 	@echo "===> Installing native files... <==="
+-	for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done
+-	install -m 644 $(addprefix _build/,$(CMXA)) $(DUCE_LIBDIR)
++	for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done
++	install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMXA)) $(DUCE_LIBDIR)
+ 
+ clean:
+ 	build/distclean.sh