- add DragonFly cases for configure

- assume !WIN32 ~= ANSI C for the purpose of errno.h
- ocamldoc is not an ELF binary, use BSD_INSTALL_SCRIPT like for ocamlc

4 files changed, 51 insertions, 13 deletions

diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 894e73f0fc7..100b2d4505e 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2005/09/04 13:57:50 tonio Exp $
+$NetBSD: distinfo,v 1.31 2005/11/29 07:02:47 joerg Exp $
 
 SHA1 (ocaml-3.08.4.tar.bz2) = d9eb54611d24f9e1c33736f12c7ba87412057cbb
 RMD160 (ocaml-3.08.4.tar.bz2) = 448ed9af56cacb9c32208d064e1c9732a2086bd2
@@ -6,6 +6,7 @@ Size (ocaml-3.08.4.tar.bz2) = 2054019 bytes
 SHA1 (patch-aa) = 3f8945cac58be358ef4e3e15b6fc2d1ddf43d8be
 SHA1 (patch-ab) = 66e50b0a601aa7c71655672685a48d04d8623230
 SHA1 (patch-ac) = b8920fe365e02d2db3fee53afdce368af98941e3
+SHA1 (patch-ad) = 43624e0952704a2a3f965fe421eadfe8d1042c84
 SHA1 (patch-ag) = f1b751098d3693b92feb26cda87970426bffcaf1
 SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488
 SHA1 (patch-ai) = a63857c935bf09a9c8d621aa67ef3a13ca4bbd20
@@ -18,10 +19,10 @@ SHA1 (patch-ao) = dfdd58093e77db9c3d8507a51faa0320c56e3998
 SHA1 (patch-ap) = def9bf7779e59844c4e4790363f040aa17aa8d86
 SHA1 (patch-aq) = c877ae103ba1e5c7a8c4c694627610d485d3f222
 SHA1 (patch-ar) = 4f5df951be21c21f644e7f75f4e74bdf141ef0c5
-SHA1 (patch-at) = fcd0c25e72d02c218e0c3d64d586951e0fb0c8f1
+SHA1 (patch-at) = 6b62b5ae9b4bb9e34e7dd1ea8314bcb493fd101a
 SHA1 (patch-au) = f1bf9e793c90a6e2fb8c8a058d7252646c870930
 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
-SHA1 (patch-aw) = d04e90deb9b13ecd67b2653623ed4c2039d348af
+SHA1 (patch-aw) = c44908be14be2869ec0722d0bfa3794945f40622
 SHA1 (patch-ax) = f9fb031e4ab7c5d5fc27bfe6ad69942d92fc6776
 SHA1 (patch-ay) = ae0fcda810e61967f879f4f18cb17de291f7834b
 SHA1 (patch-az) = 7ef66ce5ac11a5012f30db3161b1aadcd8c55c7e
diff --git a/lang/ocaml/patches/patch-ad b/lang/ocaml/patches/patch-ad
new file mode 100644
index 00000000000..92bc6937057
--- /dev/null
+++ b/lang/ocaml/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.6 2005/11/29 07:02:47 joerg Exp $
+
+--- byterun/sys.c.orig	2005-11-29 06:21:52.000000000 +0000
++++ byterun/sys.c
+@@ -47,10 +47,6 @@
+ #include "stacks.h"
+ #include "sys.h"
+ 
+-#ifndef _WIN32
+-extern int errno;
+-#endif
+-
+ static char * error_message(void)
+ {
+   return strerror(errno);
diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at
index 4c569891448..9d768319998 100644
--- a/lang/ocaml/patches/patch-at
+++ b/lang/ocaml/patches/patch-at
@@ -1,8 +1,22 @@
-$NetBSD: patch-at,v 1.6 2005/06/07 00:59:49 minskim Exp $
+$NetBSD: patch-at,v 1.7 2005/11/29 07:02:47 joerg Exp $
 
 --- configure.orig	2005-01-24 09:22:46.000000000 -0600
 +++ configure
-@@ -573,6 +573,7 @@ case "$host" in
+@@ -481,7 +481,7 @@ mksharedlibrpath=''
+ 
+ if test $withsharedlibs = "yes"; then
+   case "$host" in
+-    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*)
++    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-dragonfly*)
+       sharedcccompopts="-fPIC"
+       mksharedlib="$bytecc -shared -o"
+       bytecclinkopts="$bytecclinkopts -Wl,-E"
+@@ -569,10 +569,12 @@ case "$host" in
+   sparc*-*-linux*)              arch=sparc; system=linux;;
+   i[3456]86-*-linux*)           arch=i386; system=linux_`sh ./runtest elf.c`;;
+   i[3456]86-*-*bsd*)            arch=i386; system=bsd_`sh ./runtest elf.c`;;
++  i[3456]86-*-dragonfly*)       arch=i386; system=bsd_`sh ./runtest elf.c`;;
+   i[3456]86-*-nextstep*)        arch=i386; system=nextstep;;
    i[3456]86-*-solaris*)         arch=i386; system=solaris;;
    i[3456]86-*-beos*)            arch=i386; system=beos;;
    i[3456]86-*-cygwin*)          arch=i386; system=cygwin;;
@@ -10,7 +24,7 @@ $NetBSD: patch-at,v 1.6 2005/06/07 00:59:49 minskim Exp $
    mips-*-irix6*)                arch=mips; system=irix;;
    hppa1.1-*-hpux*)              arch=hppa; system=hpux;;
    hppa2.0*-*-hpux*)             arch=hppa; system=hpux;;
-@@ -657,6 +658,7 @@ case "$arch,$model,$system" in
+@@ -657,6 +659,7 @@ case "$arch,$model,$system" in
      profiling='prof'
      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
    amd64,*,linux) profiling='prof';;
@@ -18,7 +32,15 @@ $NetBSD: patch-at,v 1.6 2005/06/07 00:59:49 minskim Exp $
    *) profiling='noprof';;
  esac
  
-@@ -1123,6 +1125,7 @@ fi
+@@ -1077,6 +1080,7 @@ if test "$pthread_wanted" = "yes"; then
+   case "$host" in
+     *-*-solaris*)  pthread_link="-lpthread -lposix4";;
+     *-*-freebsd*)  pthread_link="-pthread";;
++    *-*-dragonfly*)  pthread_link="-pthread";;
+     *-*-openbsd*)  pthread_link="-pthread";;
+     *)             pthread_link="-lpthread";;
+   esac
+@@ -1123,6 +1127,7 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -26,7 +48,7 @@ $NetBSD: patch-at,v 1.6 2005/06/07 00:59:49 minskim Exp $
  for dir in \
      $x11_include_dir          \
                                \
-@@ -1169,6 +1172,7 @@ do
+@@ -1169,6 +1174,7 @@ do
      break
    fi
  done
@@ -34,7 +56,7 @@ $NetBSD: patch-at,v 1.6 2005/06/07 00:59:49 minskim Exp $
  
  if test "$x11_include" = "not found"; then
    x11_try_lib_dir=''
-@@ -1257,31 +1261,8 @@ dbm_include="not found"
+@@ -1258,31 +1264,8 @@ dbm_include="not found"
  dbm_link="not found"
  use_gdbm_ndbm=no
  
@@ -68,7 +90,7 @@ $NetBSD: patch-at,v 1.6 2005/06/07 00:59:49 minskim Exp $
  if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
    echo "NDBM not found, the \"dbm\" library will not be supported."
  else
-@@ -1293,8 +1274,8 @@ else
+@@ -1294,8 +1277,8 @@ else
    fi
    echo "DBM_INCLUDES=$dbm_include" >> Makefile
    echo "DBM_LINK=$dbm_link" >> Makefile
diff --git a/lang/ocaml/patches/patch-aw b/lang/ocaml/patches/patch-aw
index 917a7344aa6..9149f7fa8eb 100644
--- a/lang/ocaml/patches/patch-aw
+++ b/lang/ocaml/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.2 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-aw,v 1.3 2005/11/29 07:02:47 joerg Exp $
 
 --- ocamldoc/Makefile.orig	2004-10-15 15:32:30.000000000 +0100
 +++ ocamldoc/Makefile	2004-10-15 15:38:04.000000000 +0100
-@@ -252,24 +252,24 @@
+@@ -252,24 +252,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
  # Installation targets
  ######################
  install: dummy
@@ -15,7 +15,7 @@ $NetBSD: patch-aw,v 1.2 2005/02/04 21:35:51 adrianp Exp $
 +	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
 +	if test -d $(INSTALL_CUSTOMDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALL_CUSTOMDIR); fi
-+	${BSD_INSTALL_PROGRAM} $(OCAMLDOC)$(EXE) $(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE)
++	${BSD_INSTALL_SCRIPT} $(OCAMLDOC)$(EXE) $(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE)
 +	${BSD_INSTALL_DATA} ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
 +	${BSD_INSTALL_DATA} $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
  	if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi