Two Darwin fixes:

	- split out the profiled libraries in the PLIST, because they
	  don't get built on Darwin.
	- set INSTALL_UNSTRIPPED on Darwin for both ocaml itself and
	  anything that directly depends on it, because the ocaml compiler
	  generates binaries that don't strip properly.

6 files changed, 73 insertions, 54 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index b9d5fb2b4e3..a28d60908d1 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/04/22 12:44:30 jschauma Exp $
+# $NetBSD: Makefile,v 1.31 2004/04/24 14:45:15 danw Exp $
 
 DISTNAME=	ocaml-3.06
 PKGREVISION=	6
@@ -26,6 +26,10 @@ ALL_TARGET=	world
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "Darwin"
+INSTALL_UNSTRIPPED=	yes
+.endif
+
 post-extract:
 	${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
 
@@ -40,6 +44,9 @@ post-build:
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
     (${MACHINE_ARCH} == "sparc")
 PLIST_SRC=	${PKGDIR}/PLIST.opt ${PKGDIR}/PLIST
+.  if ${OPSYS} != "Darwin"
+PLIST_SRC+=	${PKGDIR}/PLIST.prof
+.  endif
 .else
 PLIST_SRC=	${PKGDIR}/PLIST
 .endif
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index 9ec7b446ffb..80cc6bc5742 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/04/22 09:18:34 tron Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/04/24 14:45:15 danw Exp $
 bin/camlp4
 bin/camlp4o
 bin/camlp4r
@@ -547,18 +547,12 @@ lib/ocaml/sys.mli
 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
 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
-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
diff --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt
index 1e8c37608e8..85cd12b868e 100644
--- a/lang/ocaml/PLIST.opt
+++ b/lang/ocaml/PLIST.opt
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opt,v 1.4 2003/06/29 23:04:18 jtb Exp $
+@comment $NetBSD: PLIST.opt,v 1.5 2004/04/24 14:45:15 danw Exp $
 bin/camlp4o.opt
 bin/camlp4r.opt
 bin/ocamlc.opt
@@ -7,23 +7,17 @@ bin/ocamllex.opt
 bin/ocamlopt
 bin/ocamlopt.opt
 lib/ocaml/arg.cmx
-lib/ocaml/arg.p.cmx
 lib/ocaml/arith_flags.cmx
 lib/ocaml/arith_status.cmx
 lib/ocaml/array.cmx
-lib/ocaml/array.p.cmx
 lib/ocaml/arrayLabels.cmx
-lib/ocaml/arrayLabels.p.cmx
 lib/ocaml/big_int.cmx
 lib/ocaml/bigarray.a
 lib/ocaml/bigarray.cmx
 lib/ocaml/bigarray.cmxa
 lib/ocaml/buffer.cmx
-lib/ocaml/buffer.p.cmx
 lib/ocaml/callback.cmx
-lib/ocaml/callback.p.cmx
 lib/ocaml/camlinternalOO.cmx
-lib/ocaml/camlinternalOO.p.cmx
 lib/ocaml/camlp4/extfold.cmx
 lib/ocaml/camlp4/extfun.cmx
 lib/ocaml/camlp4/fstream.cmx
@@ -35,33 +29,22 @@ lib/ocaml/camlp4/plexer.cmx
 lib/ocaml/camlp4/stdpp.cmx
 lib/ocaml/camlp4/token.cmx
 lib/ocaml/char.cmx
-lib/ocaml/char.p.cmx
 lib/ocaml/complex.cmx
-lib/ocaml/complex.p.cmx
 lib/ocaml/dbm.a
 lib/ocaml/dbm.cmx
 lib/ocaml/dbm.cmxa
 lib/ocaml/digest.cmx
-lib/ocaml/digest.p.cmx
 lib/ocaml/filename.cmx
-lib/ocaml/filename.p.cmx
 lib/ocaml/format.cmx
-lib/ocaml/format.p.cmx
 lib/ocaml/gc.cmx
-lib/ocaml/gc.p.cmx
-lib/ocaml/genlex.p.cmx
 lib/ocaml/genlex.cmx
 lib/ocaml/graphics.a
 lib/ocaml/graphics.cmxa
 lib/ocaml/hashtbl.cmx
-lib/ocaml/hashtbl.p.cmx
 lib/ocaml/int32.cmx
-lib/ocaml/int32.p.cmx
 lib/ocaml/int64.cmx
-lib/ocaml/int64.p.cmx
 lib/ocaml/int_misc.cmx
 lib/ocaml/labelled.cmx
-lib/ocaml/labelled.p.cmx
 lib/ocaml/labltk/balloon.cmx
 lib/ocaml/labltk/bell.cmx
 lib/ocaml/labltk/button.cmx
@@ -154,57 +137,36 @@ lib/ocaml/labltk/toplevel.cmx
 lib/ocaml/labltk/winfo.cmx
 lib/ocaml/labltk/wm.cmx
 lib/ocaml/lazy.cmx
-lib/ocaml/lazy.p.cmx
 lib/ocaml/lexing.cmx
-lib/ocaml/lexing.p.cmx
 lib/ocaml/libasmrun.a
 lib/ocaml/libasmrunp.a
 lib/ocaml/list.cmx
-lib/ocaml/list.p.cmx
 lib/ocaml/listLabels.cmx
-lib/ocaml/listLabels.p.cmx
 lib/ocaml/map.cmx
-lib/ocaml/map.p.cmx
 lib/ocaml/marshal.cmx
-lib/ocaml/marshal.p.cmx
 lib/ocaml/moreLabels.cmx
-lib/ocaml/moreLabels.p.cmx
 lib/ocaml/nat.cmx
 lib/ocaml/nativeint.cmx
-lib/ocaml/nativeint.p.cmx
 lib/ocaml/num.cmx
 lib/ocaml/nums.a
 lib/ocaml/nums.cmxa
 lib/ocaml/obj.cmx
-lib/ocaml/obj.p.cmx
 lib/ocaml/ocamldoc/odoc_info.a
 lib/ocaml/ocamldoc/odoc_info.cmxa
 lib/ocaml/ocamldoc/odoc_opt.cmi
 lib/ocaml/oo.cmx
-lib/ocaml/oo.p.cmx
 lib/ocaml/parsing.cmx
-lib/ocaml/parsing.p.cmx
 lib/ocaml/pervasives.cmx
-lib/ocaml/pervasives.p.cmx
 lib/ocaml/printexc.cmx
-lib/ocaml/printexc.p.cmx
 lib/ocaml/printf.cmx
-lib/ocaml/printf.p.cmx
 lib/ocaml/queue.cmx
-lib/ocaml/queue.p.cmx
 lib/ocaml/random.cmx
-lib/ocaml/random.p.cmx
 lib/ocaml/ratio.cmx
 lib/ocaml/scanf.cmx
-lib/ocaml/scanf.p.cmx
 lib/ocaml/set.cmx
-lib/ocaml/set.p.cmx
 lib/ocaml/sort.cmx
-lib/ocaml/sort.p.cmx
 lib/ocaml/stack.cmx
-lib/ocaml/stack.p.cmx
 lib/ocaml/stdLabels.cmx
-lib/ocaml/stdLabels.p.cmx
 lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.o
 lib/ocaml/std_exit.p.cmx
@@ -217,17 +179,18 @@ lib/ocaml/str.a
 lib/ocaml/str.cmx
 lib/ocaml/str.cmxa
 lib/ocaml/stream.cmx
-lib/ocaml/stream.p.cmx
 lib/ocaml/string.cmx
-lib/ocaml/string.p.cmx
 lib/ocaml/stringLabels.cmx
-lib/ocaml/stringLabels.p.cmx
 lib/ocaml/string_misc.cmx
 lib/ocaml/sys.cmx
-lib/ocaml/sys.p.cmx
+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.cmxa
 lib/ocaml/unix.a
 lib/ocaml/unix.cmx
 lib/ocaml/unix.cmxa
 lib/ocaml/unixLabels.cmx
 lib/ocaml/weak.cmx
-lib/ocaml/weak.p.cmx
diff --git a/lang/ocaml/PLIST.prof b/lang/ocaml/PLIST.prof
new file mode 100644
index 00000000000..bc3623da958
--- /dev/null
+++ b/lang/ocaml/PLIST.prof
@@ -0,0 +1,44 @@
+@comment $NetBSD: PLIST.prof,v 1.1 2004/04/24 14:45:15 danw Exp $
+lib/ocaml/arg.p.cmx
+lib/ocaml/array.p.cmx
+lib/ocaml/arrayLabels.p.cmx
+lib/ocaml/buffer.p.cmx
+lib/ocaml/callback.p.cmx
+lib/ocaml/camlinternalOO.p.cmx
+lib/ocaml/char.p.cmx
+lib/ocaml/complex.p.cmx
+lib/ocaml/digest.p.cmx
+lib/ocaml/filename.p.cmx
+lib/ocaml/format.p.cmx
+lib/ocaml/gc.p.cmx
+lib/ocaml/genlex.p.cmx
+lib/ocaml/hashtbl.p.cmx
+lib/ocaml/int32.p.cmx
+lib/ocaml/int64.p.cmx
+lib/ocaml/labelled.p.cmx
+lib/ocaml/lazy.p.cmx
+lib/ocaml/lexing.p.cmx
+lib/ocaml/list.p.cmx
+lib/ocaml/listLabels.p.cmx
+lib/ocaml/map.p.cmx
+lib/ocaml/marshal.p.cmx
+lib/ocaml/moreLabels.p.cmx
+lib/ocaml/nativeint.p.cmx
+lib/ocaml/obj.p.cmx
+lib/ocaml/oo.p.cmx
+lib/ocaml/parsing.p.cmx
+lib/ocaml/pervasives.p.cmx
+lib/ocaml/printexc.p.cmx
+lib/ocaml/printf.p.cmx
+lib/ocaml/queue.p.cmx
+lib/ocaml/random.p.cmx
+lib/ocaml/scanf.p.cmx
+lib/ocaml/set.p.cmx
+lib/ocaml/sort.p.cmx
+lib/ocaml/stack.p.cmx
+lib/ocaml/stdLabels.p.cmx
+lib/ocaml/stream.p.cmx
+lib/ocaml/string.p.cmx
+lib/ocaml/stringLabels.p.cmx
+lib/ocaml/sys.p.cmx
+lib/ocaml/weak.p.cmx
diff --git a/lang/ocaml/buildlink2.mk b/lang/ocaml/buildlink2.mk
index e6ff91fcc44..505081c409c 100644
--- a/lang/ocaml/buildlink2.mk
+++ b/lang/ocaml/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/04/24 08:06:10 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/04/24 14:45:15 danw Exp $
 #
 # This Makefile fragment is included by packages that use ocaml.
 
@@ -23,6 +23,11 @@ BUILDLINK_TARGETS+=	ocaml-buildlink
 
 ocaml-buildlink: _BUILDLINK_USE
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+INSTALL_UNSTRIPPED=		yes
+.endif
+
 .include "../../x11/tk/buildlink3.mk"
 
 .endif	# OCAML_BUILDLINK2_MK
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index 7be869017bc..8e4d7e949b3 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/04/24 08:06:10 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/04/24 14:45:15 danw Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OCAML_BUILDLINK3_MK:=	${OCAML_BUILDLINK3_MK}+
@@ -14,6 +14,12 @@ BUILDLINK_DEPMETHOD.ocaml?=	build
 .if !empty(OCAML_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.06nb6
 BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
+
+. include "../../mk/bsd.prefs.mk"
+. if ${OPSYS} == "Darwin"
+INSTALL_UNSTRIPPED=		yes
+. endif
+
 .endif	# OCAML_BUILDLINK3_MK
 
 .include "../../x11/tk/buildlink3.mk"