pkg/32625: lang/ocaml miss native-code compiler support for NetBSD/amd64

[njoly%pasteur.fr@localhost]

>Number:         32625
>Category:       pkg
>Synopsis:       lang/ocaml miss native-code compiler support for NetBSD/amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 25 12:50:00 +0000 2006
>Originator:     Nicolas Joly
>Release:        NetBSD 3.99.15
>Organization:
Biological Software and Databanks.
Institut Pasteur, Paris.
>Environment:
System: NetBSD lanfeust.sis.pasteur.fr 3.99.15 NetBSD 3.99.15 (LANFEUST) #6: 
Tue Jan 10 11:15:40 CET 2006 
njoly%lanfeust.sis.pasteur.fr@localhost:/local/src/NetBSD/obj/amd64/sys/arch/amd64/compile/LANFEUST
 amd64
Architecture: x86_64
Machine: amd64
>Description:
While trying to build `net/mldonkey' on my -current NetBSD/amd64 workstation,
i noticed that `lang/ocaml' has no native-code compiler support on that
platform.
>How-To-Repeat:
Install `lang/ocaml' on NetBSD/amd64, and notice that `ocaml*.opt' binaries
are missing.
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ocaml/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile    16 Jan 2006 09:41:48 -0000      1.43
+++ Makefile    25 Jan 2006 12:46:49 -0000
@@ -7,12 +7,13 @@
 
 BUILD_TARGET=          world
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc")
+    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
 BUILD_TARGET+= opt opt.opt
 PLIST_SRC=     ${PKGDIR}/PLIST.opt
 .  if (${OPSYS} != "Darwin") && \
       !(${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386") && \
-      !(${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc")
+      !(${OPSYS} == "NetBSD" && (${MACHINE_ARCH} == "sparc") || \
+                               (${MACHINE_ARCH} == "x86_64"))
 PLIST_SRC+=    ${PKGDIR}/PLIST.prof
 .  endif
 PLIST_SRC+=    ${PKGDIR}/PLIST
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ocaml/distinfo,v
retrieving revision 1.33
diff -u -r1.33 distinfo
--- distinfo    16 Jan 2006 09:41:48 -0000      1.33
+++ distinfo    25 Jan 2006 12:46:49 -0000
@@ -19,7 +19,7 @@
 SHA1 (patch-ap) = def9bf7779e59844c4e4790363f040aa17aa8d86
 SHA1 (patch-aq) = c877ae103ba1e5c7a8c4c694627610d485d3f222
 SHA1 (patch-ar) = 4f5df951be21c21f644e7f75f4e74bdf141ef0c5
-SHA1 (patch-at) = 753a907e52d69d72562a24a7841eb2abecc43906
+SHA1 (patch-at) = bdfea686f3797375ab0175ac2c5b2a54c8338673
 SHA1 (patch-au) = f1bf9e793c90a6e2fb8c8a058d7252646c870930
 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
 SHA1 (patch-aw) = a2dee7fa2181008fb9cc632032a9a07aec422afa
Index: patches/patch-at
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ocaml/patches/patch-at,v
retrieving revision 1.8
diff -u -r1.8 patch-at
--- patches/patch-at    16 Jan 2006 09:41:48 -0000      1.8
+++ patches/patch-at    25 Jan 2006 12:46:50 -0000
@@ -1,8 +1,6 @@
-$NetBSD: patch-at,v 1.8 2006/01/16 09:41:48 adam Exp $
-
 --- configure.orig     2006-01-04 10:26:42.000000000 +0100
-+++ configure
-@@ -483,7 +483,7 @@ mksharedlibrpath=''
++++ configure  2006-01-23 15:01:07.000000000 +0100
+@@ -483,7 +483,7 @@
  
  if test $withsharedlibs = "yes"; then
    case "$host" in
@@ -11,7 +9,7 @@
        sharedcccompopts="-fPIC"
        mksharedlib="$bytecc -shared -o"
        bytecclinkopts="$bytecclinkopts -Wl,-E"
-@@ -571,10 +571,12 @@ case "$host" in
+@@ -571,10 +571,12 @@
    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`;;
@@ -24,7 +22,15 @@
    mips-*-irix6*)                arch=mips; system=irix;;
    hppa1.1-*-hpux*)              arch=hppa; system=hpux;;
    hppa2.0*-*-hpux*)             arch=hppa; system=hpux;;
-@@ -659,6 +661,7 @@ case "$arch,$model,$system" in
+@@ -588,6 +590,7 @@
+   ia64-*-freebsd*)              arch=ia64; system=freebsd;;
+   x86_64-*-linux*)              arch=amd64; system=linux;;
+   x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
++  x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
+   x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
+ esac
+ 
+@@ -659,6 +662,7 @@
      profiling='prof'
      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
    amd64,*,linux) profiling='prof';;
@@ -32,7 +38,7 @@
    *) profiling='noprof';;
  esac
  
-@@ -1047,6 +1050,7 @@ if test "$pthread_wanted" = "yes"; then
+@@ -1047,6 +1051,7 @@
    case "$host" in
      *-*-solaris*)  pthread_link="-lpthread -lposix4";;
      *-*-freebsd*)  pthread_link="-pthread";;
@@ -40,7 +46,7 @@
      *-*-openbsd*)  pthread_link="-pthread";;
      *)             pthread_link="-lpthread";;
    esac
-@@ -1094,6 +1098,7 @@ fi
+@@ -1094,6 +1099,7 @@
  x11_include="not found"
  x11_link="not found"
  
@@ -48,7 +54,7 @@
  for dir in \
      $x11_include_dir          \
                                \
-@@ -1140,6 +1145,7 @@ do
+@@ -1140,6 +1146,7 @@
      break
    fi
  done
@@ -56,7 +62,7 @@
  
  if test "$x11_include" = "not found"; then
    x11_try_lib_dir=''
-@@ -1229,31 +1235,8 @@ dbm_include="not found"
+@@ -1229,31 +1236,8 @@
  dbm_link="not found"
  use_gdbm_ndbm=no
  
@@ -90,7 +96,7 @@
  if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
    echo "NDBM not found, the \"dbm\" library will not be supported."
  else
-@@ -1265,8 +1248,8 @@ else
+@@ -1265,8 +1249,8 @@
    fi
    echo "DBM_INCLUDES=$dbm_include" >> Makefile
    echo "DBM_LINK=$dbm_link" >> Makefile