Sun Apr 15 14:35:21 2012 UTC ()
Pullup ticket #3735 - requested by dholland
lang/ocamlduce: build fix

Revisions pulled up:
- lang/ocamlduce/Makefile                                       1.9
- lang/ocamlduce/PLIST.opt                                      1.3
- lang/ocamlduce/distinfo                                       1.5
- lang/ocamlduce/files/ocaml-configure.diff                     1.1
- lang/ocamlduce/patches/patch-aa                               1.3

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Fri Apr 13 07:34:54 UTC 2012

   Modified Files:
   	pkgsrc/lang/ocamlduce: Makefile PLIST.opt distinfo
   	pkgsrc/lang/ocamlduce/patches: patch-aa
   Added Files:
   	pkgsrc/lang/ocamlduce/files: ocaml-configure.diff

   Log Message:
   Update to 3.12.1, syncing with current ocaml in pkgsrc and thereby
   fixing the build.

   Changes 3.12.0.0 -> 3.12.1.0:

   - merge with OCaml 3.12.1

   Changes 3.11.2.0 -> 3.12.0.0:

   - merge with OCaml 3.12.0
   - drop native ocamlducedoc
   - fix memory leak issue in NS handling [Stefan Lampe]

   Changes 3.11.1.0 -> 3.11.2.0:

   - merge with OCaml 3.11.2
   - build and install native-code plugin
   - build ocamldoc library
   - accept also ocaml_cmi_magic_number in objinfo


(tron)
diff -r1.8 -r1.8.4.1 pkgsrc/lang/ocamlduce/Makefile
diff -r1.2 -r1.2.22.1 pkgsrc/lang/ocamlduce/PLIST.opt
diff -r1.4 -r1.4.22.1 pkgsrc/lang/ocamlduce/distinfo
diff -r0 -r1.1.2.2 pkgsrc/lang/ocamlduce/files/ocaml-configure.diff
diff -r1.2 -r1.2.22.1 pkgsrc/lang/ocamlduce/patches/patch-aa
cvs diff -r1.8 -r1.8.4.1 pkgsrc/lang/ocamlduce/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ocamlduce/Attic/Makefile 2011/12/06 00:19:24 1.8
+++ pkgsrc/lang/ocamlduce/Attic/Makefile 2012/04/15 14:35:20 1.8.4.1
@@ -1,48 +1,48 @@ @@ -1,48 +1,48 @@
1# $NetBSD: Makefile,v 1.8 2011/12/06 00:19:24 sbd Exp $ 1# $NetBSD: Makefile,v 1.8.4.1 2012/04/15 14:35:20 tron Exp $
2# 2#
3 3
4DISTNAME= ocamlduce-3.11.1.0 4DISTNAME= ocamlduce-3.12.1.0
5PKGREVISION= 1 
6CATEGORIES= lang 5CATEGORIES= lang
7MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/225/ 6MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/644/
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 7DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 8EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
10 9
11# we need the OCaml sources too 10# we need the OCaml sources too
12DISTFILES+= ocaml-3.11.1.tar.bz2 11DISTFILES+= ocaml-3.12.1.tar.bz2
13SITES.ocaml-3.11.1.tar.bz2= http://caml.inria.fr/pub/distrib/ocaml-3.11/  12SITES.ocaml-3.12.1.tar.bz2= http://caml.inria.fr/pub/distrib/ocaml-3.12/
14 13
15MAINTAINER= jaapb@kerguelen.org 14MAINTAINER= jaapb@kerguelen.org
16HOMEPAGE= http://ocamlduce.forge.ocamlcore.org/ 15HOMEPAGE= http://ocamlduce.forge.ocamlcore.org/
17COMMENT= Library to integrate XML features into OCaml 16COMMENT= Library to integrate XML features into OCaml
18 17
19PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
20 19
21DEPENDS+= ocaml-findlib-[0-9]*:../../devel/ocaml-findlib 20DEPENDS+= ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
22 21
23USE_TOOLS+= gmake 22USE_TOOLS+= gmake patch
24BUILD_TARGET= all 23BUILD_TARGET= all
25INSTALL_TARGET= installbyte 24INSTALL_TARGET= installbyte
26MAKE_JOBS_SAFE= no 25MAKE_JOBS_SAFE= no
27 26
28MAKE_ENV+= BINDIR=${PREFIX}/bin LIBDIR=${PREFIX}/lib/ocaml/site-lib 27MAKE_ENV+= BINDIR=${PREFIX}/bin LIBDIR=${PREFIX}/lib/ocaml/site-lib
29INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin \ 28INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin \
30 LIBDIR=${DESTDIR}${PREFIX}/lib/ocaml/site-lib 29 LIBDIR=${DESTDIR}${PREFIX}/lib/ocaml/site-lib
31PLIST_SRC= PLIST 30PLIST_SRC= PLIST
32 31
33.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ 32.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
34 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") 33 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
35BUILD_TARGET= world.opt 34BUILD_TARGET= world.opt
36INSTALL_TARGET+= installopt 35INSTALL_TARGET+= installopt
37PLIST_SRC+= PLIST.opt 36PLIST_SRC+= PLIST.opt
38.else 37.else
39BUILD_TARGET= world 38BUILD_TARGET= world
40.endif 39.endif
41 40
42BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.11.1 41BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.12.1
43pre-configure: 42pre-configure:
44 cd ${WRKSRC} && DISTDIR=${DISTDIR} make prepare 43 cd ${WRKSRC} && DISTDIR=${DISTDIR} make prepare
45 cd ${WRKSRC}/ocaml-3.11.1 && ./configure -prefix ${PREFIX} -libs ${LDFLAGS:Q} -with-pthread -host ${MACHINE_GNU_PLATFORM:Q} -mandir ${PREFIX}/${PKGMANDIR} -no-tk 44 cd ${WRKSRC}/ocaml-3.12.1 && ${PATCH} < ${FILESDIR}/ocaml-configure.diff
 45 cd ${WRKSRC}/ocaml-3.12.1 && ./configure -prefix ${PREFIX} -libs ${LDFLAGS:Q} -with-pthread -host ${MACHINE_GNU_PLATFORM:Q} -mandir ${PREFIX}/${PKGMANDIR} -no-tk
46 46
47.include "../../lang/ocaml/buildlink3.mk" 47.include "../../lang/ocaml/buildlink3.mk"
48.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.2.22.1 pkgsrc/lang/ocamlduce/Attic/PLIST.opt (expand / switch to unified diff)

--- pkgsrc/lang/ocamlduce/Attic/PLIST.opt 2009/09/07 21:53:30 1.2
+++ pkgsrc/lang/ocamlduce/Attic/PLIST.opt 2012/04/15 14:35:20 1.2.22.1
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1@comment $NetBSD: PLIST.opt,v 1.2 2009/09/07 21:53:30 tonio Exp $ 1@comment $NetBSD: PLIST.opt,v 1.2.22.1 2012/04/15 14:35:20 tron Exp $
2bin/ocamlducec.opt 2bin/ocamlducec.opt
3bin/ocamlducedep.opt 3bin/ocamlducedep.opt
4bin/ocamlducedoc.opt 
5bin/ocamlduceopt 4bin/ocamlduceopt
6bin/ocamlduceopt.opt 5bin/ocamlduceopt.opt
7lib/ocaml/site-lib/ocamlduce/ocamlduce.a 6lib/ocaml/site-lib/ocamlduce/ocamlduce.a
8lib/ocaml/site-lib/ocamlduce/ocamlduce.cmxa 7lib/ocaml/site-lib/ocamlduce/ocamlduce.cmxa
 8lib/ocaml/site-lib/ocamlduce/ocamlduce.cmxs
cvs diff -r1.4 -r1.4.22.1 pkgsrc/lang/ocamlduce/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ocamlduce/Attic/distinfo 2009/09/07 21:53:31 1.4
+++ pkgsrc/lang/ocamlduce/Attic/distinfo 2012/04/15 14:35:20 1.4.22.1
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2009/09/07 21:53:31 tonio Exp $ 1$NetBSD: distinfo,v 1.4.22.1 2012/04/15 14:35:20 tron Exp $
2 2
3SHA1 (ocaml-3.11.1.tar.bz2) = 570feab47b34b29f866ecadcc16153d5a4a4f6a1 3SHA1 (ocaml-3.12.1.tar.bz2) = 29b44117b116b1a5bc54a8b4514af483793a769f
4RMD160 (ocaml-3.11.1.tar.bz2) = 991147354a85b975a86ce2dffafce669c9338db5 4RMD160 (ocaml-3.12.1.tar.bz2) = 61d38c0785491c8790ac02ab78fb2f26ea490fc1
5Size (ocaml-3.11.1.tar.bz2) = 2352236 bytes 5Size (ocaml-3.12.1.tar.bz2) = 2949124 bytes
6SHA1 (ocamlduce-3.11.1.0.tar.gz) = f387911301318c772cb06a29474c2cdc9eee5084 6SHA1 (ocamlduce-3.12.1.0.tar.gz) = c5006c36071a1e22736ccd5bb96024f13e575302
7RMD160 (ocamlduce-3.11.1.0.tar.gz) = 836a954d5ce6d9ed356021c4d775cc3f7041cb75 7RMD160 (ocamlduce-3.12.1.0.tar.gz) = 33078e31c4cffade2f6d762fa9e9e4023f96fec4
8Size (ocamlduce-3.11.1.0.tar.gz) = 138926 bytes 8Size (ocamlduce-3.12.1.0.tar.gz) = 140291 bytes
9SHA1 (patch-aa) = 3a80190b17728dffe55843712de8b59174952fe8 9SHA1 (patch-aa) = 7ba89169cf1d10f9c2767019cccae1e4682d1c70
File Added: pkgsrc/lang/ocamlduce/files/Attic/ocaml-configure.diff
$NetBSD: ocaml-configure.diff,v 1.1.2.2 2012/04/15 14:35:20 tron Exp $

--- configure~	2011-07-04 21:15:01.000000000 +0000
+++ configure
@@ -621,7 +621,7 @@ if test $withsharedlibs = "yes"; then
     i[3456]86-*-linux*)           natdynlink=true;;
     x86_64-*-linux*)              natdynlink=true;;
     i[3456]86-*-darwin10.*)
-      if test $arch64 == true; then
+      if test $arch64 = true; then
         natdynlink=true
       fi;;
     i[3456]86-*-darwin[89]*)      natdynlink=true;;
cvs diff -r1.2 -r1.2.22.1 pkgsrc/lang/ocamlduce/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/ocamlduce/patches/Attic/patch-aa 2009/09/07 21:53:31 1.2
+++ pkgsrc/lang/ocamlduce/patches/Attic/patch-aa 2012/04/15 14:35:20 1.2.22.1
@@ -1,71 +1,71 @@ @@ -1,71 +1,71 @@
1$NetBSD: patch-aa,v 1.2 2009/09/07 21:53:31 tonio Exp $ 1$NetBSD: patch-aa,v 1.2.22.1 2012/04/15 14:35:20 tron Exp $
2 2
3--- Makefile.orig 2009-06-13 01:49:38.000000000 +0200 3--- Makefile.orig 2011-07-06 16:21:30.000000000 +0000
4+++ Makefile 2009-07-10 10:55:08.000000000 +0200 4+++ Makefile
5@@ -1,7 +1,7 @@ 5@@ -1,7 +1,7 @@
6 #-include config/Makefile 6 #-include config/Makefile
7  7
8 OCAML_VERSION := $(shell ocamlc -version) 8 OCAML_VERSION := $(shell ocamlc -version)
9-OCAML_SOURCE := /usr/src/ocaml-source-$(OCAML_VERSION).tar.bz2 9-OCAML_SOURCE := /usr/src/ocaml-source-$(OCAML_VERSION).tar.bz2
10+OCAML_SOURCE := $(DISTDIR)/ocaml-$(OCAML_VERSION).tar.bz2 10+OCAML_SOURCE := $(DISTDIR)/ocaml-$(OCAML_VERSION).tar.bz2
11 OCAML_SRCDIR := ocaml-$(OCAML_VERSION) 11 OCAML_SRCDIR := ocaml-$(OCAML_VERSION)
12  12
13 DUCE_VERSION := $(shell head -n1 VERSION) 13 DUCE_VERSION := $(shell head -n1 VERSION)
14@@ -36,7 +36,7 @@ 14@@ -37,7 +37,7 @@ all:
15 @echo "===> Please explicit what you want <===" 15 @echo "===> Please explicit what you want <==="
16  16
17 prepare: 17 prepare:
18- tar xf $(OCAML_SOURCE) 18- tar xf $(OCAML_SOURCE)
19+ tar jxf $(OCAML_SOURCE) 19+ tar jxf $(OCAML_SOURCE)
20 cp -PpR $(DUCEP_FILES) $(OCAML_SRCDIR) 20 cp -PpR $(DUCEP_FILES) $(OCAML_SRCDIR)
21 cp -PpR ocamlduce $(OCAML_SRCDIR)/otherlibs 21 cp -PpR ocamlduce $(OCAML_SRCDIR)/otherlibs
22 cd $(OCAML_SRCDIR) && for X in ../patches/*.diff; do patch -p1 < $$X; done 22 cd $(OCAML_SRCDIR) && for X in ../patches/*.diff; do patch -p1 < $$X; done
23@@ -44,15 +44,11 @@ 23@@ -45,15 +45,11 @@ prepare:
24 sed '\@^#-include config/Makefile@s/^#//' $(OCAML_SRCDIR)/Makefile.ocamlduce > $(OCAML_SRCDIR)/Makefile.ocamlduce.new 24 sed '\@^#-include config/Makefile@s/^#//' $(OCAML_SRCDIR)/Makefile.ocamlduce > $(OCAML_SRCDIR)/Makefile.ocamlduce.new
25 mv $(OCAML_SRCDIR)/Makefile.ocamlduce.new $(OCAML_SRCDIR)/Makefile.ocamlduce 25 mv $(OCAML_SRCDIR)/Makefile.ocamlduce.new $(OCAML_SRCDIR)/Makefile.ocamlduce
26  26
27-config/Makefile: 27-config/Makefile:
28- @echo "===> You should probably run ./configure yourself, trying on my own... <===" 28- @echo "===> You should probably run ./configure yourself, trying on my own... <==="
29- $(shell sed -ne '1s@^.*\(./configure.*\)$$@\1@p' $(shell ocamlc -where)/Makefile.config) 29- $(shell sed -ne '1s@^.*\(./configure.*\)$$@\1@p' $(shell ocamlc -where)/Makefile.config)
30+world: $(OCAML_SRCDIR)/config/Makefile 30+world: $(OCAML_SRCDIR)/config/Makefile
31+ cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh 31+ cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh
32  32
33-world: config/Makefile 33-world: config/Makefile
34- MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh 34- MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh
35- 35-
36-world.opt: config/Makefile 36-world.opt: config/Makefile
37- MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh 37- MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh
38+world.opt: $(OCAML_SRCDIR)/config/Makefile 38+world.opt: $(OCAML_SRCDIR)/config/Makefile
39+ cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh 39+ cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh
40  40
41 META: META.in 41 META: META.in
42 sed 's/%VER%/$(DUCE_VERSION)/' $< > $@ 42 sed 's/%VER%/$(DUCE_VERSION)/' $< > $@
43@@ -63,20 +59,20 @@ 43@@ -64,20 +60,20 @@ installcommon-stamp: META
44 install -m 755 -d $(DUCE_LIBDIR) 44 install -m 755 -d $(DUCE_LIBDIR)
45 install -m 755 ocamlducefind $(BINDIR) 45 install -m 755 ocamlducefind $(BINDIR)
46 install -m 644 META $(DUCE_LIBDIR) 46 install -m 644 META $(DUCE_LIBDIR)
47- install -m 644 $(addprefix _build/,$(MLI)) $(DUCE_LIBDIR) 47- install -m 644 $(addprefix _build/,$(MLI)) $(DUCE_LIBDIR)
48- install -m 644 $(addprefix _build/,$(CMI)) $(DUCE_LIBDIR) 48- install -m 644 $(addprefix _build/,$(CMI)) $(DUCE_LIBDIR)
49+ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(MLI)) $(DUCE_LIBDIR) 49+ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(MLI)) $(DUCE_LIBDIR)
50+ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMI)) $(DUCE_LIBDIR) 50+ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMI)) $(DUCE_LIBDIR)
51  51
52 installbyte: installcommon-stamp 52 installbyte: installcommon-stamp
53 @echo "===> Installing non-native files... <===" 53 @echo "===> Installing non-native files... <==="
54- for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done 54- for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done
55- install -m 644 $(addprefix _build/,$(TOPCMO)) $(DUCE_LIBDIR) 55- install -m 644 $(addprefix _build/,$(TOPCMO)) $(DUCE_LIBDIR)
56- install -m 644 $(addprefix _build/,$(TOPCMA)) $(DUCE_LIBDIR) 56- install -m 644 $(addprefix _build/,$(TOPCMA)) $(DUCE_LIBDIR)
57- install -m 644 $(addprefix _build/,$(CMA)) $(DUCE_LIBDIR) 57- install -m 644 $(addprefix _build/,$(CMA)) $(DUCE_LIBDIR)
58+ for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done 58+ for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done
59+ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMO)) $(DUCE_LIBDIR) 59+ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMO)) $(DUCE_LIBDIR)
60+ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMA)) $(DUCE_LIBDIR) 60+ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMA)) $(DUCE_LIBDIR)
61+ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMA)) $(DUCE_LIBDIR) 61+ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMA)) $(DUCE_LIBDIR)
62  62
63 installopt: installcommon-stamp 63 installopt: installcommon-stamp
64 @echo "===> Installing native files... <===" 64 @echo "===> Installing native files... <==="
65- for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done 65- for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done
66- install -m 644 $(addprefix _build/,$(CMXA)) $(DUCE_LIBDIR) 66- install -m 644 $(addprefix _build/,$(CMXA) $(CMXS)) $(DUCE_LIBDIR)
67+ for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done 67+ for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done
68+ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMXA)) $(DUCE_LIBDIR) 68+ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMXA) $(CMXS)) $(DUCE_LIBDIR)
69  69
70 clean: 70 clean:
71 build/distclean.sh 71 build/distclean.sh