diff options
| author | Stanislav Sedov <stas@FreeBSD.org> | 2011-04-04 02:29:25 +0000 |
|---|---|---|
| committer | Stanislav Sedov <stas@FreeBSD.org> | 2011-04-04 02:29:25 +0000 |
| commit | c1e280dd247a961f526b134267fdc8076bec3e32 (patch) | |
| tree | a2b7cec103a6239d0435cd14e14f1ae8a5fd84a2 | |
| parent | - update to 0.37 (diff) | |
- Re-enable native dynamic linking on FreeBSD.
- Bump port revision.
PR: ports/156159
Submitted by: Johan van Selst <johans@stack.nl>
Pointy hat to: me
Notes
Notes:
svn path=/head/; revision=272179
| -rw-r--r-- | lang/ocaml/Makefile | 2 | ||||
| -rw-r--r-- | lang/ocaml/files/patch-configure | 20 |
2 files changed, 15 insertions, 7 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index a9804bd60fad..084eba5f1116 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -7,7 +7,7 @@ PORTNAME= ocaml PORTVERSION= 3.12.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \ ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \ diff --git a/lang/ocaml/files/patch-configure b/lang/ocaml/files/patch-configure index 4e1e92c3a821..3c96fffbbd92 100644 --- a/lang/ocaml/files/patch-configure +++ b/lang/ocaml/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig 2009-05-20 08:33:09.000000000 -0700 -+++ configure 2010-03-20 02:36:54.000000000 -0700 +--- configure.orig 2010-07-28 06:18:22.000000000 -0700 ++++ configure 2011-04-03 13:46:37.000000000 -0700 @@ -85,6 +85,8 @@ withcurses=no;; -no-shared-libs) @@ -9,7 +9,15 @@ -x11include*|--x11include*) x11_include_dir=$2; shift;; -x11lib*|--x11lib*) -@@ -642,6 +644,7 @@ +@@ -629,6 +631,7 @@ + i686-*-kfreebsd*) natdynlink=true;; + x86_64-*-kfreebsd*) natdynlink=true;; + i386-*-gnu0.3) natdynlink=true;; ++ *-*-freebsd*) natdynlink=true;; + esac + fi + +@@ -680,6 +683,7 @@ hppa*-*-gnu*) arch=hppa; system=gnu;; powerpc*-*-linux*) arch=power; model=ppc; system=elf;; powerpc-*-netbsd*) arch=power; model=ppc; system=elf;; @@ -17,7 +25,7 @@ powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; powerpc-*-darwin*) arch=power; system=rhapsody if $arch64; then model=ppc64; else model=ppc; fi;; -@@ -751,6 +754,7 @@ +@@ -789,6 +793,7 @@ i386,*,bsd_elf) profiling='prof';; amd64,*,macosx) profiling='prof';; i386,*,macosx) profiling='prof';; @@ -25,7 +33,7 @@ sparc,*,solaris) profiling='prof' case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; -@@ -1195,133 +1199,24 @@ +@@ -1249,133 +1254,24 @@ x11_include="not found" x11_link="not found" @@ -170,7 +178,7 @@ else echo "Location of X11 include files: $x11_include/X11" echo "Options for linking with X11: $x11_link" -@@ -1448,7 +1343,7 @@ +@@ -1502,7 +1398,7 @@ then tk_libs="$tk_libs $dllib" elif sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent then |