[pkgsrc/trunk]: pkgsrc/lang/ocaml Fix various issues with this package:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f6a44fd9da34
branches:  trunk
changeset: 473640:f6a44fd9da34
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Apr 22 09:18:34 2004 +0000

description:
Fix various issues with this package:
- split patches files
- always enable threading which has various advantages
  - it fixes the build of the Tk library
  - it greatly simplifies the package list handling
  - it provides threading support under NetBSD 1.6/1.6.x
- correct default dependence in "buildlink2.mk" to "build"
Bump package revision because of all these changes.

diffstat:

 lang/ocaml/Makefile         |   25 +-
 lang/ocaml/PLIST            |   14 +-
 lang/ocaml/PLIST.common_end |    3 -
 lang/ocaml/PLIST.threads    |    9 -
 lang/ocaml/buildlink2.mk    |    5 +-
 lang/ocaml/buildlink3.mk    |    4 +-
 lang/ocaml/distinfo         |   61 +++-
 lang/ocaml/patches/patch-aa |   24 +-
 lang/ocaml/patches/patch-ab |  577 +-------------------------------------------
 lang/ocaml/patches/patch-ac |  150 ++++++++--
 lang/ocaml/patches/patch-ad |   46 +-
 lang/ocaml/patches/patch-ae |    6 +-
 lang/ocaml/patches/patch-af |   52 ++-
 lang/ocaml/patches/patch-ag |   26 +-
 lang/ocaml/patches/patch-ah |  209 +++++++--------
 lang/ocaml/patches/patch-ai |   37 +-
 lang/ocaml/patches/patch-aj |  115 +-------
 lang/ocaml/patches/patch-ak |   38 +-
 lang/ocaml/patches/patch-al |   45 ++-
 lang/ocaml/patches/patch-am |   38 +-
 lang/ocaml/patches/patch-an |   15 +
 lang/ocaml/patches/patch-ao |   35 +-
 lang/ocaml/patches/patch-ap |   17 +
 lang/ocaml/patches/patch-aq |   15 +
 lang/ocaml/patches/patch-ar |   16 +
 lang/ocaml/patches/patch-as |   13 +
 lang/ocaml/patches/patch-at |   28 ++
 lang/ocaml/patches/patch-au |   13 +
 lang/ocaml/patches/patch-av |   12 +
 lang/ocaml/patches/patch-aw |   40 +++
 lang/ocaml/patches/patch-ax |   22 +
 lang/ocaml/patches/patch-ay |   22 +
 lang/ocaml/patches/patch-az |   13 +
 lang/ocaml/patches/patch-ba |   22 +
 lang/ocaml/patches/patch-bb |   13 +
 lang/ocaml/patches/patch-bc |   23 +
 lang/ocaml/patches/patch-bd |   15 +
 lang/ocaml/patches/patch-be |   13 +
 lang/ocaml/patches/patch-bf |   13 +
 lang/ocaml/patches/patch-bg |   23 +
 lang/ocaml/patches/patch-bh |   29 ++
 lang/ocaml/patches/patch-bi |   20 +
 lang/ocaml/patches/patch-bj |   17 +
 lang/ocaml/patches/patch-bk |   16 +
 lang/ocaml/patches/patch-bl |   17 +
 lang/ocaml/patches/patch-bm |   22 +
 lang/ocaml/patches/patch-bn |   22 +
 lang/ocaml/patches/patch-bo |   23 +
 lang/ocaml/patches/patch-bp |   22 +
 lang/ocaml/patches/patch-bq |   22 +
 lang/ocaml/patches/patch-br |   13 +
 lang/ocaml/patches/patch-bs |   13 +
 52 files changed, 1091 insertions(+), 1012 deletions(-)

diffs (truncated from 2422 to 300 lines):

diff -r f3d0b3ee606b -r f6a44fd9da34 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile       Thu Apr 22 09:07:53 2004 +0000
+++ b/lang/ocaml/Makefile       Thu Apr 22 09:18:34 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2004/04/12 18:02:52 seb Exp $
+# $NetBSD: Makefile,v 1.29 2004/04/22 09:18:34 tron Exp $
 
 DISTNAME=      ocaml-3.06
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    lang
 MASTER_SITES=  ftp://ftp.inria.fr/INRIA/cristal/ocaml/${DISTNAME}/
 
@@ -20,9 +20,12 @@
 CONFIGURE_ARGS+=       -tkdefs "-I${BUILDLINK_PREFIX.tk}/include  -I${BUILDLINK_PREFIX.tcl}/include"
 CONFIGURE_ARGS+=       -tklibs "`${SH} -c '. ${TCLCONFIG_SH}; . ${TKCONFIG_SH}; ${ECHO} $$TK_LIBS $$TCL_LIBS'`"
 CONFIGURE_ARGS+=       -libs "${LDFLAGS}"
+CONFIGURE_ARGS+=       -with-pthread
 
 ALL_TARGET=    world
 
+.include "../../mk/bsd.prefs.mk"
+
 post-extract:
        ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
 
@@ -34,26 +37,12 @@
                ${GMAKE} opt.opt; \
        fi
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+    (${MACHINE_ARCH} == "sparc")
 PLIST_SRC=     ${PKGDIR}/PLIST.opt ${PKGDIR}/PLIST
 .else
 PLIST_SRC=     ${PKGDIR}/PLIST
 .endif
 
-PTHREAD_OPTS+= native
-.include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
-CONFIGURE_ARGS+=       -with-pthread
-PLIST_SRC+=            ${PKGDIR}/PLIST.threads
-PLIST_SUBST+=          NATIVE_THREADS="@comment "
-.else
-PLIST_SUBST+=          NATIVE_THREADS=
-.endif
-
-PLIST_SRC+=            ${PKGDIR}/PLIST.common_end
-
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f3d0b3ee606b -r f6a44fd9da34 lang/ocaml/PLIST
--- a/lang/ocaml/PLIST  Thu Apr 22 09:07:53 2004 +0000
+++ b/lang/ocaml/PLIST  Thu Apr 22 09:18:34 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/06/23 20:15:16 jtb Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/04/22 09:18:34 tron Exp $
 bin/camlp4
 bin/camlp4o
 bin/camlp4r
@@ -406,6 +406,7 @@
 lib/ocaml/libnums.a
 lib/ocaml/libstr.a
 lib/ocaml/libthreads.a
+lib/ocaml/libthreadsnat.a
 lib/ocaml/libunix.a
 lib/ocaml/list.cmi
 lib/ocaml/list.ml
@@ -546,13 +547,18 @@
 lib/ocaml/thread.mli
 lib/ocaml/threadUnix.mli
 lib/ocaml/threads/condition.cmi
+lib/ocaml/threads/condition.cmx
 lib/ocaml/threads/event.cmi
 lib/ocaml/threads/mutex.cmi
-${NATIVE_THREADS}lib/ocaml/threads/stdlib.cma
 lib/ocaml/threads/thread.cmi
+lib/ocaml/threads/thread.cmx
 lib/ocaml/threads/threadUnix.cmi
+lib/ocaml/threads/threadUnix.cmx
+lib/ocaml/threads/threads.a
 lib/ocaml/threads/threads.cma
-${NATIVE_THREADS}lib/ocaml/threads/unix.cma
+lib/ocaml/threads/threads.cmxa
+lib/ocaml/threads/event.cmx
+lib/ocaml/threads/mutex.cmx
 lib/ocaml/topdirs.cmi
 lib/ocaml/toplevellib.cma
 lib/ocaml/toploop.cmi
@@ -667,8 +673,10 @@
 man/mano/Weak.o
 @dirrm man/mano
 @exec ${MKDIR} %D/lib/ocaml/stublibs
+@dirrm lib/ocaml/threads
 @dirrm lib/ocaml/stublibs
 @dirrm lib/ocaml/ocamldoc
 @dirrm lib/ocaml/labltk
 @dirrm lib/ocaml/camlp4
 @dirrm lib/ocaml/caml
+@dirrm lib/ocaml
diff -r f3d0b3ee606b -r f6a44fd9da34 lang/ocaml/PLIST.common_end
--- a/lang/ocaml/PLIST.common_end       Thu Apr 22 09:07:53 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.common_end,v 1.2 2003/05/26 13:20:24 cjep Exp $
-@dirrm lib/ocaml/threads
-@dirrm lib/ocaml
diff -r f3d0b3ee606b -r f6a44fd9da34 lang/ocaml/PLIST.threads
--- a/lang/ocaml/PLIST.threads  Thu Apr 22 09:07:53 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST.threads,v 1.3 2004/02/17 14:56:12 wiz Exp $
-lib/ocaml/libthreadsnat.a
-lib/ocaml/threads/condition.cmx
-lib/ocaml/threads/event.cmx
-lib/ocaml/threads/mutex.cmx
-lib/ocaml/threads/thread.cmx
-lib/ocaml/threads/threadUnix.cmx
-lib/ocaml/threads/threads.a
-lib/ocaml/threads/threads.cmxa
diff -r f3d0b3ee606b -r f6a44fd9da34 lang/ocaml/buildlink2.mk
--- a/lang/ocaml/buildlink2.mk  Thu Apr 22 09:07:53 2004 +0000
+++ b/lang/ocaml/buildlink2.mk  Thu Apr 22 09:18:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/16 16:25:10 dillo Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/04/22 09:18:35 tron Exp $
 #
 # This Makefile fragment is included by packages that use ocaml.
 
@@ -6,8 +6,9 @@
 OCAML_BUILDLINK2_MK=   # defined
 
 BUILDLINK_PACKAGES+=                   ocaml
-BUILDLINK_DEPENDS.ocaml?=              ocaml>=3.06
+BUILDLINK_DEPENDS.ocaml?=              ocaml>=3.06nb6
 BUILDLINK_PKGSRCDIR.ocaml?=            ../../lang/ocaml
+BUILDLINK_DEPMETHOD.ocaml?=            build
 
 EVAL_PREFIX+=  BUILDLINK_PREFIX.ocaml=ocaml
 BUILDLINK_PREFIX.ocaml_DEFAULT=        ${LOCALBASE}
diff -r f3d0b3ee606b -r f6a44fd9da34 lang/ocaml/buildlink3.mk
--- a/lang/ocaml/buildlink3.mk  Thu Apr 22 09:07:53 2004 +0000
+++ b/lang/ocaml/buildlink3.mk  Thu Apr 22 09:18:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/04/22 09:18:35 tron Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 OCAML_BUILDLINK3_MK:=  ${OCAML_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=   ocaml
 
 .if !empty(OCAML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ocaml+=      ocaml>=3.06
+BUILDLINK_DEPENDS.ocaml+=      ocaml>=3.06nb6
 BUILDLINK_PKGSRCDIR.ocaml?=    ../../lang/ocaml
 BUILDLINK_DEPMETHOD.ocaml?=    build
 .endif # OCAML_BUILDLINK3_MK
diff -r f3d0b3ee606b -r f6a44fd9da34 lang/ocaml/distinfo
--- a/lang/ocaml/distinfo       Thu Apr 22 09:07:53 2004 +0000
+++ b/lang/ocaml/distinfo       Thu Apr 22 09:18:34 2004 +0000
@@ -1,18 +1,49 @@
-$NetBSD: distinfo,v 1.14 2004/03/04 06:27:45 minskim Exp $
+$NetBSD: distinfo,v 1.15 2004/04/22 09:18:36 tron Exp $
 
 SHA1 (ocaml-3.06.tar.gz) = cf1b053bf751ad566e445ca13c620ffef3a1b863
 Size (ocaml-3.06.tar.gz) = 2436887 bytes
-SHA1 (patch-aa) = 9e3eedb855d3a3830f58979caee0af48b5b8e670
-SHA1 (patch-ab) = 8ebe2173abe3202205e16d31f29c8ded3df485cd
-SHA1 (patch-ac) = 536768b353d9016140bdc66cc0293537cc4444e0
-SHA1 (patch-ad) = e9d32fe1ee760610c92348b560a79bce1c7e099a
-SHA1 (patch-ae) = 4e2905ecb57e1e1a4c8b3799b5a3e5dd37ead7ec
-SHA1 (patch-af) = eeb03f9ceac69ab36542f2725392789b7cecd48c
-SHA1 (patch-ag) = 8f67b8c13a0b008e3b77eb6f15fce1cac4f43d32
-SHA1 (patch-ah) = e3e4b3fd9f8b370b44f8ff22134710d194d60805
-SHA1 (patch-ai) = 5b3a27cbe5c7dcebc6899859b24ebe2bd0248862
-SHA1 (patch-aj) = 5a9365b0ee1153cfddb7780422f5ba451a85ae9a
-SHA1 (patch-ak) = cd5a93e7530f6864ee6f591f9f7ba5722428408c
-SHA1 (patch-al) = 9c3d37b4d849fb8de033bf927c8d3f7a3aaee4de
-SHA1 (patch-am) = 00df5c9e56f25f61b9349846bc339cb2922ab278
-SHA1 (patch-ao) = 5f7b05cb1bfb811ecf85b22eefe8c707b8e27068
+SHA1 (patch-aa) = 9d07072041e44899d2fa56f174f1c672b12008e6
+SHA1 (patch-ab) = baae30bddb25fb3a36dc7d4712e59177a8442f84
+SHA1 (patch-ac) = 7af815d9c426faf6f7959175f9a326abbf54d79d
+SHA1 (patch-ad) = 0010feb5ff81104097dc7891f41a4e12313b0104
+SHA1 (patch-ae) = 62fc3ed7610d5677d9bb201c96139ffade9aa488
+SHA1 (patch-af) = 163174609a795e99eacf1d5e60a1b99ccabd5237
+SHA1 (patch-ag) = b17a30a9de7c778f6e6d83bf45e39b85b005fcbe
+SHA1 (patch-ah) = ef98b6d08535212b2b64415bf44389255183e179
+SHA1 (patch-ai) = a63857c935bf09a9c8d621aa67ef3a13ca4bbd20
+SHA1 (patch-aj) = c70e1a34f0853a0da64f8bd1cff76198bd7aa2c7
+SHA1 (patch-ak) = b18d74b5a9d2aa40588efbe431e03682579b1f4b
+SHA1 (patch-al) = a419af2fb092bcd8d22825b8aac9d915b11a4495
+SHA1 (patch-am) = e91f8ae2c0a2ff6d7e2cfa12b42ea113e6f87453
+SHA1 (patch-an) = bcd01511ca4d08acb755e9bec4d60c71040a18de
+SHA1 (patch-ao) = e517897e687fdcf43b2c4d801906e6894c6c4916
+SHA1 (patch-ap) = 852b73b2a75442e32ae6eca40b87ccb972555143
+SHA1 (patch-aq) = 86b1c641f5adf4fd13b49b8d3149d266b4863d05
+SHA1 (patch-ar) = b52759d59840fb0e156ede1192ea3cfc66df88a7
+SHA1 (patch-as) = e2fe81931265e70cdb9fcb7b9f743ac39ea45528
+SHA1 (patch-at) = 1298e7bcff37b51530b5eb9cb2cfb654d5d708b5
+SHA1 (patch-au) = 348834bb0a5e22fd1adce0003f73cd6bcc07e79d
+SHA1 (patch-av) = d61391c89398e0e2b0386f39247a693aa87baf74
+SHA1 (patch-aw) = 51273d1a11e28e161167f904406cf28ffebbbc7a
+SHA1 (patch-ax) = 81843d235df97e5cea6344af14f2b9b0f74cd48c
+SHA1 (patch-ay) = 538b5d0aa3353add40f72714ca0d8edc413aa867
+SHA1 (patch-az) = 7ef66ce5ac11a5012f30db3161b1aadcd8c55c7e
+SHA1 (patch-ba) = 21967eb97376f4734a1c043e1312555d15c059bd
+SHA1 (patch-bb) = d60cca088fa92cf15a4d46d53dd42ed84f851f9c
+SHA1 (patch-bc) = 4aa365ca555e01955c7787588a4effeacca7b8b0
+SHA1 (patch-bd) = 2ab20ead8779de1f2eb77d3504e89d182f39a63d
+SHA1 (patch-be) = b6766186cd56f3560afdc05280bff637a08061ad
+SHA1 (patch-bf) = 36b6a1ced39a01f01872ac252eaf0a7deb30d7b9
+SHA1 (patch-bg) = 760ab3521c7cc9cc573799f6d499e926502354c2
+SHA1 (patch-bh) = ea8d3a21f1957af3c048f8b586df7b4aec50f58a
+SHA1 (patch-bi) = 93b0700588ef5e34d28f2fe06bc5974290822708
+SHA1 (patch-bj) = 2e9b7c54f90f87c83beae8de96a407371a7e902a
+SHA1 (patch-bk) = 9f623a73a4ffb8d4b1acbe7e1296a387d7857357
+SHA1 (patch-bl) = 2e8f19cc65e621d3c27cebcbd43766739865a8d2
+SHA1 (patch-bm) = 0a0502e94410ebc30a925974150f32c35a3b40b2
+SHA1 (patch-bn) = 9bd74e624dde87368222e35575c28ad00d65b669
+SHA1 (patch-bo) = 69aec64ba3d74aa2b29a2d249f3d0ec267bdce9a
+SHA1 (patch-bp) = f6fe43e31e16824de87f719f4cd93fd6364146b5
+SHA1 (patch-bq) = f51ea79a7682aa64a2a4ca09a34a0fb1439361db
+SHA1 (patch-br) = 0de340e99e9064cefc9012877daba25ed7c39135
+SHA1 (patch-bs) = 86a2f4f1ae2752bb59bc82355393ad23adae18ee
diff -r f3d0b3ee606b -r f6a44fd9da34 lang/ocaml/patches/patch-aa
--- a/lang/ocaml/patches/patch-aa       Thu Apr 22 09:07:53 2004 +0000
+++ b/lang/ocaml/patches/patch-aa       Thu Apr 22 09:18:34 2004 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2002/06/18 20:06:01 jschauma Exp $
+$NetBSD: patch-aa,v 1.3 2004/04/22 09:18:36 tron Exp $
 
---- config/gnu/config.sub.orig Tue May 14 11:14:26 2002
-+++ config/gnu/config.sub
-@@ -289,7 +289,7 @@
-             | [cjt]90-* \
-             | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-             | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
--            | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
-+            | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-* | macppc-*)
-               ;;
-       # Recognize the various machine names and aliases which stand
-       # for a CPU type and a company and sometimes even an OS.
+--- asmcomp/i386/emit.mlp.orig Mon Jul 22 18:37:50 2002
++++ asmcomp/i386/emit.mlp      Thu Apr 22 10:34:38 2004
+@@ -734,7 +734,7 @@
+       `       movl    %esp, %ebp\n`;
+       `       pushl   %ecx\n`;
+       `       pushl   %edx\n`;
+-      `       call    .mcount\n`;
++      `       call    __mcount\n`;
+       `       popl    %edx\n`;
+       `       popl    %ecx\n`;
+       `       popl    %eax\n`
diff -r f3d0b3ee606b -r f6a44fd9da34 lang/ocaml/patches/patch-ab
--- a/lang/ocaml/patches/patch-ab       Thu Apr 22 09:07:53 2004 +0000
+++ b/lang/ocaml/patches/patch-ab       Thu Apr 22 09:18:34 2004 +0000
@@ -1,567 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2003/04/19 00:16:58 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2004/04/22 09:18:36 tron Exp $
 
---- ./byterun/Makefile.orig    Fri Apr 18 14:23:08 2003
-+++ ./byterun/Makefile Fri Apr 18 14:23:52 2003
-@@ -48,10 +48,10 @@
-                 prims.o libcamlrund.a $(BYTECCLIBS)
- 
- install:
--      cp ocamlrun$(EXE) $(BINDIR)/ocamlrun$(EXE)
--      cp libcamlrun.a $(LIBDIR)/libcamlrun.a
-+      ${BSD_INSTALL_PROGRAM} ocamlrun$(EXE) $(BINDIR)/ocamlrun$(EXE)
-+      ${BSD_INSTALL_DATA} libcamlrun.a $(LIBDIR)/libcamlrun.a
-       cd $(LIBDIR); $(RANLIB) libcamlrun.a
--      if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi
-+      if test -d $(LIBDIR)/caml; then : ; else ${BSD_INSTALL_DATA_DIR} $(LIBDIR)/caml; fi
-       for i in $(PUBLIC_INCLUDES); do \
-           sed -f ../tools/cleanup-header $$i > $(LIBDIR)/caml/$$i; \
-         done
---- ./camlp4/etc/Makefile.orig Fri Apr 18 14:43:37 2003
-+++ ./camlp4/etc/Makefile      Fri Apr 18 14:44:40 2003
-@@ -52,14 +52,14 @@
- get_promote:
- 
- install:
--      -$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
--      cp $(OBJS) $(LIBDIR)/camlp4/.
--      cp $(INTF) $(LIBDIR)/camlp4/.
--      cp lib.sml $(LIBDIR)/camlp4/.
--      cp camlp4o$(EXE) $(BINDIR)/.
--      if test -f $(COPT); then cp $(COPT) $(BINDIR)/.; fi
--      cp mkcamlp4.sh $(BINDIR)/mkcamlp4
--      chmod a+x $(BINDIR)/mkcamlp4
-+      -${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
-+      -${BSD_INSTALL_PROGRAM_DIR}  $(BINDIR)
-+      ${BSD_INSTALL_DATA} $(OBJS) $(LIBDIR)/camlp4/.
-+      ${BSD_INSTALL_DATA} $(INTF) $(LIBDIR)/camlp4/.