[94150] trunk/dports/lang/ocaml

[jmr at macports.org]

Revision: 94150
          https://trac.macports.org/changeset/94150
Author:   jmr at macports.org
Date:     2012-06-10 09:02:44 -0700 (Sun, 10 Jun 2012)
Log Message:
-----------
ocaml: apply upstream patch to fix configure script platform detection (#31677)

Modified Paths:
--------------
    trunk/dports/lang/ocaml/Portfile

Added Paths:
-----------
    trunk/dports/lang/ocaml/files/patch-configure.diff

Modified: trunk/dports/lang/ocaml/Portfile
===================================================================
--- trunk/dports/lang/ocaml/Portfile	2012-06-10 11:42:46 UTC (rev 94149)
+++ trunk/dports/lang/ocaml/Portfile	2012-06-10 16:02:44 UTC (rev 94150)
@@ -3,9 +3,9 @@
 PortSystem        1.0
 
 name                ocaml
+epoch               1
 version             3.12.1
-revision            6
-epoch               1
+revision            7
 # When updating ocaml, also update camlp5 to a compatible version (c.f. #26769, #20219, #18292)
 set major_vers      [join [lrange [split ${version} .] 0 1] .]
 platforms           darwin
@@ -29,7 +29,7 @@
 
 depends_lib         port:ncurses port:xorg-libX11
 
-patchfiles          patch-otherlibs-bigarray.diff
+patchfiles          patch-otherlibs-bigarray.diff patch-configure.diff
 
 use_parallel_build  no
 universal_variant   no

Added: trunk/dports/lang/ocaml/files/patch-configure.diff
===================================================================
--- trunk/dports/lang/ocaml/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/lang/ocaml/files/patch-configure.diff	2012-06-10 16:02:44 UTC (rev 94150)
@@ -0,0 +1,31 @@
+--- configure	2011/08/04 14:31:28	11162
++++ configure	2011/08/04 14:31:34	11163
+@@ -576,13 +576,7 @@
+       byteccrpath="-Wl,-rpath,"
+       mksharedlibrpath="-rpath "
+       shared_libraries_supported=true;;
+-    i[3456]86-*-darwin10.*)
+-       mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress"
+-       bytecccompopts="$dl_defs $bytecccompopts"
+-       dl_needs_underscore=false
+-       shared_libraries_supported=true
+-       ;;
+-    i[3456]86-*-darwin*)
++    i[3456]86-*-darwin[89].*)
+       mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
+       bytecccompopts="$dl_defs $bytecccompopts"
+       dl_needs_underscore=false
+@@ -620,11 +614,11 @@
+     *-*-cygwin*)                  natdynlink=true;;
+     i[3456]86-*-linux*)           natdynlink=true;;
+     x86_64-*-linux*)              natdynlink=true;;
+-    i[3456]86-*-darwin10.*)
++    i[3456]86-*-darwin[89].*)     natdynlink=true;;
++    i[3456]86-*-darwin*)
+       if test $arch64 == true; then
+         natdynlink=true
+       fi;;
+-    i[3456]86-*-darwin[89]*)      natdynlink=true;;
+     powerpc64-*-linux*)           natdynlink=true;;
+     sparc-*-linux*)               natdynlink=true;;
+     i686-*-kfreebsd*)             natdynlink=true;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120610/93126bfe/attachment.html>