From 65fe8e9b9468384d090cd74dd026c2c191eb3f3a Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Thu, 22 Apr 2004 09:18:34 +0000
Subject: 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.

---
 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 | 152 +++++++++---
 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 | 207 ++++++++--------
 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(-)
 delete mode 100644 lang/ocaml/PLIST.common_end
 delete mode 100644 lang/ocaml/PLIST.threads
 create mode 100644 lang/ocaml/patches/patch-an
 create mode 100644 lang/ocaml/patches/patch-ap
 create mode 100644 lang/ocaml/patches/patch-aq
 create mode 100644 lang/ocaml/patches/patch-ar
 create mode 100644 lang/ocaml/patches/patch-as
 create mode 100644 lang/ocaml/patches/patch-at
 create mode 100644 lang/ocaml/patches/patch-au
 create mode 100644 lang/ocaml/patches/patch-av
 create mode 100644 lang/ocaml/patches/patch-aw
 create mode 100644 lang/ocaml/patches/patch-ax
 create mode 100644 lang/ocaml/patches/patch-ay
 create mode 100644 lang/ocaml/patches/patch-az
 create mode 100644 lang/ocaml/patches/patch-ba
 create mode 100644 lang/ocaml/patches/patch-bb
 create mode 100644 lang/ocaml/patches/patch-bc
 create mode 100644 lang/ocaml/patches/patch-bd
 create mode 100644 lang/ocaml/patches/patch-be
 create mode 100644 lang/ocaml/patches/patch-bf
 create mode 100644 lang/ocaml/patches/patch-bg
 create mode 100644 lang/ocaml/patches/patch-bh
 create mode 100644 lang/ocaml/patches/patch-bi
 create mode 100644 lang/ocaml/patches/patch-bj
 create mode 100644 lang/ocaml/patches/patch-bk
 create mode 100644 lang/ocaml/patches/patch-bl
 create mode 100644 lang/ocaml/patches/patch-bm
 create mode 100644 lang/ocaml/patches/patch-bn
 create mode 100644 lang/ocaml/patches/patch-bo
 create mode 100644 lang/ocaml/patches/patch-bp
 create mode 100644 lang/ocaml/patches/patch-bq
 create mode 100644 lang/ocaml/patches/patch-br
 create mode 100644 lang/ocaml/patches/patch-bs

(limited to 'lang')

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index c1ff68b235d..ad616686c5d 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -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+=	-x11lib ${X11BASE}/lib
 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 @@ post-build:
 		${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 --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index f24385abbde..9ec7b446ffb 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -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/libmldbm.a
 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/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
-${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.S.o
 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 --git a/lang/ocaml/PLIST.common_end b/lang/ocaml/PLIST.common_end
deleted file mode 100644
index c35861d5e03..00000000000
--- a/lang/ocaml/PLIST.common_end
+++ /dev/null
@@ -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 --git a/lang/ocaml/PLIST.threads b/lang/ocaml/PLIST.threads
deleted file mode 100644
index 1332de4cfe2..00000000000
--- a/lang/ocaml/PLIST.threads
+++ /dev/null
@@ -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 --git a/lang/ocaml/buildlink2.mk b/lang/ocaml/buildlink2.mk
index b11fadc15e7..08e0cfa51d7 100644
--- a/lang/ocaml/buildlink2.mk
+++ b/lang/ocaml/buildlink2.mk
@@ -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 --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index cff602c181c..9c36f9a957d 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -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:=	${BUILDLINK_PACKAGES:Nocaml}
 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 --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index d1e238b64ce..950d4795f4e 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -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 --git a/lang/ocaml/patches/patch-aa b/lang/ocaml/patches/patch-aa
index ddc299ba1a4..69f8af25d4f 100644
--- a/lang/ocaml/patches/patch-aa
+++ b/lang/ocaml/patches/patch-aa
@@ -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 --git a/lang/ocaml/patches/patch-ab b/lang/ocaml/patches/patch-ab
index 174f8eb0807..354bdf08d2c 100644
--- a/lang/ocaml/patches/patch-ab
+++ b/lang/ocaml/patches/patch-ab
@@ -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/.
-+	${BSD_INSTALL_DATA} lib.sml $(LIBDIR)/camlp4/.
-+	${BSD_INSTALL_SCRIPT} camlp4o$(EXE) $(BINDIR)/.
-+	if test -f $(COPT); then ${BSD_INSTALL_PROGRAM} $(COPT) $(BINDIR)/.; fi
-+	${BSD_INSTALL_SCRIPT} mkcamlp4.sh $(BINDIR)/mkcamlp4
- 
- pa_lisp.cmo: pa_lispr.cmo
- pa_ocamllex.cmo: pa_o.cmo
---- ./camlp4/camlp4/Makefile.orig	Fri Apr 18 14:42:14 2003
-+++ ./camlp4/camlp4/Makefile	Fri Apr 18 14:42:52 2003
-@@ -62,11 +62,19 @@
- 	done
- 
- install:
--	-$(MKDIR) $(BINDIR)
--	-$(MKDIR) $(LIBDIR)/camlp4
--	cp $(CAMLP4) $(BINDIR)/.
--	cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli $(LIBDIR)/camlp4/.
--	cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi $(LIBDIR)/camlp4/.
--	cp camlp4.cma $(LIBDIR)/camlp4/.
-+	-${BSD_INSTALL_PROGRAM_DIR} $(BINDIR)
-+	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
-+	${BSD_INSTALL_SCRIPT} $(CAMLP4) $(BINDIR)/.
-+	${BSD_INSTALL_DATA} mLast.mli $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} quotation.mli $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} ast2pt.mli $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} pcaml.mli $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} spretty.mli $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} mLast.cmi $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} quotation.cmi $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} ast2pt.cmi $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} pcaml.cmi $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} spretty.cmi $(LIBDIR)/camlp4/
-+	${BSD_INSTALL_DATA} camlp4.cma $(LIBDIR)/camlp4/
- 
- include .depend
---- ./camlp4/lib/Makefile.orig	Fri Apr 18 14:45:22 2003
-+++ ./camlp4/lib/Makefile	Fri Apr 18 14:46:06 2003
-@@ -36,15 +36,15 @@
- 	done
- 
- install:
--	-$(MKDIR) $(LIBDIR)/camlp4
--	cp $(TARGET) *.mli $(LIBDIR)/camlp4/.
--	cp *.cmi $(LIBDIR)/camlp4/.
-+	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
-+	${BSD_INSTALL_DATA} $(TARGET) *.mli $(LIBDIR)/camlp4/.
-+	${BSD_INSTALL_DATA} *.cmi $(LIBDIR)/camlp4/.
- 	if test -f $(TARGET:.cma=.cmxa); then $(MAKE) installopt LIBDIR=$(LIBDIR); fi
- 
- installopt:
--	cp $(TARGET:.cma=.cmxa) *.cmx $(LIBDIR)/camlp4/.
-+	${BSD_INSTALL_DATA} $(TARGET:.cma=.cmxa) *.cmx $(LIBDIR)/camlp4/.
- 	if test -f $(TARGET:.cma=.lib); then \
--	  cp $(TARGET:.cma=.lib) $(LIBDIR)/camlp4/.; \
-+	  ${BSD_INSTALL_DATA} $(TARGET:.cma=.lib) $(LIBDIR)/camlp4/.; \
- 	else \
- 	  tar cf - $(TARGET:.cma=.a) | (cd $(LIBDIR)/camlp4/.; tar xf -); \
- 	fi
---- ./camlp4/man/Makefile.orig	Fri Apr 18 14:46:06 2003
-+++ ./camlp4/man/Makefile	Fri Apr 18 14:46:38 2003
-@@ -14,8 +14,8 @@
- get_promote:
- 
- install:
--	-$(MKDIR) $(MANDIR)/man1
--	-cp $(TARGET) $(MANDIR)/man1/.
-+	-${BSD_INSTALL_MAN_DIR} $(MANDIR)/man1
-+	-${BSD_INSTALL_MAN} $(TARGET) $(MANDIR)/man1/.
- 	-cd $(MANDIR)/man1; rm -f camlp4o.1; ln -s $(TARGET) camlp4o.1
- 	-cd $(MANDIR)/man1; rm -f camlp4r.1; ln -s $(TARGET) camlp4r.1
- 	-cd $(MANDIR)/man1; rm -f mkcamlp4.1; ln -s $(TARGET) mkcamlp4.1
---- ./camlp4/meta/Makefile.orig	Fri Apr 18 14:42:52 2003
-+++ ./camlp4/meta/Makefile	Fri Apr 18 14:43:37 2003
-@@ -42,10 +42,11 @@
- 	done
- 
- install:
--	-$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
--	cp $(OBJS) $(LIBDIR)/camlp4/.
--	cp pa_ifdef.cmi pa_extend.cmi $(LIBDIR)/camlp4/.
--	cp camlp4r$(EXE) $(BINDIR)/.
-+	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
-+	-${BSD_INSTALL_PROGRAM_DIR}  $(BINDIR)
-+	${BSD_INSTALL_DATA} $(OBJS) $(LIBDIR)/camlp4/.
-+	${BSD_INSTALL_DATA} pa_ifdef.cmi pa_extend.cmi $(LIBDIR)/camlp4/.
-+	${BSD_INSTALL_SCRIPT} camlp4r$(EXE) $(BINDIR)/.
- 	if test -f $(COPT); then cp $(COPT) $(BINDIR)/.; fi
- 
- include .depend
---- ./camlp4/ocpp/Makefile.orig	Fri Apr 18 14:44:54 2003
-+++ ./camlp4/ocpp/Makefile	Fri Apr 18 14:45:22 2003
-@@ -24,8 +24,9 @@
- 	rm -f *.cm[ioa] *.pp[io] *.o *.out *.bak .*.bak crc.ml ocpp$(EXE)
- 
- install:
--	-$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
--	cp $(OBJS) $(LIBDIR)/camlp4/.
--	cp ocpp$(EXE) $(BINDIR)/.
-+	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
-+	-${BSD_INSTALL_PROGRAM_DIR}  $(BINDIR)
-+	${BSD_INSTALL_DATA} $(OBJS) $(LIBDIR)/camlp4/.
-+	${BSD_INSTALL_SCRIPT} ocpp$(EXE) $(BINDIR)/.
- 
- depend:
---- ./camlp4/odyl/Makefile.orig	Fri Apr 18 14:41:32 2003
-+++ ./camlp4/odyl/Makefile	Fri Apr 18 14:42:14 2003
-@@ -51,7 +51,8 @@
- compare:
- 
- install:
--	-$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
--	cp odyl.cmo odyl.cma $(LIBDIR)/camlp4/.
-+	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
-+	-${BSD_INSTALL_DATA_DIR}  $(BINDIR)
-+	${BSD_INSTALL_DATA} odyl.cmo odyl.cma $(LIBDIR)/camlp4/.
- 
- include .depend
---- ./camlp4/top/Makefile.orig	Fri Apr 18 14:44:40 2003
-+++ ./camlp4/top/Makefile	Fri Apr 18 14:44:54 2003
-@@ -42,7 +42,9 @@
- get_promote:
- 
- install:
--	-$(MKDIR) $(LIBDIR)/camlp4
--	cp $(TARGET) $(LIBDIR)/camlp4/.
-+	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
-+	for i in $(TARGET); do	\
-+		${BSD_INSTALL_DATA} $$i $(LIBDIR)/camlp4/ ; \
-+	done
- 
- include .depend
---- ./debugger/Makefile.orig	Fri Apr 18 14:46:54 2003
-+++ ./debugger/Makefile	Fri Apr 18 14:47:08 2003
-@@ -79,7 +79,7 @@
- 	$(CAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) $(OTHEROBJS) $(OBJS)
- 
- install:
--	cp ocamldebug$(EXE) $(BINDIR)/ocamldebug$(EXE)
-+	${BSD_INSTALL_PROGRAM} ocamldebug$(EXE) $(BINDIR)/ocamldebug$(EXE)
- 
- clean::
- 	rm -f ocamldebug$(EXE)
---- ./man/Makefile.orig	Fri Apr 18 14:25:01 2003
-+++ ./man/Makefile	Fri Apr 18 14:25:28 2003
-@@ -17,6 +17,6 @@
- DIR=$(MANDIR)/man$(MANEXT)
- 
- install:
--	for i in *.m; do cp $$i $(DIR)/`basename $$i .m`.$(MANEXT); done
-+	for i in *.m; do ${BSD_INSTALL_MAN} $$i $(DIR)/`basename $$i .m`.$(MANEXT); done
- 	echo '.so man$(MANEXT)/ocamlc.$(MANEXT)' > $(DIR)/ocamlc.opt.$(MANEXT)
- 	echo '.so man$(MANEXT)/ocamlopt.$(MANEXT)' > $(DIR)/ocamlopt.opt.$(MANEXT)
---- ./ocamldoc/Makefile.orig	Fri Apr 18 14:38:37 2003
-+++ ./ocamldoc/Makefile	Fri Apr 18 14:40:24 2003
-@@ -272,23 +272,23 @@
- # Installation targets
- ######################
- install: dummy
--	if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi
--	if test -d $(INSTALL_LIBDIR); then : ; else $(MKDIR) $(INSTALL_LIBDIR); fi
--	$(CP) $(OCAMLDOC) $(INSTALL_BINDIR)
--	$(CP) ocamldoc.sty ocamldoc.hva *.cmi $(GENERATORS) $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
--	$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
--	if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
--	$(CP) stdlib_man/* $(INSTALL_MANODIR)
-+	if test -d $(INSTALL_BINDIR); then : ; else ${BSD_INSTALL_PROGRAM_DIR} $(INSTALL_BINDIR); fi
-+	if test -d $(INSTALL_LIBDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALL_LIBDIR); fi
-+	${BSD_INSTALL_PROGRAM} $(OCAMLDOC) $(INSTALL_BINDIR)
-+	${BSD_INSTALL_DATA} ocamldoc.sty ocamldoc.hva *.cmi $(GENERATORS) $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
-+	${BSD_INSTALL_DATA} $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
-+	if test -d $(INSTALL_MANODIR); then : ; else ${BSD_INSTALL_MAN_DIR} $(INSTALL_MANODIR); fi
-+	${BSD_INSTALL_MAN} stdlib_man/* $(INSTALL_MANODIR)
- 
- installopt:
- 	if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi
- 
- installopt_really:
--	if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi
--	if test -d $(INSTALL_LIBDIR); then : ; else $(MKDIR) $(INSTALL_LIBDIR); fi
--	$(CP) $(OCAMLDOC_OPT) $(INSTALL_BINDIR)
--	$(CP) ocamldoc.sty ocamldoc.hva $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) $(INSTALL_LIBDIR)
--	$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
-+	if test -d $(INSTALL_BINDIR); then : ; else ${BSD_INSTALL_PROGRAM_DIR} $(INSTALL_BINDIR); fi
-+	if test -d $(INSTALL_LIBDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALL_LIBDIR); fi
-+	${BSD_INSTALL_PROGRAM} $(OCAMLDOC_OPT) $(INSTALL_BINDIR)
-+	${BSD_INSTALL_DATA} ocamldoc.sty ocamldoc.hva $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) $(INSTALL_LIBDIR)
-+	${BSD_INSTALL_DATA} $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
- 
- # Testing :
- ###########
---- ./otherlibs/bigarray/Makefile.orig	Fri Apr 18 14:25:51 2003
-+++ ./otherlibs/bigarray/Makefile	Fri Apr 18 14:26:40 2003
-@@ -41,13 +41,13 @@
-           $(CAML_OBJS:.cmo=.cmx)
- 
- install:
--	if test -f dllbigarray.so; then cp dllbigarray.so $(STUBLIBDIR)/dllbigarray.so; fi
--	cp bigarray.cmi bigarray.mli libbigarray.a bigarray.cma $(LIBDIR)
-+	if test -f dllbigarray.so; then ${BSD_INSTALL_DATA} dllbigarray.so $(STUBLIBDIR)/dllbigarray.so; fi
-+	${BSD_INSTALL_DATA} bigarray.cmi bigarray.mli libbigarray.a bigarray.cma $(LIBDIR)
- 	cd $(LIBDIR); $(RANLIB) libbigarray.a
--	cp bigarray.h $(LIBDIR)/caml/bigarray.h
-+	${BSD_INSTALL_DATA} bigarray.h $(LIBDIR)/caml/bigarray.h
- 
- installopt:
--	cp bigarray.a $(CAML_OBJS:.cmo=.cmx) bigarray.cmxa $(LIBDIR)
-+	${BSD_INSTALL_DATA} bigarray.a $(CAML_OBJS:.cmo=.cmx) bigarray.cmxa $(LIBDIR)
- 	cd $(LIBDIR); $(RANLIB) bigarray.a
- 
- partialclean:
---- ./otherlibs/dbm/Makefile.orig	Fri Apr 18 14:27:45 2003
-+++ ./otherlibs/dbm/Makefile	Fri Apr 18 14:28:12 2003
-@@ -47,13 +47,13 @@
- 	rm -f *.a *.o *.so
- 
- install:
--	if test -f dllmldbm.so; then cp dllmldbm.so $(STUBLIBDIR)/dllmldbm.so; fi
--	cp libmldbm.a $(LIBDIR)/libmldbm.a
-+	if test -f dllmldbm.so; then ${BSD_INSTALL_DATA} dllmldbm.so $(STUBLIBDIR)/dllmldbm.so; fi
-+	${BSD_INSTALL_DATA} libmldbm.a $(LIBDIR)/libmldbm.a
- 	cd $(LIBDIR); $(RANLIB) libmldbm.a
--	cp dbm.cma dbm.cmi dbm.mli $(LIBDIR)
-+	${BSD_INSTALL_DATA} dbm.cma dbm.cmi dbm.mli $(LIBDIR)
- 
- installopt:
--	cp dbm.cmx dbm.cmxa dbm.a $(LIBDIR)
-+	${BSD_INSTALL_DATA} dbm.cmx dbm.cmxa dbm.a $(LIBDIR)
- 	cd $(LIBDIR); $(RANLIB) dbm.a
- 
- .SUFFIXES: .ml .mli .cmo .cmi .cmx
---- ./otherlibs/dynlink/Makefile.orig	Fri Apr 18 14:28:23 2003
-+++ ./otherlibs/dynlink/Makefile	Fri Apr 18 14:28:35 2003
-@@ -38,7 +38,7 @@
- 	$(CAMLC) $(COMPFLAGS) -o extract_crc dynlink.cma extract_crc.cmo
- 
- install:
--	cp dynlink.cmi dynlink.cma dynlink.mli extract_crc $(LIBDIR)
-+	${BSD_INSTALL_DATA} dynlink.cmi dynlink.cma dynlink.mli extract_crc $(LIBDIR)
- 
- installopt:
- 
---- ./otherlibs/graph/Makefile.orig	Fri Apr 18 14:29:08 2003
-+++ ./otherlibs/graph/Makefile	Fri Apr 18 14:29:30 2003
-@@ -50,13 +50,13 @@
- 	rm -f *.a *.so *.o
- 
- install:
--	if test -f dllgraphics.so; then cp dllgraphics.so $(STUBLIBDIR)/dllgraphics.so; fi
--	cp libgraphics.a $(LIBDIR)/libgraphics.a
-+	if test -f dllgraphics.so; then ${BSD_INSTALL_DATA} dllgraphics.so $(STUBLIBDIR)/dllgraphics.so; fi
-+	${BSD_INSTALL_DATA} libgraphics.a $(LIBDIR)/libgraphics.a
- 	cd $(LIBDIR); $(RANLIB) libgraphics.a
--	cp graphics.cm[ia] graphicsX11.cmi graphics.mli graphicsX11.mli $(LIBDIR)
-+	${BSD_INSTALL_DATA} graphics.cm[ia] graphicsX11.cmi graphics.mli graphicsX11.mli $(LIBDIR)
- 
- installopt:
--	cp graphics.cmxa graphics.a $(LIBDIR)
-+	${BSD_INSTALL_DATA} graphics.cmxa graphics.a $(LIBDIR)
- 	cd $(LIBDIR); $(RANLIB) graphics.a
- 
- .SUFFIXES: .ml .mli .cmo .cmi .cmx
---- ./otherlibs/labltk/browser/Makefile.orig	Fri Apr 18 14:33:15 2003
-+++ ./otherlibs/labltk/browser/Makefile	Fri Apr 18 14:33:33 2003
-@@ -47,7 +47,7 @@
- 
- install:
- 	if test -f ocamlbrowser$(EXE); then : ; \
--	  cp ocamlbrowser$(EXE) $(BINDIR); fi
-+	  ${BSD_INSTALL_SCRIPT} ocamlbrowser$(EXE) $(BINDIR); fi
- 
- clean:
- 	rm -f *.cm? ocamlbrowser$(EXE) dummy.mli *~ *.orig
---- ./otherlibs/labltk/camltk/Makefile.orig	Fri Apr 18 14:33:34 2003
-+++ ./otherlibs/labltk/camltk/Makefile	Fri Apr 18 14:34:41 2003
-@@ -21,14 +21,12 @@
- 	$(MAKE) -f Makefile.gen clean
- 
- install: $(CAMLTKOBJS)
--	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
--	cp $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
--	chmod 644 $(INSTALLDIR)/*.cmi
-+	if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
-+	${BSD_INSTALL_DATA} $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
- 
- installopt: $(CAMLTKOBJSX)
--	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
--	cp $(CAMLTKOBJSX) $(INSTALLDIR)
--	chmod 644 $(INSTALLDIR)/*.cmx
-+	@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
-+	${BSD_INSTALL_DATA} $(CAMLTKOBJSX) $(INSTALLDIR)
- 
- .SUFFIXES :
- .SUFFIXES : .mli .ml .cmi .cmx .cmo .mlp
---- ./otherlibs/labltk/compiler/Makefile.orig	Fri Apr 18 14:34:42 2003
-+++ ./otherlibs/labltk/compiler/Makefile	Fri Apr 18 14:34:52 2003
-@@ -45,8 +45,8 @@
- 	rm -f *.cm*  pplex.ml ppyac.ml ppyac.mli pp$(EXE)
- 
- install: 
--	cp tkcompiler$(EXE) $(INSTALLDIR)
--	cp pp$(EXE) $(INSTALLDIR)
-+	${BSD_INSTALL_SCRIPT} tkcompiler$(EXE) $(INSTALLDIR)
-+	${BSD_INSTALL_SCRIPT} pp$(EXE) $(INSTALLDIR)
- 
- .SUFFIXES :
- .SUFFIXES : .mli .ml .cmi .cmo .mlp
---- ./otherlibs/labltk/frx/Makefile.orig	Fri Apr 18 14:35:04 2003
-+++ ./otherlibs/labltk/frx/Makefile	Fri Apr 18 14:35:14 2003
-@@ -20,7 +20,7 @@
- 	$(CAMLOPTLIBR) -o frxlib.cmxa $(OBJSX)
- 
- install: frxlib.cma
--	cp *.cmi *.mli frxlib.cma $(INSTALLDIR)
-+	${BSD_INSTALL_DATA} *.cmi *.mli frxlib.cma $(INSTALLDIR)
- 
- installopt: frxlib.cmxa
- 	cp frxlib.cmxa frxlib.a $(INSTALLDIR)
---- ./otherlibs/labltk/jpf/Makefile.orig	Fri Apr 18 14:35:15 2003
-+++ ./otherlibs/labltk/jpf/Makefile	Fri Apr 18 14:35:24 2003
-@@ -21,7 +21,7 @@
- 	$(CAMLOPTLIBR) -o jpflib.cmxa $(OBJSX)
- 
- install: jpflib.cma
--	cp $(OBJS:.cmo=.cmi) $(OBJS:.cmo=.mli) jpflib.cma $(INSTALLDIR)
-+	${BSD_INSTALL_DATA} $(OBJS:.cmo=.cmi) $(OBJS:.cmo=.mli) jpflib.cma $(INSTALLDIR)
- 
- installopt: jpflib.cmxa
- 	cp jpflib.cmxa jpflib.a $(OBJS:.cmo=.cmx) $(INSTALLDIR)
---- ./otherlibs/labltk/labltk/Makefile.orig	Fri Apr 18 14:35:24 2003
-+++ ./otherlibs/labltk/labltk/Makefile	Fri Apr 18 14:35:59 2003
-@@ -16,14 +16,12 @@
- labltkobjsx: $(LABLTKOBJSX)
- 
- install: $(LABLTKOBJS)
--	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
--	cp $(LABLTKOBJS:.cmo=.cmi) $(WIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
--	chmod 644 $(INSTALLDIR)/*.cmi
-+	if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
-+	${BSD_INSTALL_DATA} $(LABLTKOBJS:.cmo=.cmi) $(WIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
- 
- installopt: $(LABLTKOBJSX)
--	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
--	cp $(LABLTKOBJSX) $(INSTALLDIR)
--	chmod 644 $(INSTALLDIR)/*.cmx
-+	@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
-+	${BSD_INSTALL_DATA} $(LABLTKOBJSX) $(INSTALLDIR)
- 
- clean:
- 	$(MAKE) -f Makefile.gen clean
---- ./otherlibs/labltk/lib/Makefile.orig	Fri Apr 18 14:36:00 2003
-+++ ./otherlibs/labltk/lib/Makefile	Fri Apr 18 14:37:09 2003
-@@ -58,17 +58,13 @@
- 	@echo 'exec $(INSTALLDIR)/$(LIBNAME)top$(EXE) -I $(INSTALLDIR) $$*' >> $@
- 
- install:
--	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
--	cp $(LIBNAME).cma $(LIBNAME)top$(EXE) $(INSTALLDIR)
--	chmod 644 $(INSTALLDIR)/$(LIBNAME).cma
--	chmod 755 $(INSTALLDIR)/$(LIBNAME)top$(EXE)
--	@if test -d $(BINDIR); then : ; else mkdir $(BINDIR); fi
--	cp $(LIBNAME) $(BINDIR)
--	chmod 755 $(BINDIR)/$(LIBNAME)
-+	if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
-+	${BSD_INSTALL_DATA} $(LIBNAME).cma $(INSTALLDIR)
-+	${BSD_INSTALL_PROGRAM} $(LIBNAME)top$(EXE) $(INSTALLDIR)
-+	@if test -d $(BINDIR); then : ; else ${BSD_INSTALL_PROGRAM_DIR} $(BINDIR); fi
-+	${BSD_INSTALL_SCRIPT} $(LIBNAME) $(BINDIR)
- 
- installopt:
--	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
--	cp $(LIBNAME).cmxa $(LIBNAME).a $(INSTALLDIR)
--	cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).a
--	chmod 644 $(INSTALLDIR)/$(LIBNAME).cmxa
--	chmod 644 $(INSTALLDIR)/$(LIBNAME).a
-+	@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
-+	${BSD_INSTALL_DATA} $(LIBNAME).cmxa $(LIBNAME).a $(INSTALLDIR)
-+	cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).a
---- ./otherlibs/labltk/support/Makefile.orig	Fri Apr 18 14:37:10 2003
-+++ ./otherlibs/labltk/support/Makefile	Fri Apr 18 14:37:47 2003
-@@ -26,12 +26,11 @@
-     widget.cmi widget.mli
- 
- install: lib$(LIBNAME).a $(PUB)
--	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
--	cp $(PUB) lib$(LIBNAME).a $(INSTALLDIR)
-+	if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
-+	${BSD_INSTALL_DATA} $(PUB) lib$(LIBNAME).a $(INSTALLDIR)
- 	cd $(INSTALLDIR); $(RANLIB) lib$(LIBNAME).a
--	cd $(INSTALLDIR); chmod 644 $(PUB) lib$(LIBNAME).a
- 	if test -f dll$(LIBNAME).so; then \
--	   cp dll$(LIBNAME).so $(STUBLIBDIR)/dll$(LIBNAME).so; fi
-+	   ${BSD_INSTALL_DATA} dll$(LIBNAME).so $(STUBLIBDIR)/dll$(LIBNAME).so; fi
- 
- clean : 
- 	rm -f *.cm* *.o *.a *.so
---- ./otherlibs/labltk/tkanim/Makefile.orig	Fri Apr 18 14:37:47 2003
-+++ ./otherlibs/labltk/tkanim/Makefile	Fri Apr 18 14:38:19 2003
-@@ -52,9 +52,9 @@
- 
- 
- install: tkanim.cma 
--	cp tkanim.cma *.cmi *.mli libtkanim.a $(INSTALLDIR)
-+	${BSD_INSTALL_DATA} tkanim.cma *.cmi *.mli libtkanim.a $(INSTALLDIR)
- 	if [ -f dlltkanim.so ]; then \
--		cp dlltkanim.so $(STUBLIBDIR)/dlltkanim.so; \
-+		${BSD_INSTALL_DATA} dlltkanim.so $(STUBLIBDIR)/dlltkanim.so; \
- 	fi
- 
- installopt: tkanim.cmxa
---- ./otherlibs/num/Makefile.orig	Fri Apr 18 14:29:52 2003
-+++ ./otherlibs/num/Makefile	Fri Apr 18 14:30:19 2003
-@@ -53,13 +53,13 @@
- $(CAMLOBJS:.cmo=.cmx): ../../ocamlopt
- 
- install:
--	if test -f dllnums.so; then cp dllnums.so $(STUBLIBDIR)/dllnums.so; fi
--	cp libnums.a $(LIBDIR)/libnums.a
-+	if test -f dllnums.so; then ${BSD_INSTALL_DATA} dllnums.so $(STUBLIBDIR)/dllnums.so; fi
-+	${BSD_INSTALL_DATA} libnums.a $(LIBDIR)/libnums.a
- 	cd $(LIBDIR); $(RANLIB) libnums.a
--	cp nums.cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)
-+	${BSD_INSTALL_DATA} nums.cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)
- 
- installopt:
--	cp $(CAMLOBJS:.cmo=.cmx) nums.cmxa nums.a $(LIBDIR)
-+	${BSD_INSTALL_DATA} $(CAMLOBJS:.cmo=.cmx) nums.cmxa nums.a $(LIBDIR)
- 	cd $(LIBDIR); $(RANLIB) nums.a
- 
- partialclean:
---- ./otherlibs/str/Makefile.orig	Fri Apr 18 14:30:19 2003
-+++ ./otherlibs/str/Makefile	Fri Apr 18 14:30:43 2003
-@@ -53,13 +53,13 @@
- 	cd $(REGEXLIB); if test -f Makefile; then $(MAKE) distclean; else exit 0; fi
- 
- install:
--	if test -f dllstr.so; then cp dllstr.so $(STUBLIBDIR)/dllstr.so; fi
--	cp libstr.a $(LIBDIR)/libstr.a
-+	if test -f dllstr.so; then ${BSD_INSTALL_DATA} dllstr.so $(STUBLIBDIR)/dllstr.so; fi
-+	${BSD_INSTALL_DATA} libstr.a $(LIBDIR)/libstr.a
- 	cd $(LIBDIR); $(RANLIB) libstr.a
--	cp str.cma str.cmi str.mli $(LIBDIR)
-+	${BSD_INSTALL_DATA} str.cma str.cmi str.mli $(LIBDIR)
- 
- installopt:
--	cp str.cmx str.cmxa str.a $(LIBDIR)
-+	${BSD_INSTALL_DATA} str.cmx str.cmxa str.a $(LIBDIR)
- 	cd $(LIBDIR); $(RANLIB) str.a
- 
- .SUFFIXES: .ml .mli .cmo .cmi .cmx
---- ./otherlibs/systhreads/Makefile.orig	Fri Apr 18 14:30:43 2003
-+++ ./otherlibs/systhreads/Makefile	Fri Apr 18 14:31:12 2003
-@@ -70,13 +70,13 @@
- 	rm -f $(GENFILES)
- 
- install:
--	if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
--	cp libthreads.a $(LIBDIR)/libthreads.a
-+	if test -f dllthreads.so; then ${BSD_INSTALL_DATA} dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
-+	${BSD_INSTALL_DATA} libthreads.a $(LIBDIR)/libthreads.a
- 	cd $(LIBDIR); $(RANLIB) libthreads.a
--	if test -d $(LIBDIR)/threads; then :; else mkdir $(LIBDIR)/threads; fi
--	cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads
-+	if test -d $(LIBDIR)/threads; then :; else ${BSD_INSTALL_DATA_DIR} $(LIBDIR)/threads; fi
-+	${BSD_INSTALL_DATA} $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads
- 	rm -f $(LIBDIR)/threads/stdlib.cma
--	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)
-+	${BSD_INSTALL_DATA} thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)
- 
- installopt:
- 	cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a
---- ./otherlibs/threads/Makefile.orig	Fri Apr 18 14:31:14 2003
-+++ ./otherlibs/threads/Makefile	Fri Apr 18 14:31:45 2003
-@@ -99,12 +99,12 @@
- 	rm -f pervasives.mli marshal.mli unix.mli
- 
- install:
--	if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
--	cp libthreads.a $(LIBDIR)/libthreads.a
-+	if test -f dllthreads.so; then ${BSD_INSTALL_DATA} dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
-+	${BSD_INSTALL_DATA} libthreads.a $(LIBDIR)/libthreads.a
- 	cd $(LIBDIR); $(RANLIB) libthreads.a
--	if test -d $(LIBDIR)/threads; then : ; else mkdir $(LIBDIR)/threads; fi
--	cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma unix.cma $(LIBDIR)/threads
--	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)
-+	if test -d $(LIBDIR)/threads; then : ; else ${BSD_INSTALL_DATA_DIR} $(LIBDIR)/threads; fi
-+	${BSD_INSTALL_DATA} thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma unix.cma $(LIBDIR)/threads
-+	${BSD_INSTALL_DATA} thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)
- 
- installopt:
- 
---- ./otherlibs/unix/Makefile.orig	Fri Apr 18 14:31:45 2003
-+++ ./otherlibs/unix/Makefile	Fri Apr 18 14:32:05 2003
-@@ -65,13 +65,13 @@
- 	rm -f *.a *.o *.so
- 
- install:
--	if test -f dllunix.so; then cp dllunix.so $(STUBLIBDIR)/dllunix.so; fi
--	cp libunix.a $(LIBDIR)/libunix.a
-+	if test -f dllunix.so; then ${BSD_INSTALL_DATA} dllunix.so $(STUBLIBDIR)/dllunix.so; fi
-+	${BSD_INSTALL_DATA} libunix.a $(LIBDIR)/libunix.a
- 	cd $(LIBDIR); $(RANLIB) libunix.a
--	cp unix.cma $(MLOBJS:.cmo=.cmi) $(MLOBJS:.cmo=.mli) $(LIBDIR)
-+	${BSD_INSTALL_DATA} unix.cma $(MLOBJS:.cmo=.cmi) $(MLOBJS:.cmo=.mli) $(LIBDIR)
- 
- installopt:
--	cp $(MLOBJS:.cmo=.cmx) unix.cmxa unix.a $(LIBDIR)
-+	${BSD_INSTALL_DATA} $(MLOBJS:.cmo=.cmx) unix.cmxa unix.a $(LIBDIR)
- 	cd $(LIBDIR); $(RANLIB) unix.a
- 
- .SUFFIXES: .ml .mli .cmo .cmi .cmx
---- ./stdlib/Makefile.orig	Fri Apr 18 14:24:06 2003
-+++ ./stdlib/Makefile	Fri Apr 18 14:24:23 2003
-@@ -47,7 +47,7 @@
- allopt-prof: stdlib.p.cmxa std_exit.p.cmx
- 
- install:
--	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
-+	${BSD_INSTALL_DATA} stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
-            $(LIBDIR)
- 
- installopt: installopt-default installopt-$(PROFILING)
---- ./tools/Makefile.orig	Fri Apr 18 14:24:38 2003
-+++ ./tools/Makefile	Fri Apr 18 14:24:50 2003
-@@ -44,7 +44,7 @@
- 	rm -f ocamldep
- 
- install::
--	cp ocamldep $(BINDIR)/ocamldep$(EXE)
-+	${BSD_INSTALL_SCRIPT} ocamldep $(BINDIR)/ocamldep$(EXE)
- 
- # The profiler
+--- asmcomp/power/arch.ml.orig	Mon Jul 22 18:37:53 2002
++++ asmcomp/power/arch.ml	Thu Apr 22 10:34:38 2004
+@@ -91,6 +91,5 @@
+ let toc =
+   match Config.system with
+   | "aix" -> true
+-  | "elf" -> false
+-  | "rhapsody" -> false
++  | "elf" | "rhapsody" | "bsd" -> false
+   | _ -> Misc.fatal_error "wrong $(SYSTEM)"
diff --git a/lang/ocaml/patches/patch-ac b/lang/ocaml/patches/patch-ac
index e2cca11e51e..071e6c27e16 100644
--- a/lang/ocaml/patches/patch-ac
+++ b/lang/ocaml/patches/patch-ac
@@ -1,42 +1,118 @@
-$NetBSD: patch-ac,v 1.2 2003/06/29 23:04:19 jtb Exp $
+$NetBSD: patch-ac,v 1.3 2004/04/22 09:18:36 tron Exp $
 
---- asmrun/signals.c.orig
-+++ asmrun/signals.c
-@@ -162,6 +162,8 @@
- void handle_signal(int sig, struct sigcontext * context)
- #elif defined(TARGET_power) && defined(SYS_rhapsody)
- void handle_signal(int sig, int code, struct sigcontext * context)
-+#elif defined(TARGET_power) && defined(SYS_bsd)
-+void handle_signal(int sig, int code, struct sigcontext * context)
- #else
- void handle_signal(int sig)
- #endif
-@@ -205,6 +207,10 @@
-       /* Cached in register 30 */
-       CONTEXT_GPR(context, 30) = (unsigned long) young_limit;
- #endif
-+#if defined(TARGET_power) && defined(SYS_bsd)
-+      /* Cached in register 30 */
-+      context->sc_frame.fixreg[30] = (unsigned long) young_limit;
-+#endif
-     }
-   }
- }
-@@ -443,6 +449,17 @@
- }
- #endif
- 
-+#if defined(TARGET_power) && defined(SYS_bsd)
-+static void trap_handler(int sig, int code, struct sigcontext * context)
-+{
-+  /* Recover young_ptr and caml_exception_pointer from registers 31 and 29 */
-+  caml_exception_pointer = (char *) context->sc_frame.fixreg[29];
-+  young_ptr = (char *) context->sc_frame.fixreg[31];
-+  array_bound_error();
-+}
-+#endif
+--- asmcomp/power/emit.mlp.orig	Mon Jul 22 18:37:53 2002
++++ asmcomp/power/emit.mlp	Thu Apr 22 10:34:38 2004
+@@ -65,7 +65,7 @@
+ 
+ let emit_symbol =
+   match Config.system with
+-    "aix" | "elf" -> (fun s -> Emitaux.emit_symbol '.' s)
++    "aix" | "elf" | "bsd" -> (fun s -> Emitaux.emit_symbol '.' s)
+   | "rhapsody"    -> (fun s -> emit_char '_'; Emitaux.emit_symbol '$' s)
+   | _ -> assert false
+ 
+@@ -78,7 +78,7 @@
+ let label_prefix =
+   match Config.system with
+     "aix" -> "L.."
+-  | "elf" -> ".L"
++  | "elf" | "bsd" -> ".L"
+   | "rhapsody" -> "L"
+   | _ -> assert false
+ 
+@@ -90,21 +90,21 @@
+ let data_space =
+   match Config.system with
+     "aix" -> "	.csect  .data[RW]\n"
+-  | "elf" -> "	.section \".data\"\n"
++  | "elf" | "bsd" -> "	.section \".data\"\n"
+   | "rhapsody" -> "	.data\n"
+   | _ -> assert false
+ 
+ let code_space =
+   match Config.system with
+     "aix" -> "	.csect  .text[PR]\n"
+-  | "elf" -> "	.section \".text\"\n"
++  | "elf" | "bsd" -> "	.section \".text\"\n"
+   | "rhapsody" -> "	.text\n"
+   | _ -> assert false
+ 
+ let rodata_space =
+   match Config.system with
+     "aix" -> "	.csect  .data[RW]\n" (* ?? *)
+-  | "elf" -> "	.section \".rodata\"\n"
++  | "elf" | "bsd" -> "	.section \".rodata\"\n"
+   | "rhapsody" -> "	.const\n"
+   | _ -> assert false
+ 
+@@ -157,7 +157,7 @@
+ 
+ let emit_upper emit_fun arg =
+   match Config.system with
+-    "elf" ->
++    "elf" | "bsd" ->
+       emit_fun arg; emit_string "@ha"
+   | "rhapsody" ->
+       emit_string "ha16("; emit_fun arg; emit_string ")"
+@@ -165,7 +165,7 @@
+ 
+ let emit_lower emit_fun arg =
+   match Config.system with
+-    "elf" ->
++    "elf" | "bsd" ->
+       emit_fun arg; emit_string "@l"
+   | "rhapsody" ->
+       emit_string "lo16("; emit_fun arg; emit_string ")"
+@@ -935,6 +935,30 @@
+       emit_instr i None;
+       emit_all i.next
+ 
++(* Emission of the profiling prelude *)
 +
++let emit_profile () =
++  match Config.system with
++    "bsd" ->
++      `	stwu 1, -32(1)\n`;
++      `	mflr 0\n`;
++      `	stw 0, 4(1)\n`;
++      `	stw 2, 8(1)\n`;
++      `	stw 3, 12(1)\n`;
++      `	stw 4, 16(1)\n`;
++      `	stw 5, 20(1)\n`;
++      `	stw 6, 24(1)\n`;
++      `	stw 7, 28(1)\n`;
++      `	bl {emit_symbol "_mcount"}\n`;
++      `	lwz 2, 8(1)\n`;
++      `	lwz 3, 12(1)\n`;
++      `	lwz 4, 16(1)\n`;
++      `	lwz 5, 20(1)\n`;
++      `	lwz 6, 24(1)\n`;
++      `	lwz 7, 28(1)\n`;
++      `	addic 1, 1, 32\n`;
++  | _ -> () (*unsupported yet*)
 +
- /* Machine- and OS-dependent handling of stack overflow */
+ (* Emission of a function declaration *)
+ 
+ let fundecl fundecl =
+@@ -951,10 +975,11 @@
+       `	.csect	{emit_symbol fundecl.fun_name}[DS]\n`;
+       `{emit_symbol fundecl.fun_name}:\n`;
+       `	.long	.{emit_symbol fundecl.fun_name}, TOC[tc0], 0\n`
+-  | "elf" ->
++  | "elf" | "bsd" ->
+       `	.type	{emit_symbol fundecl.fun_name}, @function\n`
+   | _ -> ()
+   end;
++  if !Clflags.gprofile then emit_profile();
+   emit_string code_space;
+   `	.align	2\n`;
+   `{emit_codesymbol fundecl.fun_name}:\n`;
+@@ -996,7 +1021,7 @@
+ 
+ let declare_global_data s =
+   `	.globl	{emit_symbol s}\n`;
+-  if Config.system = "elf" then
++  if Config.system = "elf" || Config.system = "bsd" then
+     `	.type	{emit_symbol s}, @object\n`
  
- #ifdef HAS_STACK_OVERFLOW_DETECTION
+ let emit_item = function
diff --git a/lang/ocaml/patches/patch-ad b/lang/ocaml/patches/patch-ad
index 212d49dea92..39ee1b892d7 100644
--- a/lang/ocaml/patches/patch-ad
+++ b/lang/ocaml/patches/patch-ad
@@ -1,28 +1,22 @@
-$NetBSD: patch-ad,v 1.3 2003/07/10 07:44:02 jtb Exp $
+$NetBSD: patch-ad,v 1.4 2004/04/22 09:18:36 tron Exp $
 
---- configure.orig
-+++ configure
-@@ -528,6 +528,7 @@
-   rs6000-*-aix*)                arch=power; model=rs6000; system=aix;;
-   powerpc-*-aix*)               arch=power; model=ppc; system=aix;;
-   powerpc-*-linux*)             arch=power; model=ppc; system=elf;;
-+  powerpc-*-netbsd*)            arch=power; model=ppc; system=bsd;;
-   powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
-   powerpc-*-darwin*)            arch=power; model=ppc; system=rhapsody;;
-   arm*-*-linux*)                arch=arm; system=linux;;
-@@ -591,6 +592,7 @@
-   power,rs6000,aix) asflags='-u -m pwr -w'; asppflags="$asflags";;
-   power,ppc,aix)    asflags='-u -m ppc -w'; asppflags="$asflags";;
-   power,*,elf)      aspp='gcc'; asppflags='-c';;
-+  power,*,bsd)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-   power,*,rhapsody) ;;
-   arm,*,linux)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-   ia64,*,linux)     asflags=-xexplicit
-@@ -601,6 +603,7 @@
-   alpha,*,digital) profiling='prof';;
-   i386,*,linux_elf) profiling='prof';;
-   i386,*,bsd_elf) profiling='prof';;
-+  power,*,bsd) profiling='prof';;
-   *) profiling='noprof';;
- esac
+--- asmcomp/power/proc.ml.orig	Mon Jul 22 18:37:54 2002
++++ asmcomp/power/proc.ml	Thu Apr 22 10:34:38 2004
+@@ -190,7 +190,7 @@
+ let loc_external_arguments =
+   match Config.system with
+     "aix" | "rhapsody" -> poweropen_external_conventions 0 7 100 112
+-  | "elf" -> calling_conventions 0 7 100 107 outgoing 8
++  | "elf" | "bsd" -> calling_conventions 0 7 100 107 outgoing 8
+   | _ -> assert false
+ 
+ let extcall_use_push = false
+@@ -244,7 +244,7 @@
+       Ccomp.command ("as -u -m " ^ proc ^ " -o " ^ outfile ^ " " ^ infile)
+   | "elf" ->
+       Ccomp.command ("as -u -m ppc -o " ^ outfile ^ " " ^ infile)
+-  | "rhapsody" ->
++  | "rhapsody" | "bsd" ->
+       Ccomp.command ("as -o " ^ outfile ^ " " ^ infile)
+   | _ -> assert false
  
diff --git a/lang/ocaml/patches/patch-ae b/lang/ocaml/patches/patch-ae
index 1eae927ef72..814f9be7c16 100644
--- a/lang/ocaml/patches/patch-ae
+++ b/lang/ocaml/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2003/06/29 23:04:19 jtb Exp $
+$NetBSD: patch-ae,v 1.3 2004/04/22 09:18:36 tron Exp $
 
---- asmcomp/sparc/emit.mlp.orig
-+++ asmcomp/sparc/emit.mlp
+--- asmcomp/sparc/emit.mlp.orig	Mon Jul 22 18:37:55 2002
++++ asmcomp/sparc/emit.mlp	Thu Apr 22 10:34:37 2004
 @@ -57,11 +57,10 @@
    | {loc = Reg r; typ = Float} -> phys_reg (r + 16)
    | _ -> fatal_error "Emit.next_in_pair"
diff --git a/lang/ocaml/patches/patch-af b/lang/ocaml/patches/patch-af
index ab4d2e25354..f502c0adf06 100644
--- a/lang/ocaml/patches/patch-af
+++ b/lang/ocaml/patches/patch-af
@@ -1,16 +1,42 @@
-$NetBSD: patch-af,v 1.1 2003/06/23 20:15:18 jtb Exp $
+$NetBSD: patch-af,v 1.2 2004/04/22 09:18:36 tron Exp $
 
---- asmrun/sparc.S.orig
-+++ asmrun/sparc.S
-@@ -16,9 +16,9 @@
- /* Asm part of the runtime system for the Sparc processor.  */
- /* Must be preprocessed by cpp */
+--- asmrun/signals.c.orig	Mon May  6 14:02:26 2002
++++ asmrun/signals.c	Thu Apr 22 10:34:37 2004
+@@ -162,6 +162,8 @@
+ void handle_signal(int sig, struct sigcontext * context)
+ #elif defined(TARGET_power) && defined(SYS_rhapsody)
+ void handle_signal(int sig, int code, struct sigcontext * context)
++#elif defined(TARGET_power) && defined(SYS_bsd)
++void handle_signal(int sig, int code, struct sigcontext * context)
+ #else
+ void handle_signal(int sig)
+ #endif
+@@ -205,6 +207,10 @@
+       /* Cached in register 30 */
+       CONTEXT_GPR(context, 30) = (unsigned long) young_limit;
+ #endif
++#if defined(TARGET_power) && defined(SYS_bsd)
++      /* Cached in register 30 */
++      context->sc_frame.fixreg[30] = (unsigned long) young_limit;
++#endif
+     }
+   }
+ }
+@@ -442,6 +448,17 @@
+   array_bound_error();
+ }
+ #endif
++
++#if defined(TARGET_power) && defined(SYS_bsd)
++static void trap_handler(int sig, int code, struct sigcontext * context)
++{
++  /* Recover young_ptr and caml_exception_pointer from registers 31 and 29 */
++  caml_exception_pointer = (char *) context->sc_frame.fixreg[29];
++  young_ptr = (char *) context->sc_frame.fixreg[31];
++  array_bound_error();
++}
++#endif
++
  
--/* SunOS 4 and BSD prefix identifiers with _, Solaris and Linux do not */
-+/* SunOS 4 prefixes identifiers with _ */
- 
--#if defined(SYS_sunos) || defined(SYS_bsd)
-+#if defined(SYS_sunos)
- 
-         .common _caml_required_size, 4, "bss"
+ /* Machine- and OS-dependent handling of stack overflow */
  
diff --git a/lang/ocaml/patches/patch-ag b/lang/ocaml/patches/patch-ag
index 82467122865..658b5ec1bea 100644
--- a/lang/ocaml/patches/patch-ag
+++ b/lang/ocaml/patches/patch-ag
@@ -1,12 +1,16 @@
-$NetBSD: patch-ag,v 1.1 2003/06/29 23:04:19 jtb Exp $
+$NetBSD: patch-ag,v 1.2 2004/04/22 09:18:36 tron Exp $
 
---- asmcomp/power/arch.ml.orig
-+++ asmcomp/power/arch.ml
-@@ -91,6 +91,5 @@
- let toc =
-   match Config.system with
-   | "aix" -> true
--  | "elf" -> false
--  | "rhapsody" -> false
-+  | "elf" | "rhapsody" | "bsd" -> false
-   | _ -> Misc.fatal_error "wrong $(SYSTEM)"
+--- asmrun/sparc.S.orig	Fri Feb  8 17:55:33 2002
++++ asmrun/sparc.S	Thu Apr 22 10:34:38 2004
+@@ -16,9 +16,9 @@
+ /* Asm part of the runtime system for the Sparc processor.  */
+ /* Must be preprocessed by cpp */
+ 
+-/* SunOS 4 and BSD prefix identifiers with _, Solaris and Linux do not */
++/* SunOS 4 prefixes identifiers with _ */
+ 
+-#if defined(SYS_sunos) || defined(SYS_bsd)
++#if defined(SYS_sunos)
+ 
+         .common _caml_required_size, 4, "bss"
+ 
diff --git a/lang/ocaml/patches/patch-ah b/lang/ocaml/patches/patch-ah
index 7b13e9d69b6..78db89e7716 100644
--- a/lang/ocaml/patches/patch-ah
+++ b/lang/ocaml/patches/patch-ah
@@ -1,118 +1,101 @@
-$NetBSD: patch-ah,v 1.3 2003/07/11 07:47:44 jtb Exp $
+$NetBSD: patch-ah,v 1.4 2004/04/22 09:18:36 tron Exp $
 
---- asmcomp/power/emit.mlp.orig
-+++ asmcomp/power/emit.mlp
-@@ -65,7 +65,7 @@
+--- asmrun/power-bsd.S.orig	Thu Apr 22 10:34:28 2004
++++ asmrun/power-bsd.S	Thu Apr 22 10:34:38 2004
+@@ -13,6 +13,35 @@
  
- let emit_symbol =
-   match Config.system with
--    "aix" | "elf" -> (fun s -> Emitaux.emit_symbol '.' s)
-+    "aix" | "elf" | "bsd" -> (fun s -> Emitaux.emit_symbol '.' s)
-   | "rhapsody"    -> (fun s -> emit_char '_'; Emitaux.emit_symbol '$' s)
-   | _ -> assert false
+ /* $Id: patch-ah,v 1.4 2004/04/22 09:18:36 tron Exp $ */
  
-@@ -78,7 +78,7 @@
- let label_prefix =
-   match Config.system with
-     "aix" -> "L.."
--  | "elf" -> ".L"
-+  | "elf" | "bsd" -> ".L"
-   | "rhapsody" -> "L"
-   | _ -> assert false
- 
-@@ -90,21 +90,21 @@
- let data_space =
-   match Config.system with
-     "aix" -> "	.csect  .data[RW]\n"
--  | "elf" -> "	.section \".data\"\n"
-+  | "elf" | "bsd" -> "	.section \".data\"\n"
-   | "rhapsody" -> "	.data\n"
-   | _ -> assert false
- 
- let code_space =
-   match Config.system with
-     "aix" -> "	.csect  .text[PR]\n"
--  | "elf" -> "	.section \".text\"\n"
-+  | "elf" | "bsd" -> "	.section \".text\"\n"
-   | "rhapsody" -> "	.text\n"
-   | _ -> assert false
- 
- let rodata_space =
-   match Config.system with
-     "aix" -> "	.csect  .data[RW]\n" (* ?? *)
--  | "elf" -> "	.section \".rodata\"\n"
-+  | "elf" | "bsd" -> "	.section \".rodata\"\n"
-   | "rhapsody" -> "	.const\n"
-   | _ -> assert false
- 
-@@ -157,7 +157,7 @@
- 
- let emit_upper emit_fun arg =
-   match Config.system with
--    "elf" ->
-+    "elf" | "bsd" ->
-       emit_fun arg; emit_string "@ha"
-   | "rhapsody" ->
-       emit_string "ha16("; emit_fun arg; emit_string ")"
-@@ -165,7 +165,7 @@
- 
- let emit_lower emit_fun arg =
-   match Config.system with
--    "elf" ->
-+    "elf" | "bsd" ->
-       emit_fun arg; emit_string "@l"
-   | "rhapsody" ->
-       emit_string "lo16("; emit_fun arg; emit_string ")"
-@@ -935,6 +935,30 @@
-       emit_instr i None;
-       emit_all i.next
- 
-+(* Emission of the profiling prelude *)
++#if defined(PROFILING)
++#define PROFILE_CAML \
++        stwu 1, -32(1) \
++        mflr 0 \
++        stw 0, 4(1) \
++        stw 2, 8(1) \
++        stw 3, 12(1) \
++        stw 4, 16(1) \
++        stw 5, 20(1) \
++        stw 6, 24(1) \
++        stw 7, 28(1) \
++        bl _mcount \
++        lwz 2, 8(1) \
++        lwz 3, 12(1) \
++        lwz 4, 16(1) \
++        lwz 5, 20(1) \
++        lwz 6, 24(1) \
++        lwz 7, 28(1) \
++        addic 1, 1, 32
 +
-+let emit_profile () =
-+  match Config.system with
-+    "bsd" ->
-+      `	stwu 1, -32(1)\n`;
-+      `	mflr 0\n`;
-+      `	stw 0, 4(1)\n`;
-+      `	stw 2, 8(1)\n`;
-+      `	stw 3, 12(1)\n`;
-+      `	stw 4, 16(1)\n`;
-+      `	stw 5, 20(1)\n`;
-+      `	stw 6, 24(1)\n`;
-+      `	stw 7, 28(1)\n`;
-+      `	bl {emit_symbol "_mcount"}\n`;
-+      `	lwz 2, 8(1)\n`;
-+      `	lwz 3, 12(1)\n`;
-+      `	lwz 4, 16(1)\n`;
-+      `	lwz 5, 20(1)\n`;
-+      `	lwz 6, 24(1)\n`;
-+      `	lwz 7, 28(1)\n`;
-+      `	addic 1, 1, 32\n`;
-+  | _ -> () (*unsupported yet*)
++#define PROFILE_C \
++        mflr 0 \
++        stw 0, 4(1) \
++        bl _mcount
++#else
++#define PROFILE_CAML
++#define PROFILE_C
++#endif
 +
- (* Emission of a function declaration *)
- 
- let fundecl fundecl =
-@@ -951,10 +975,11 @@
-       `	.csect	{emit_symbol fundecl.fun_name}[DS]\n`;
-       `{emit_symbol fundecl.fun_name}:\n`;
-       `	.long	.{emit_symbol fundecl.fun_name}, TOC[tc0], 0\n`
--  | "elf" ->
-+  | "elf" | "bsd" ->
-       `	.type	{emit_symbol fundecl.fun_name}, @function\n`
-   | _ -> ()
-   end;
-+  if !Clflags.gprofile then emit_profile();
-   emit_string code_space;
-   `	.align	2\n`;
-   `{emit_codesymbol fundecl.fun_name}:\n`;
-@@ -996,7 +1021,7 @@
- 
- let declare_global_data s =
-   `	.globl	{emit_symbol s}\n`;
--  if Config.system = "elf" then
-+  if Config.system = "elf" || Config.system = "bsd" then
-     `	.type	{emit_symbol s}, @object\n`
+ #define Addrglobal(reg,glob) \
+         addis   reg, 0, glob@ha; \
+         addi    reg, reg, glob@l
+@@ -30,6 +59,7 @@
+         .globl  caml_call_gc
+         .type   caml_call_gc, @function
+ caml_call_gc:
++        PROFILE_CAML
+     /* Set up stack frame */
+         stwu    1, -0x1A0(1)
+     /* 0x1A0 = 4*32 (int regs) + 8*32 (float regs) + 32 (space for C call) */
+@@ -182,6 +212,7 @@
+         .globl  caml_c_call
+         .type   caml_c_call, @function
+ caml_c_call:
++        PROFILE_CAML
+     /* Save return address */
+         mflr    25
+     /* Get ready to call C function (address in 11) */
+@@ -210,6 +241,7 @@
+         .globl  raise_caml_exception
+         .type   raise_caml_exception, @function
+ raise_caml_exception:
++        PROFILE_C
+     /* Reload Caml global registers */
+         Loadglobal(1, caml_exception_pointer, 11)
+         Loadglobal(31, young_ptr, 11)
+@@ -230,6 +262,7 @@
+         .globl  caml_start_program
+         .type   caml_start_program, @function
+ caml_start_program:
++        PROFILE_C
+         Addrglobal(12, caml_program)
  
- let emit_item = function
+ /* Code shared between caml_start_program and callback */
+@@ -380,6 +413,7 @@
+         .globl  callback_exn
+         .type   callback_exn, @function
+ callback_exn:
++        PROFILE_C
+     /* Initial shuffling of arguments */
+         mr      0, 3            /* Closure */
+         mr      3, 4            /* Argument */
+@@ -390,6 +424,7 @@
+         .globl  callback2_exn
+         .type   callback2_exn, @function
+ callback2_exn:
++        PROFILE_C
+         mr      0, 3            /* Closure */
+         mr      3, 4            /* First argument */
+         mr      4, 5            /* Second argument */
+@@ -400,6 +435,7 @@
+         .globl  callback3_exn
+         .type   callback3_exn, @function
+ callback3_exn:
++        PROFILE_C
+         mr      0, 3            /* Closure */
+         mr      3, 4            /* First argument */
+         mr      4, 5            /* Second argument */
+@@ -418,4 +454,3 @@
+         .long   .L105 + 4       /* return address into callback */
+         .short  -1              /* negative size count => use callback link */
+         .short  0               /* no roots here */
+-
diff --git a/lang/ocaml/patches/patch-ai b/lang/ocaml/patches/patch-ai
index bfc6c21d185..55de5f28fd7 100644
--- a/lang/ocaml/patches/patch-ai
+++ b/lang/ocaml/patches/patch-ai
@@ -1,22 +1,17 @@
-$NetBSD: patch-ai,v 1.1 2003/06/29 23:04:19 jtb Exp $
+$NetBSD: patch-ai,v 1.2 2004/04/22 09:18:36 tron Exp $
 
---- asmcomp/power/proc.ml.orig
-+++ asmcomp/power/proc.ml
-@@ -190,7 +190,7 @@
- let loc_external_arguments =
-   match Config.system with
-     "aix" | "rhapsody" -> poweropen_external_conventions 0 7 100 112
--  | "elf" -> calling_conventions 0 7 100 107 outgoing 8
-+  | "elf" | "bsd" -> calling_conventions 0 7 100 107 outgoing 8
-   | _ -> assert false
- 
- let extcall_use_push = false
-@@ -244,7 +244,7 @@
-       Ccomp.command ("as -u -m " ^ proc ^ " -o " ^ outfile ^ " " ^ infile)
-   | "elf" ->
-       Ccomp.command ("as -u -m ppc -o " ^ outfile ^ " " ^ infile)
--  | "rhapsody" ->
-+  | "rhapsody" | "bsd" ->
-       Ccomp.command ("as -o " ^ outfile ^ " " ^ infile)
-   | _ -> assert false
- 
+--- asmrun/i386.S.orig	Fri Jun  7 11:49:36 2002
++++ asmrun/i386.S	Thu Apr 22 10:34:38 2004
+@@ -53,10 +53,10 @@
+ #elif defined(SYS_bsd_elf)
+ #define PROFILE_CAML \
+         pushl %ebp; movl %esp, %ebp; pushl %eax; pushl %ecx; pushl %edx; \
+-        call .mcount; \
++        call __mcount; \
+         popl %edx; popl %ecx; popl %eax; popl %ebp
+ #define PROFILE_C \
+-        pushl %ebp; movl %esp, %ebp; call .mcount; popl %ebp
++        pushl %ebp; movl %esp, %ebp; call __mcount; popl %ebp
+ #endif
+ #else
+ #define PROFILE_CAML
diff --git a/lang/ocaml/patches/patch-aj b/lang/ocaml/patches/patch-aj
index 91510225d45..17834af6dc5 100644
--- a/lang/ocaml/patches/patch-aj
+++ b/lang/ocaml/patches/patch-aj
@@ -1,101 +1,18 @@
-$NetBSD: patch-aj,v 1.2 2003/07/11 07:47:44 jtb Exp $
+$NetBSD: patch-aj,v 1.3 2004/04/22 09:18:37 tron Exp $
 
---- asmrun/power-bsd.S.orig
-+++ asmrun/power-bsd.S
-@@ -13,6 +13,35 @@
+--- byterun/Makefile.orig	Thu Apr 18 09:27:36 2002
++++ byterun/Makefile	Thu Apr 22 10:34:37 2004
+@@ -48,10 +48,10 @@
+ 	          prims.o libcamlrund.a $(BYTECCLIBS)
  
- /* $Id: patch-aj,v 1.2 2003/07/11 07:47:44 jtb Exp $ */
- 
-+#if defined(PROFILING)
-+#define PROFILE_CAML \
-+        stwu 1, -32(1) \
-+        mflr 0 \
-+        stw 0, 4(1) \
-+        stw 2, 8(1) \
-+        stw 3, 12(1) \
-+        stw 4, 16(1) \
-+        stw 5, 20(1) \
-+        stw 6, 24(1) \
-+        stw 7, 28(1) \
-+        bl _mcount \
-+        lwz 2, 8(1) \
-+        lwz 3, 12(1) \
-+        lwz 4, 16(1) \
-+        lwz 5, 20(1) \
-+        lwz 6, 24(1) \
-+        lwz 7, 28(1) \
-+        addic 1, 1, 32
-+
-+#define PROFILE_C \
-+        mflr 0 \
-+        stw 0, 4(1) \
-+        bl _mcount
-+#else
-+#define PROFILE_CAML
-+#define PROFILE_C
-+#endif
-+
- #define Addrglobal(reg,glob) \
-         addis   reg, 0, glob@ha; \
-         addi    reg, reg, glob@l
-@@ -30,6 +59,7 @@
-         .globl  caml_call_gc
-         .type   caml_call_gc, @function
- caml_call_gc:
-+        PROFILE_CAML
-     /* Set up stack frame */
-         stwu    1, -0x1A0(1)
-     /* 0x1A0 = 4*32 (int regs) + 8*32 (float regs) + 32 (space for C call) */
-@@ -182,6 +212,7 @@
-         .globl  caml_c_call
-         .type   caml_c_call, @function
- caml_c_call:
-+        PROFILE_CAML
-     /* Save return address */
-         mflr    25
-     /* Get ready to call C function (address in 11) */
-@@ -210,6 +241,7 @@
-         .globl  raise_caml_exception
-         .type   raise_caml_exception, @function
- raise_caml_exception:
-+        PROFILE_C
-     /* Reload Caml global registers */
-         Loadglobal(1, caml_exception_pointer, 11)
-         Loadglobal(31, young_ptr, 11)
-@@ -230,6 +262,7 @@
-         .globl  caml_start_program
-         .type   caml_start_program, @function
- caml_start_program:
-+        PROFILE_C
-         Addrglobal(12, caml_program)
- 
- /* Code shared between caml_start_program and callback */
-@@ -380,6 +413,7 @@
-         .globl  callback_exn
-         .type   callback_exn, @function
- callback_exn:
-+        PROFILE_C
-     /* Initial shuffling of arguments */
-         mr      0, 3            /* Closure */
-         mr      3, 4            /* Argument */
-@@ -390,6 +424,7 @@
-         .globl  callback2_exn
-         .type   callback2_exn, @function
- callback2_exn:
-+        PROFILE_C
-         mr      0, 3            /* Closure */
-         mr      3, 4            /* First argument */
-         mr      4, 5            /* Second argument */
-@@ -400,6 +435,7 @@
-         .globl  callback3_exn
-         .type   callback3_exn, @function
- callback3_exn:
-+        PROFILE_C
-         mr      0, 3            /* Closure */
-         mr      3, 4            /* First argument */
-         mr      4, 5            /* Second argument */
-@@ -418,4 +454,3 @@
-         .long   .L105 + 4       /* return address into callback */
-         .short  -1              /* negative size count => use callback link */
-         .short  0               /* no roots here */
--
+ 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
diff --git a/lang/ocaml/patches/patch-ak b/lang/ocaml/patches/patch-ak
index a3395b5159e..f7e0bb7c5c7 100644
--- a/lang/ocaml/patches/patch-ak
+++ b/lang/ocaml/patches/patch-ak
@@ -1,13 +1,27 @@
-$NetBSD: patch-ak,v 1.1 2003/07/10 07:44:02 jtb Exp $
+$NetBSD: patch-ak,v 1.2 2004/04/22 09:18:37 tron Exp $
 
---- asmcomp/i386/emit.mlp.orig
-+++ asmcomp/i386/emit.mlp
-@@ -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`
+--- camlp4/etc/Makefile.orig	Fri Jul 19 16:53:45 2002
++++ camlp4/etc/Makefile	Thu Apr 22 10:34:37 2004
+@@ -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/.
++	${BSD_INSTALL_DATA} lib.sml $(LIBDIR)/camlp4/.
++	${BSD_INSTALL_SCRIPT} camlp4o$(EXE) $(BINDIR)/.
++	if test -f $(COPT); then ${BSD_INSTALL_PROGRAM} $(COPT) $(BINDIR)/.; fi
++	${BSD_INSTALL_SCRIPT} mkcamlp4.sh $(BINDIR)/mkcamlp4
+ 
+ pa_lisp.cmo: pa_lispr.cmo
+ pa_ocamllex.cmo: pa_o.cmo
diff --git a/lang/ocaml/patches/patch-al b/lang/ocaml/patches/patch-al
index 55f4ec90911..4fabf5e248d 100644
--- a/lang/ocaml/patches/patch-al
+++ b/lang/ocaml/patches/patch-al
@@ -1,17 +1,30 @@
-$NetBSD: patch-al,v 1.2 2003/07/10 12:28:55 jtb Exp $
+$NetBSD: patch-al,v 1.3 2004/04/22 09:18:37 tron Exp $
 
---- asmrun/i386.S.orig
-+++ asmrun/i386.S
-@@ -53,10 +53,10 @@
- #elif defined(SYS_bsd_elf)
- #define PROFILE_CAML \
-         pushl %ebp; movl %esp, %ebp; pushl %eax; pushl %ecx; pushl %edx; \
--        call .mcount; \
-+        call __mcount; \
-         popl %edx; popl %ecx; popl %eax; popl %ebp
- #define PROFILE_C \
--        pushl %ebp; movl %esp, %ebp; call .mcount; popl %ebp
-+        pushl %ebp; movl %esp, %ebp; call __mcount; popl %ebp
- #endif
- #else
- #define PROFILE_CAML
+--- camlp4/camlp4/Makefile.orig	Mon Aug  5 15:50:25 2002
++++ camlp4/camlp4/Makefile	Thu Apr 22 10:34:37 2004
+@@ -62,11 +62,19 @@
+ 	done
+ 
+ install:
+-	-$(MKDIR) $(BINDIR)
+-	-$(MKDIR) $(LIBDIR)/camlp4
+-	cp $(CAMLP4) $(BINDIR)/.
+-	cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli $(LIBDIR)/camlp4/.
+-	cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi $(LIBDIR)/camlp4/.
+-	cp camlp4.cma $(LIBDIR)/camlp4/.
++	-${BSD_INSTALL_PROGRAM_DIR} $(BINDIR)
++	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
++	${BSD_INSTALL_SCRIPT} $(CAMLP4) $(BINDIR)/.
++	${BSD_INSTALL_DATA} mLast.mli $(LIBDIR)/camlp4/
++	${BSD_INSTALL_DATA} quotation.mli $(LIBDIR)/camlp4/
++	${BSD_INSTALL_DATA} ast2pt.mli $(LIBDIR)/camlp4/
++	${BSD_INSTALL_DATA} pcaml.mli $(LIBDIR)/camlp4/
++	${BSD_INSTALL_DATA} spretty.mli $(LIBDIR)/camlp4/
++	${BSD_INSTALL_DATA} mLast.cmi $(LIBDIR)/camlp4/
++	${BSD_INSTALL_DATA} quotation.cmi $(LIBDIR)/camlp4/
++	${BSD_INSTALL_DATA} ast2pt.cmi $(LIBDIR)/camlp4/
++	${BSD_INSTALL_DATA} pcaml.cmi $(LIBDIR)/camlp4/
++	${BSD_INSTALL_DATA} spretty.cmi $(LIBDIR)/camlp4/
++	${BSD_INSTALL_DATA} camlp4.cma $(LIBDIR)/camlp4/
+ 
+ include .depend
diff --git a/lang/ocaml/patches/patch-am b/lang/ocaml/patches/patch-am
index f71583ef247..c0f709183d1 100644
--- a/lang/ocaml/patches/patch-am
+++ b/lang/ocaml/patches/patch-am
@@ -1,17 +1,25 @@
-$NetBSD: patch-am,v 1.1 2004/03/04 06:27:45 minskim Exp $
+$NetBSD: patch-am,v 1.2 2004/04/22 09:18:37 tron Exp $
 
---- otherlibs/labltk/support/cltkImg.c.orig	2002-07-23 09:11:59.000000000 -0500
-+++ otherlibs/labltk/support/cltkImg.c
-@@ -99,7 +99,11 @@ camltk_setimgdata_native (value imgname,
-   pib.offset[0] = 0;
-   pib.offset[1] = 1;
-   pib.offset[2] = 2;
--  Tk_PhotoPutBlock(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)); 
-+  Tk_PhotoPutBlock(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
-+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
-+                   , TK_PHOTO_COMPOSITE_SET
-+#endif
-+    ); 
- }
+--- camlp4/lib/Makefile.orig	Fri Jul 19 16:53:47 2002
++++ camlp4/lib/Makefile	Thu Apr 22 10:34:37 2004
+@@ -36,15 +36,15 @@
+ 	done
  
- CAMLprim void camltk_setimgdata_bytecode(argv,argn)
+ install:
+-	-$(MKDIR) $(LIBDIR)/camlp4
+-	cp $(TARGET) *.mli $(LIBDIR)/camlp4/.
+-	cp *.cmi $(LIBDIR)/camlp4/.
++	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
++	${BSD_INSTALL_DATA} $(TARGET) *.mli $(LIBDIR)/camlp4/.
++	${BSD_INSTALL_DATA} *.cmi $(LIBDIR)/camlp4/.
+ 	if test -f $(TARGET:.cma=.cmxa); then $(MAKE) installopt LIBDIR=$(LIBDIR); fi
+ 
+ installopt:
+-	cp $(TARGET:.cma=.cmxa) *.cmx $(LIBDIR)/camlp4/.
++	${BSD_INSTALL_DATA} $(TARGET:.cma=.cmxa) *.cmx $(LIBDIR)/camlp4/.
+ 	if test -f $(TARGET:.cma=.lib); then \
+-	  cp $(TARGET:.cma=.lib) $(LIBDIR)/camlp4/.; \
++	  ${BSD_INSTALL_DATA} $(TARGET:.cma=.lib) $(LIBDIR)/camlp4/.; \
+ 	else \
+ 	  tar cf - $(TARGET:.cma=.a) | (cd $(LIBDIR)/camlp4/.; tar xf -); \
+ 	fi
diff --git a/lang/ocaml/patches/patch-an b/lang/ocaml/patches/patch-an
new file mode 100644
index 00000000000..9df4d46b84f
--- /dev/null
+++ b/lang/ocaml/patches/patch-an
@@ -0,0 +1,15 @@
+$NetBSD: patch-an,v 1.1 2004/04/22 09:18:38 tron Exp $
+
+--- camlp4/man/Makefile.orig	Fri Jul 19 16:53:49 2002
++++ camlp4/man/Makefile	Thu Apr 22 10:34:37 2004
+@@ -14,8 +14,8 @@
+ get_promote:
+ 
+ install:
+-	-$(MKDIR) $(MANDIR)/man1
+-	-cp $(TARGET) $(MANDIR)/man1/.
++	-${BSD_INSTALL_MAN_DIR} $(MANDIR)/man1
++	-${BSD_INSTALL_MAN} $(TARGET) $(MANDIR)/man1/.
+ 	-cd $(MANDIR)/man1; rm -f camlp4o.1; ln -s $(TARGET) camlp4o.1
+ 	-cd $(MANDIR)/man1; rm -f camlp4r.1; ln -s $(TARGET) camlp4r.1
+ 	-cd $(MANDIR)/man1; rm -f mkcamlp4.1; ln -s $(TARGET) mkcamlp4.1
diff --git a/lang/ocaml/patches/patch-ao b/lang/ocaml/patches/patch-ao
index dc3803b47e4..bdba1553373 100644
--- a/lang/ocaml/patches/patch-ao
+++ b/lang/ocaml/patches/patch-ao
@@ -1,17 +1,20 @@
-$NetBSD: patch-ao,v 1.1 2004/03/04 06:27:45 minskim Exp $
+$NetBSD: patch-ao,v 1.2 2004/04/22 09:18:38 tron Exp $
 
---- otherlibs/labltk/tkanim/tkAnimGIF.c.orig	2002-07-23 09:12:00.000000000 -0500
-+++ otherlibs/labltk/tkanim/tkAnimGIF.c
-@@ -336,7 +336,11 @@ FileReadGIF(interp, f, fileName, formatS
-             }
-         }
-         Tk_PhotoPutBlock(photoHandle, &block, 0, 0, 
--                         imageWidth, imageHeight);
-+                         imageWidth, imageHeight
-+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
-+                   , TK_PHOTO_COMPOSITE_SET
-+#endif
-+          );
- #ifdef TKANIM_DEBUG
-     fprintf(stderr, " Retrieving result\n");
- #endif
+--- camlp4/meta/Makefile.orig	Fri Jul 19 16:53:49 2002
++++ camlp4/meta/Makefile	Thu Apr 22 10:34:37 2004
+@@ -42,10 +42,11 @@
+ 	done
+ 
+ install:
+-	-$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
+-	cp $(OBJS) $(LIBDIR)/camlp4/.
+-	cp pa_ifdef.cmi pa_extend.cmi $(LIBDIR)/camlp4/.
+-	cp camlp4r$(EXE) $(BINDIR)/.
++	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
++	-${BSD_INSTALL_PROGRAM_DIR}  $(BINDIR)
++	${BSD_INSTALL_DATA} $(OBJS) $(LIBDIR)/camlp4/.
++	${BSD_INSTALL_DATA} pa_ifdef.cmi pa_extend.cmi $(LIBDIR)/camlp4/.
++	${BSD_INSTALL_SCRIPT} camlp4r$(EXE) $(BINDIR)/.
+ 	if test -f $(COPT); then cp $(COPT) $(BINDIR)/.; fi
+ 
+ include .depend
diff --git a/lang/ocaml/patches/patch-ap b/lang/ocaml/patches/patch-ap
new file mode 100644
index 00000000000..4f92706076c
--- /dev/null
+++ b/lang/ocaml/patches/patch-ap
@@ -0,0 +1,17 @@
+$NetBSD: patch-ap,v 1.1 2004/04/22 09:18:38 tron Exp $
+
+--- camlp4/ocpp/Makefile.orig	Sun Jan 20 16:12:28 2002
++++ camlp4/ocpp/Makefile	Thu Apr 22 10:34:37 2004
+@@ -24,8 +24,9 @@
+ 	rm -f *.cm[ioa] *.pp[io] *.o *.out *.bak .*.bak crc.ml ocpp$(EXE)
+ 
+ install:
+-	-$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
+-	cp $(OBJS) $(LIBDIR)/camlp4/.
+-	cp ocpp$(EXE) $(BINDIR)/.
++	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
++	-${BSD_INSTALL_PROGRAM_DIR}  $(BINDIR)
++	${BSD_INSTALL_DATA} $(OBJS) $(LIBDIR)/camlp4/.
++	${BSD_INSTALL_SCRIPT} ocpp$(EXE) $(BINDIR)/.
+ 
+ depend:
diff --git a/lang/ocaml/patches/patch-aq b/lang/ocaml/patches/patch-aq
new file mode 100644
index 00000000000..a1f19046c79
--- /dev/null
+++ b/lang/ocaml/patches/patch-aq
@@ -0,0 +1,15 @@
+$NetBSD: patch-aq,v 1.1 2004/04/22 09:18:38 tron Exp $
+
+--- camlp4/odyl/Makefile.orig	Fri Jul 19 16:53:56 2002
++++ camlp4/odyl/Makefile	Thu Apr 22 10:34:37 2004
+@@ -51,7 +51,8 @@
+ compare:
+ 
+ install:
+-	-$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR)
+-	cp odyl.cmo odyl.cma $(LIBDIR)/camlp4/.
++	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
++	-${BSD_INSTALL_DATA_DIR}  $(BINDIR)
++	${BSD_INSTALL_DATA} odyl.cmo odyl.cma $(LIBDIR)/camlp4/.
+ 
+ include .depend
diff --git a/lang/ocaml/patches/patch-ar b/lang/ocaml/patches/patch-ar
new file mode 100644
index 00000000000..6bbe7ad9fe6
--- /dev/null
+++ b/lang/ocaml/patches/patch-ar
@@ -0,0 +1,16 @@
+$NetBSD: patch-ar,v 1.1 2004/04/22 09:18:38 tron Exp $
+
+--- camlp4/top/Makefile.orig	Fri Jul 19 16:53:56 2002
++++ camlp4/top/Makefile	Thu Apr 22 10:34:37 2004
+@@ -42,7 +42,9 @@
+ get_promote:
+ 
+ install:
+-	-$(MKDIR) $(LIBDIR)/camlp4
+-	cp $(TARGET) $(LIBDIR)/camlp4/.
++	-${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
++	for i in $(TARGET); do	\
++		${BSD_INSTALL_DATA} $$i $(LIBDIR)/camlp4/ ; \
++	done
+ 
+ include .depend
diff --git a/lang/ocaml/patches/patch-as b/lang/ocaml/patches/patch-as
new file mode 100644
index 00000000000..b2e614c5df1
--- /dev/null
+++ b/lang/ocaml/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2004/04/22 09:18:38 tron Exp $
+
+--- config/gnu/config.sub.orig	Mon Jun 25 16:04:51 2001
++++ config/gnu/config.sub	Thu Apr 22 10:34:37 2004
+@@ -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.
diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at
new file mode 100644
index 00000000000..ea6b6d22145
--- /dev/null
+++ b/lang/ocaml/patches/patch-at
@@ -0,0 +1,28 @@
+$NetBSD: patch-at,v 1.1 2004/04/22 09:18:39 tron Exp $
+
+--- configure.orig	Wed Aug  7 14:45:00 2002
++++ configure	Thu Apr 22 10:34:37 2004
+@@ -528,6 +528,7 @@
+   rs6000-*-aix*)                arch=power; model=rs6000; system=aix;;
+   powerpc-*-aix*)               arch=power; model=ppc; system=aix;;
+   powerpc-*-linux*)             arch=power; model=ppc; system=elf;;
++  powerpc-*-netbsd*)            arch=power; model=ppc; system=bsd;;
+   powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
+   powerpc-*-darwin*)            arch=power; model=ppc; system=rhapsody;;
+   arm*-*-linux*)                arch=arm; system=linux;;
+@@ -591,6 +592,7 @@
+   power,rs6000,aix) asflags='-u -m pwr -w'; asppflags="$asflags";;
+   power,ppc,aix)    asflags='-u -m ppc -w'; asppflags="$asflags";;
+   power,*,elf)      aspp='gcc'; asppflags='-c';;
++  power,*,bsd)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
+   power,*,rhapsody) ;;
+   arm,*,linux)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
+   ia64,*,linux)     asflags=-xexplicit
+@@ -601,6 +603,7 @@
+   alpha,*,digital) profiling='prof';;
+   i386,*,linux_elf) profiling='prof';;
+   i386,*,bsd_elf) profiling='prof';;
++  power,*,bsd) profiling='prof';;
+   *) profiling='noprof';;
+ esac
+ 
diff --git a/lang/ocaml/patches/patch-au b/lang/ocaml/patches/patch-au
new file mode 100644
index 00000000000..c40ff48c566
--- /dev/null
+++ b/lang/ocaml/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1 2004/04/22 09:18:39 tron Exp $
+
+--- debugger/Makefile.orig	Sat Apr 27 16:45:32 2002
++++ debugger/Makefile	Thu Apr 22 10:34:37 2004
+@@ -79,7 +79,7 @@
+ 	$(CAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) $(OTHEROBJS) $(OBJS)
+ 
+ install:
+-	cp ocamldebug$(EXE) $(BINDIR)/ocamldebug$(EXE)
++	${BSD_INSTALL_PROGRAM} ocamldebug$(EXE) $(BINDIR)/ocamldebug$(EXE)
+ 
+ clean::
+ 	rm -f ocamldebug$(EXE)
diff --git a/lang/ocaml/patches/patch-av b/lang/ocaml/patches/patch-av
new file mode 100644
index 00000000000..610f1723ef8
--- /dev/null
+++ b/lang/ocaml/patches/patch-av
@@ -0,0 +1,12 @@
+$NetBSD: patch-av,v 1.1 2004/04/22 09:18:40 tron Exp $
+
+--- man/Makefile.orig	Wed Apr 24 11:09:35 2002
++++ man/Makefile	Thu Apr 22 10:34:37 2004
+@@ -17,6 +17,6 @@
+ DIR=$(MANDIR)/man$(MANEXT)
+ 
+ install:
+-	for i in *.m; do cp $$i $(DIR)/`basename $$i .m`.$(MANEXT); done
++	for i in *.m; do ${BSD_INSTALL_MAN} $$i $(DIR)/`basename $$i .m`.$(MANEXT); done
+ 	echo '.so man$(MANEXT)/ocamlc.$(MANEXT)' > $(DIR)/ocamlc.opt.$(MANEXT)
+ 	echo '.so man$(MANEXT)/ocamlopt.$(MANEXT)' > $(DIR)/ocamlopt.opt.$(MANEXT)
diff --git a/lang/ocaml/patches/patch-aw b/lang/ocaml/patches/patch-aw
new file mode 100644
index 00000000000..932f20cfadd
--- /dev/null
+++ b/lang/ocaml/patches/patch-aw
@@ -0,0 +1,40 @@
+$NetBSD: patch-aw,v 1.1 2004/04/22 09:18:40 tron Exp $
+
+--- ocamldoc/Makefile.orig	Mon Aug 19 15:28:20 2002
++++ ocamldoc/Makefile	Thu Apr 22 10:34:37 2004
+@@ -272,23 +272,23 @@
+ # Installation targets
+ ######################
+ install: dummy
+-	if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi
+-	if test -d $(INSTALL_LIBDIR); then : ; else $(MKDIR) $(INSTALL_LIBDIR); fi
+-	$(CP) $(OCAMLDOC) $(INSTALL_BINDIR)
+-	$(CP) ocamldoc.sty ocamldoc.hva *.cmi $(GENERATORS) $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
+-	$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
+-	if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
+-	$(CP) stdlib_man/* $(INSTALL_MANODIR)
++	if test -d $(INSTALL_BINDIR); then : ; else ${BSD_INSTALL_PROGRAM_DIR} $(INSTALL_BINDIR); fi
++	if test -d $(INSTALL_LIBDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALL_LIBDIR); fi
++	${BSD_INSTALL_PROGRAM} $(OCAMLDOC) $(INSTALL_BINDIR)
++	${BSD_INSTALL_DATA} ocamldoc.sty ocamldoc.hva *.cmi $(GENERATORS) $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
++	${BSD_INSTALL_DATA} $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
++	if test -d $(INSTALL_MANODIR); then : ; else ${BSD_INSTALL_MAN_DIR} $(INSTALL_MANODIR); fi
++	${BSD_INSTALL_MAN} stdlib_man/* $(INSTALL_MANODIR)
+ 
+ installopt:
+ 	if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi
+ 
+ installopt_really:
+-	if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi
+-	if test -d $(INSTALL_LIBDIR); then : ; else $(MKDIR) $(INSTALL_LIBDIR); fi
+-	$(CP) $(OCAMLDOC_OPT) $(INSTALL_BINDIR)
+-	$(CP) ocamldoc.sty ocamldoc.hva $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) $(INSTALL_LIBDIR)
+-	$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
++	if test -d $(INSTALL_BINDIR); then : ; else ${BSD_INSTALL_PROGRAM_DIR} $(INSTALL_BINDIR); fi
++	if test -d $(INSTALL_LIBDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALL_LIBDIR); fi
++	${BSD_INSTALL_PROGRAM} $(OCAMLDOC_OPT) $(INSTALL_BINDIR)
++	${BSD_INSTALL_DATA} ocamldoc.sty ocamldoc.hva $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) $(INSTALL_LIBDIR)
++	${BSD_INSTALL_DATA} $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
+ 
+ # Testing :
+ ###########
diff --git a/lang/ocaml/patches/patch-ax b/lang/ocaml/patches/patch-ax
new file mode 100644
index 00000000000..4dee29ee7de
--- /dev/null
+++ b/lang/ocaml/patches/patch-ax
@@ -0,0 +1,22 @@
+$NetBSD: patch-ax,v 1.1 2004/04/22 09:18:40 tron Exp $
+
+--- otherlibs/bigarray/Makefile.orig	Thu Jun 27 13:36:00 2002
++++ otherlibs/bigarray/Makefile	Thu Apr 22 10:34:37 2004
+@@ -41,13 +41,13 @@
+           $(CAML_OBJS:.cmo=.cmx)
+ 
+ install:
+-	if test -f dllbigarray.so; then cp dllbigarray.so $(STUBLIBDIR)/dllbigarray.so; fi
+-	cp bigarray.cmi bigarray.mli libbigarray.a bigarray.cma $(LIBDIR)
++	if test -f dllbigarray.so; then ${BSD_INSTALL_DATA} dllbigarray.so $(STUBLIBDIR)/dllbigarray.so; fi
++	${BSD_INSTALL_DATA} bigarray.cmi bigarray.mli libbigarray.a bigarray.cma $(LIBDIR)
+ 	cd $(LIBDIR); $(RANLIB) libbigarray.a
+-	cp bigarray.h $(LIBDIR)/caml/bigarray.h
++	${BSD_INSTALL_DATA} bigarray.h $(LIBDIR)/caml/bigarray.h
+ 
+ installopt:
+-	cp bigarray.a $(CAML_OBJS:.cmo=.cmx) bigarray.cmxa $(LIBDIR)
++	${BSD_INSTALL_DATA} bigarray.a $(CAML_OBJS:.cmo=.cmx) bigarray.cmxa $(LIBDIR)
+ 	cd $(LIBDIR); $(RANLIB) bigarray.a
+ 
+ partialclean:
diff --git a/lang/ocaml/patches/patch-ay b/lang/ocaml/patches/patch-ay
new file mode 100644
index 00000000000..7f2528bf65f
--- /dev/null
+++ b/lang/ocaml/patches/patch-ay
@@ -0,0 +1,22 @@
+$NetBSD: patch-ay,v 1.1 2004/04/22 09:18:40 tron Exp $
+
+--- otherlibs/dbm/Makefile.orig	Thu Jun 27 13:36:01 2002
++++ otherlibs/dbm/Makefile	Thu Apr 22 10:34:37 2004
+@@ -47,13 +47,13 @@
+ 	rm -f *.a *.o *.so
+ 
+ install:
+-	if test -f dllmldbm.so; then cp dllmldbm.so $(STUBLIBDIR)/dllmldbm.so; fi
+-	cp libmldbm.a $(LIBDIR)/libmldbm.a
++	if test -f dllmldbm.so; then ${BSD_INSTALL_DATA} dllmldbm.so $(STUBLIBDIR)/dllmldbm.so; fi
++	${BSD_INSTALL_DATA} libmldbm.a $(LIBDIR)/libmldbm.a
+ 	cd $(LIBDIR); $(RANLIB) libmldbm.a
+-	cp dbm.cma dbm.cmi dbm.mli $(LIBDIR)
++	${BSD_INSTALL_DATA} dbm.cma dbm.cmi dbm.mli $(LIBDIR)
+ 
+ installopt:
+-	cp dbm.cmx dbm.cmxa dbm.a $(LIBDIR)
++	${BSD_INSTALL_DATA} dbm.cmx dbm.cmxa dbm.a $(LIBDIR)
+ 	cd $(LIBDIR); $(RANLIB) dbm.a
+ 
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx
diff --git a/lang/ocaml/patches/patch-az b/lang/ocaml/patches/patch-az
new file mode 100644
index 00000000000..046888aaa1f
--- /dev/null
+++ b/lang/ocaml/patches/patch-az
@@ -0,0 +1,13 @@
+$NetBSD: patch-az,v 1.1 2004/04/22 09:18:40 tron Exp $
+
+--- otherlibs/dynlink/Makefile.orig	Sun Jan 20 16:12:28 2002
++++ otherlibs/dynlink/Makefile	Thu Apr 22 10:34:37 2004
+@@ -38,7 +38,7 @@
+ 	$(CAMLC) $(COMPFLAGS) -o extract_crc dynlink.cma extract_crc.cmo
+ 
+ install:
+-	cp dynlink.cmi dynlink.cma dynlink.mli extract_crc $(LIBDIR)
++	${BSD_INSTALL_DATA} dynlink.cmi dynlink.cma dynlink.mli extract_crc $(LIBDIR)
+ 
+ installopt:
+ 
diff --git a/lang/ocaml/patches/patch-ba b/lang/ocaml/patches/patch-ba
new file mode 100644
index 00000000000..41016f86635
--- /dev/null
+++ b/lang/ocaml/patches/patch-ba
@@ -0,0 +1,22 @@
+$NetBSD: patch-ba,v 1.1 2004/04/22 09:18:41 tron Exp $
+
+--- otherlibs/graph/Makefile.orig	Thu Jun 27 13:36:01 2002
++++ otherlibs/graph/Makefile	Thu Apr 22 10:34:37 2004
+@@ -50,13 +50,13 @@
+ 	rm -f *.a *.so *.o
+ 
+ install:
+-	if test -f dllgraphics.so; then cp dllgraphics.so $(STUBLIBDIR)/dllgraphics.so; fi
+-	cp libgraphics.a $(LIBDIR)/libgraphics.a
++	if test -f dllgraphics.so; then ${BSD_INSTALL_DATA} dllgraphics.so $(STUBLIBDIR)/dllgraphics.so; fi
++	${BSD_INSTALL_DATA} libgraphics.a $(LIBDIR)/libgraphics.a
+ 	cd $(LIBDIR); $(RANLIB) libgraphics.a
+-	cp graphics.cm[ia] graphicsX11.cmi graphics.mli graphicsX11.mli $(LIBDIR)
++	${BSD_INSTALL_DATA} graphics.cm[ia] graphicsX11.cmi graphics.mli graphicsX11.mli $(LIBDIR)
+ 
+ installopt:
+-	cp graphics.cmxa graphics.a $(LIBDIR)
++	${BSD_INSTALL_DATA} graphics.cmxa graphics.a $(LIBDIR)
+ 	cd $(LIBDIR); $(RANLIB) graphics.a
+ 
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx
diff --git a/lang/ocaml/patches/patch-bb b/lang/ocaml/patches/patch-bb
new file mode 100644
index 00000000000..28eff88efaa
--- /dev/null
+++ b/lang/ocaml/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2004/04/22 09:18:41 tron Exp $
+
+--- otherlibs/labltk/browser/Makefile.orig	Mon Aug 12 07:31:21 2002
++++ otherlibs/labltk/browser/Makefile	Thu Apr 22 10:34:37 2004
+@@ -47,7 +47,7 @@
+ 
+ install:
+ 	if test -f ocamlbrowser$(EXE); then : ; \
+-	  cp ocamlbrowser$(EXE) $(BINDIR); fi
++	  ${BSD_INSTALL_SCRIPT} ocamlbrowser$(EXE) $(BINDIR); fi
+ 
+ clean:
+ 	rm -f *.cm? ocamlbrowser$(EXE) dummy.mli *~ *.orig
diff --git a/lang/ocaml/patches/patch-bc b/lang/ocaml/patches/patch-bc
new file mode 100644
index 00000000000..93a828a6285
--- /dev/null
+++ b/lang/ocaml/patches/patch-bc
@@ -0,0 +1,23 @@
+$NetBSD: patch-bc,v 1.1 2004/04/22 09:18:41 tron Exp $
+
+--- otherlibs/labltk/camltk/Makefile.orig	Fri Apr 26 15:57:38 2002
++++ otherlibs/labltk/camltk/Makefile	Thu Apr 22 10:34:37 2004
+@@ -21,14 +21,12 @@
+ 	$(MAKE) -f Makefile.gen clean
+ 
+ install: $(CAMLTKOBJS)
+-	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
+-	cp $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
+-	chmod 644 $(INSTALLDIR)/*.cmi
++	if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
++	${BSD_INSTALL_DATA} $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
+ 
+ installopt: $(CAMLTKOBJSX)
+-	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
+-	cp $(CAMLTKOBJSX) $(INSTALLDIR)
+-	chmod 644 $(INSTALLDIR)/*.cmx
++	@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
++	${BSD_INSTALL_DATA} $(CAMLTKOBJSX) $(INSTALLDIR)
+ 
+ .SUFFIXES :
+ .SUFFIXES : .mli .ml .cmi .cmx .cmo .mlp
diff --git a/lang/ocaml/patches/patch-bd b/lang/ocaml/patches/patch-bd
new file mode 100644
index 00000000000..4a1ec067a13
--- /dev/null
+++ b/lang/ocaml/patches/patch-bd
@@ -0,0 +1,15 @@
+$NetBSD: patch-bd,v 1.1 2004/04/22 09:18:42 tron Exp $
+
+--- otherlibs/labltk/compiler/Makefile.orig	Fri Apr 26 14:15:45 2002
++++ otherlibs/labltk/compiler/Makefile	Thu Apr 22 10:34:37 2004
+@@ -45,8 +45,8 @@
+ 	rm -f *.cm*  pplex.ml ppyac.ml ppyac.mli pp$(EXE)
+ 
+ install: 
+-	cp tkcompiler$(EXE) $(INSTALLDIR)
+-	cp pp$(EXE) $(INSTALLDIR)
++	${BSD_INSTALL_SCRIPT} tkcompiler$(EXE) $(INSTALLDIR)
++	${BSD_INSTALL_SCRIPT} pp$(EXE) $(INSTALLDIR)
+ 
+ .SUFFIXES :
+ .SUFFIXES : .mli .ml .cmi .cmo .mlp
diff --git a/lang/ocaml/patches/patch-be b/lang/ocaml/patches/patch-be
new file mode 100644
index 00000000000..ed342201362
--- /dev/null
+++ b/lang/ocaml/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.1 2004/04/22 09:18:42 tron Exp $
+
+--- otherlibs/labltk/frx/Makefile.orig	Fri Apr 26 14:16:00 2002
++++ otherlibs/labltk/frx/Makefile	Thu Apr 22 10:34:37 2004
+@@ -20,7 +20,7 @@
+ 	$(CAMLOPTLIBR) -o frxlib.cmxa $(OBJSX)
+ 
+ install: frxlib.cma
+-	cp *.cmi *.mli frxlib.cma $(INSTALLDIR)
++	${BSD_INSTALL_DATA} *.cmi *.mli frxlib.cma $(INSTALLDIR)
+ 
+ installopt: frxlib.cmxa
+ 	cp frxlib.cmxa frxlib.a $(INSTALLDIR)
diff --git a/lang/ocaml/patches/patch-bf b/lang/ocaml/patches/patch-bf
new file mode 100644
index 00000000000..ea76f0c5b23
--- /dev/null
+++ b/lang/ocaml/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.1 2004/04/22 09:18:42 tron Exp $
+
+--- otherlibs/labltk/jpf/Makefile.orig	Fri Apr 26 14:16:11 2002
++++ otherlibs/labltk/jpf/Makefile	Thu Apr 22 10:34:37 2004
+@@ -21,7 +21,7 @@
+ 	$(CAMLOPTLIBR) -o jpflib.cmxa $(OBJSX)
+ 
+ install: jpflib.cma
+-	cp $(OBJS:.cmo=.cmi) $(OBJS:.cmo=.mli) jpflib.cma $(INSTALLDIR)
++	${BSD_INSTALL_DATA} $(OBJS:.cmo=.cmi) $(OBJS:.cmo=.mli) jpflib.cma $(INSTALLDIR)
+ 
+ installopt: jpflib.cmxa
+ 	cp jpflib.cmxa jpflib.a $(OBJS:.cmo=.cmx) $(INSTALLDIR)
diff --git a/lang/ocaml/patches/patch-bg b/lang/ocaml/patches/patch-bg
new file mode 100644
index 00000000000..a446c3c30ca
--- /dev/null
+++ b/lang/ocaml/patches/patch-bg
@@ -0,0 +1,23 @@
+$NetBSD: patch-bg,v 1.1 2004/04/22 09:18:42 tron Exp $
+
+--- otherlibs/labltk/labltk/Makefile.orig	Fri Apr 26 15:57:39 2002
++++ otherlibs/labltk/labltk/Makefile	Thu Apr 22 10:34:37 2004
+@@ -16,14 +16,12 @@
+ labltkobjsx: $(LABLTKOBJSX)
+ 
+ install: $(LABLTKOBJS)
+-	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
+-	cp $(LABLTKOBJS:.cmo=.cmi) $(WIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
+-	chmod 644 $(INSTALLDIR)/*.cmi
++	if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
++	${BSD_INSTALL_DATA} $(LABLTKOBJS:.cmo=.cmi) $(WIDGETOBJS:.cmo=.mli) $(INSTALLDIR)
+ 
+ installopt: $(LABLTKOBJSX)
+-	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
+-	cp $(LABLTKOBJSX) $(INSTALLDIR)
+-	chmod 644 $(INSTALLDIR)/*.cmx
++	@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
++	${BSD_INSTALL_DATA} $(LABLTKOBJSX) $(INSTALLDIR)
+ 
+ clean:
+ 	$(MAKE) -f Makefile.gen clean
diff --git a/lang/ocaml/patches/patch-bh b/lang/ocaml/patches/patch-bh
new file mode 100644
index 00000000000..df754dfe568
--- /dev/null
+++ b/lang/ocaml/patches/patch-bh
@@ -0,0 +1,29 @@
+$NetBSD: patch-bh,v 1.1 2004/04/22 09:18:43 tron Exp $
+
+--- otherlibs/labltk/lib/Makefile.orig	Fri Aug  9 02:46:30 2002
++++ otherlibs/labltk/lib/Makefile	Thu Apr 22 10:34:37 2004
+@@ -58,17 +58,13 @@
+ 	@echo 'exec $(INSTALLDIR)/$(LIBNAME)top$(EXE) -I $(INSTALLDIR) $$*' >> $@
+ 
+ install:
+-	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
+-	cp $(LIBNAME).cma $(LIBNAME)top$(EXE) $(INSTALLDIR)
+-	chmod 644 $(INSTALLDIR)/$(LIBNAME).cma
+-	chmod 755 $(INSTALLDIR)/$(LIBNAME)top$(EXE)
+-	@if test -d $(BINDIR); then : ; else mkdir $(BINDIR); fi
+-	cp $(LIBNAME) $(BINDIR)
+-	chmod 755 $(BINDIR)/$(LIBNAME)
++	if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
++	${BSD_INSTALL_DATA} $(LIBNAME).cma $(INSTALLDIR)
++	${BSD_INSTALL_PROGRAM} $(LIBNAME)top$(EXE) $(INSTALLDIR)
++	@if test -d $(BINDIR); then : ; else ${BSD_INSTALL_PROGRAM_DIR} $(BINDIR); fi
++	${BSD_INSTALL_SCRIPT} $(LIBNAME) $(BINDIR)
+ 
+ installopt:
+-	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
+-	cp $(LIBNAME).cmxa $(LIBNAME).a $(INSTALLDIR)
++	@if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
++	${BSD_INSTALL_DATA} $(LIBNAME).cmxa $(LIBNAME).a $(INSTALLDIR)
+ 	cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).a
+-	chmod 644 $(INSTALLDIR)/$(LIBNAME).cmxa
+-	chmod 644 $(INSTALLDIR)/$(LIBNAME).a
diff --git a/lang/ocaml/patches/patch-bi b/lang/ocaml/patches/patch-bi
new file mode 100644
index 00000000000..f7a2d1a1c41
--- /dev/null
+++ b/lang/ocaml/patches/patch-bi
@@ -0,0 +1,20 @@
+$NetBSD: patch-bi,v 1.1 2004/04/22 09:18:43 tron Exp $
+
+--- otherlibs/labltk/support/Makefile.orig	Thu Jun 27 13:36:01 2002
++++ otherlibs/labltk/support/Makefile	Thu Apr 22 10:34:37 2004
+@@ -26,12 +26,11 @@
+     widget.cmi widget.mli
+ 
+ install: lib$(LIBNAME).a $(PUB)
+-	if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
+-	cp $(PUB) lib$(LIBNAME).a $(INSTALLDIR)
++	if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi
++	${BSD_INSTALL_DATA} $(PUB) lib$(LIBNAME).a $(INSTALLDIR)
+ 	cd $(INSTALLDIR); $(RANLIB) lib$(LIBNAME).a
+-	cd $(INSTALLDIR); chmod 644 $(PUB) lib$(LIBNAME).a
+ 	if test -f dll$(LIBNAME).so; then \
+-	   cp dll$(LIBNAME).so $(STUBLIBDIR)/dll$(LIBNAME).so; fi
++	   ${BSD_INSTALL_DATA} dll$(LIBNAME).so $(STUBLIBDIR)/dll$(LIBNAME).so; fi
+ 
+ clean : 
+ 	rm -f *.cm* *.o *.a *.so
diff --git a/lang/ocaml/patches/patch-bj b/lang/ocaml/patches/patch-bj
new file mode 100644
index 00000000000..383908a7e46
--- /dev/null
+++ b/lang/ocaml/patches/patch-bj
@@ -0,0 +1,17 @@
+$NetBSD: patch-bj,v 1.1 2004/04/22 09:18:44 tron Exp $
+
+--- otherlibs/labltk/support/cltkImg.c.orig	Tue Jul 23 16:11:59 2002
++++ otherlibs/labltk/support/cltkImg.c	Thu Apr 22 10:34:38 2004
+@@ -99,7 +99,11 @@
+   pib.offset[0] = 0;
+   pib.offset[1] = 1;
+   pib.offset[2] = 2;
+-  Tk_PhotoPutBlock(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)); 
++  Tk_PhotoPutBlock(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
++#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
++                   , TK_PHOTO_COMPOSITE_SET
++#endif
++    ); 
+ }
+ 
+ CAMLprim void camltk_setimgdata_bytecode(argv,argn)
diff --git a/lang/ocaml/patches/patch-bk b/lang/ocaml/patches/patch-bk
new file mode 100644
index 00000000000..550967f1f22
--- /dev/null
+++ b/lang/ocaml/patches/patch-bk
@@ -0,0 +1,16 @@
+$NetBSD: patch-bk,v 1.1 2004/04/22 09:18:44 tron Exp $
+
+--- otherlibs/labltk/tkanim/Makefile.orig	Thu Jun 27 13:36:01 2002
++++ otherlibs/labltk/tkanim/Makefile	Thu Apr 22 10:34:37 2004
+@@ -52,9 +52,9 @@
+ 
+ 
+ install: tkanim.cma 
+-	cp tkanim.cma *.cmi *.mli libtkanim.a $(INSTALLDIR)
++	${BSD_INSTALL_DATA} tkanim.cma *.cmi *.mli libtkanim.a $(INSTALLDIR)
+ 	if [ -f dlltkanim.so ]; then \
+-		cp dlltkanim.so $(STUBLIBDIR)/dlltkanim.so; \
++		${BSD_INSTALL_DATA} dlltkanim.so $(STUBLIBDIR)/dlltkanim.so; \
+ 	fi
+ 
+ installopt: tkanim.cmxa
diff --git a/lang/ocaml/patches/patch-bl b/lang/ocaml/patches/patch-bl
new file mode 100644
index 00000000000..0375a71ab18
--- /dev/null
+++ b/lang/ocaml/patches/patch-bl
@@ -0,0 +1,17 @@
+$NetBSD: patch-bl,v 1.1 2004/04/22 09:18:44 tron Exp $
+
+--- otherlibs/labltk/tkanim/tkAnimGIF.c.orig	Tue Jul 23 16:12:00 2002
++++ otherlibs/labltk/tkanim/tkAnimGIF.c	Thu Apr 22 10:34:38 2004
+@@ -336,7 +336,11 @@
+             }
+         }
+         Tk_PhotoPutBlock(photoHandle, &block, 0, 0, 
+-                         imageWidth, imageHeight);
++                         imageWidth, imageHeight
++#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
++                   , TK_PHOTO_COMPOSITE_SET
++#endif
++          );
+ #ifdef TKANIM_DEBUG
+     fprintf(stderr, " Retrieving result\n");
+ #endif
diff --git a/lang/ocaml/patches/patch-bm b/lang/ocaml/patches/patch-bm
new file mode 100644
index 00000000000..f8a24571a91
--- /dev/null
+++ b/lang/ocaml/patches/patch-bm
@@ -0,0 +1,22 @@
+$NetBSD: patch-bm,v 1.1 2004/04/22 09:18:45 tron Exp $
+
+--- otherlibs/num/Makefile.orig	Thu Jun 27 13:36:01 2002
++++ otherlibs/num/Makefile	Thu Apr 22 10:34:37 2004
+@@ -53,13 +53,13 @@
+ $(CAMLOBJS:.cmo=.cmx): ../../ocamlopt
+ 
+ install:
+-	if test -f dllnums.so; then cp dllnums.so $(STUBLIBDIR)/dllnums.so; fi
+-	cp libnums.a $(LIBDIR)/libnums.a
++	if test -f dllnums.so; then ${BSD_INSTALL_DATA} dllnums.so $(STUBLIBDIR)/dllnums.so; fi
++	${BSD_INSTALL_DATA} libnums.a $(LIBDIR)/libnums.a
+ 	cd $(LIBDIR); $(RANLIB) libnums.a
+-	cp nums.cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)
++	${BSD_INSTALL_DATA} nums.cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)
+ 
+ installopt:
+-	cp $(CAMLOBJS:.cmo=.cmx) nums.cmxa nums.a $(LIBDIR)
++	${BSD_INSTALL_DATA} $(CAMLOBJS:.cmo=.cmx) nums.cmxa nums.a $(LIBDIR)
+ 	cd $(LIBDIR); $(RANLIB) nums.a
+ 
+ partialclean:
diff --git a/lang/ocaml/patches/patch-bn b/lang/ocaml/patches/patch-bn
new file mode 100644
index 00000000000..a263156bca7
--- /dev/null
+++ b/lang/ocaml/patches/patch-bn
@@ -0,0 +1,22 @@
+$NetBSD: patch-bn,v 1.1 2004/04/22 09:18:45 tron Exp $
+
+--- otherlibs/str/Makefile.orig	Thu Jun 27 13:36:02 2002
++++ otherlibs/str/Makefile	Thu Apr 22 10:34:37 2004
+@@ -53,13 +53,13 @@
+ 	cd $(REGEXLIB); if test -f Makefile; then $(MAKE) distclean; else exit 0; fi
+ 
+ install:
+-	if test -f dllstr.so; then cp dllstr.so $(STUBLIBDIR)/dllstr.so; fi
+-	cp libstr.a $(LIBDIR)/libstr.a
++	if test -f dllstr.so; then ${BSD_INSTALL_DATA} dllstr.so $(STUBLIBDIR)/dllstr.so; fi
++	${BSD_INSTALL_DATA} libstr.a $(LIBDIR)/libstr.a
+ 	cd $(LIBDIR); $(RANLIB) libstr.a
+-	cp str.cma str.cmi str.mli $(LIBDIR)
++	${BSD_INSTALL_DATA} str.cma str.cmi str.mli $(LIBDIR)
+ 
+ installopt:
+-	cp str.cmx str.cmxa str.a $(LIBDIR)
++	${BSD_INSTALL_DATA} str.cmx str.cmxa str.a $(LIBDIR)
+ 	cd $(LIBDIR); $(RANLIB) str.a
+ 
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx
diff --git a/lang/ocaml/patches/patch-bo b/lang/ocaml/patches/patch-bo
new file mode 100644
index 00000000000..6a72ad96e8f
--- /dev/null
+++ b/lang/ocaml/patches/patch-bo
@@ -0,0 +1,23 @@
+$NetBSD: patch-bo,v 1.1 2004/04/22 09:18:45 tron Exp $
+
+--- otherlibs/systhreads/Makefile.orig	Thu Jun 27 13:36:02 2002
++++ otherlibs/systhreads/Makefile	Thu Apr 22 10:34:37 2004
+@@ -70,13 +70,13 @@
+ 	rm -f $(GENFILES)
+ 
+ install:
+-	if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
+-	cp libthreads.a $(LIBDIR)/libthreads.a
++	if test -f dllthreads.so; then ${BSD_INSTALL_DATA} dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
++	${BSD_INSTALL_DATA} libthreads.a $(LIBDIR)/libthreads.a
+ 	cd $(LIBDIR); $(RANLIB) libthreads.a
+-	if test -d $(LIBDIR)/threads; then :; else mkdir $(LIBDIR)/threads; fi
+-	cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads
++	if test -d $(LIBDIR)/threads; then :; else ${BSD_INSTALL_DATA_DIR} $(LIBDIR)/threads; fi
++	${BSD_INSTALL_DATA} $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads
+ 	rm -f $(LIBDIR)/threads/stdlib.cma
+-	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)
++	${BSD_INSTALL_DATA} thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)
+ 
+ installopt:
+ 	cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a
diff --git a/lang/ocaml/patches/patch-bp b/lang/ocaml/patches/patch-bp
new file mode 100644
index 00000000000..2be2593e61a
--- /dev/null
+++ b/lang/ocaml/patches/patch-bp
@@ -0,0 +1,22 @@
+$NetBSD: patch-bp,v 1.1 2004/04/22 09:18:46 tron Exp $
+
+--- otherlibs/threads/Makefile.orig	Mon Jul  8 09:30:08 2002
++++ otherlibs/threads/Makefile	Thu Apr 22 10:34:37 2004
+@@ -99,12 +99,12 @@
+ 	rm -f pervasives.mli marshal.mli unix.mli
+ 
+ install:
+-	if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
+-	cp libthreads.a $(LIBDIR)/libthreads.a
++	if test -f dllthreads.so; then ${BSD_INSTALL_DATA} dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
++	${BSD_INSTALL_DATA} libthreads.a $(LIBDIR)/libthreads.a
+ 	cd $(LIBDIR); $(RANLIB) libthreads.a
+-	if test -d $(LIBDIR)/threads; then : ; else mkdir $(LIBDIR)/threads; fi
+-	cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma unix.cma $(LIBDIR)/threads
+-	cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)
++	if test -d $(LIBDIR)/threads; then : ; else ${BSD_INSTALL_DATA_DIR} $(LIBDIR)/threads; fi
++	${BSD_INSTALL_DATA} thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma unix.cma $(LIBDIR)/threads
++	${BSD_INSTALL_DATA} thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)
+ 
+ installopt:
+ 
diff --git a/lang/ocaml/patches/patch-bq b/lang/ocaml/patches/patch-bq
new file mode 100644
index 00000000000..75021d4f893
--- /dev/null
+++ b/lang/ocaml/patches/patch-bq
@@ -0,0 +1,22 @@
+$NetBSD: patch-bq,v 1.1 2004/04/22 09:18:46 tron Exp $
+
+--- otherlibs/unix/Makefile.orig	Thu Jun 27 13:36:02 2002
++++ otherlibs/unix/Makefile	Thu Apr 22 10:34:37 2004
+@@ -65,13 +65,13 @@
+ 	rm -f *.a *.o *.so
+ 
+ install:
+-	if test -f dllunix.so; then cp dllunix.so $(STUBLIBDIR)/dllunix.so; fi
+-	cp libunix.a $(LIBDIR)/libunix.a
++	if test -f dllunix.so; then ${BSD_INSTALL_DATA} dllunix.so $(STUBLIBDIR)/dllunix.so; fi
++	${BSD_INSTALL_DATA} libunix.a $(LIBDIR)/libunix.a
+ 	cd $(LIBDIR); $(RANLIB) libunix.a
+-	cp unix.cma $(MLOBJS:.cmo=.cmi) $(MLOBJS:.cmo=.mli) $(LIBDIR)
++	${BSD_INSTALL_DATA} unix.cma $(MLOBJS:.cmo=.cmi) $(MLOBJS:.cmo=.mli) $(LIBDIR)
+ 
+ installopt:
+-	cp $(MLOBJS:.cmo=.cmx) unix.cmxa unix.a $(LIBDIR)
++	${BSD_INSTALL_DATA} $(MLOBJS:.cmo=.cmx) unix.cmxa unix.a $(LIBDIR)
+ 	cd $(LIBDIR); $(RANLIB) unix.a
+ 
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx
diff --git a/lang/ocaml/patches/patch-br b/lang/ocaml/patches/patch-br
new file mode 100644
index 00000000000..049536976fb
--- /dev/null
+++ b/lang/ocaml/patches/patch-br
@@ -0,0 +1,13 @@
+$NetBSD: patch-br,v 1.1 2004/04/22 09:18:46 tron Exp $
+
+--- stdlib/Makefile.orig	Wed Jun  5 14:08:38 2002
++++ stdlib/Makefile	Thu Apr 22 10:34:37 2004
+@@ -47,7 +47,7 @@
+ allopt-prof: stdlib.p.cmxa std_exit.p.cmx
+ 
+ install:
+-	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
++	${BSD_INSTALL_DATA} stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
+            $(LIBDIR)
+ 
+ installopt: installopt-default installopt-$(PROFILING)
diff --git a/lang/ocaml/patches/patch-bs b/lang/ocaml/patches/patch-bs
new file mode 100644
index 00000000000..251146928ab
--- /dev/null
+++ b/lang/ocaml/patches/patch-bs
@@ -0,0 +1,13 @@
+$NetBSD: patch-bs,v 1.1 2004/04/22 09:18:47 tron Exp $
+
+--- tools/Makefile.orig	Mon Apr 22 12:06:59 2002
++++ tools/Makefile	Thu Apr 22 10:34:37 2004
+@@ -44,7 +44,7 @@
+ 	rm -f ocamldep
+ 
+ install::
+-	cp ocamldep $(BINDIR)/ocamldep$(EXE)
++	${BSD_INSTALL_SCRIPT} ocamldep $(BINDIR)/ocamldep$(EXE)
+ 
+ # The profiler
+ 
-- 
cgit v1.2.3