diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ocaml/Makefile | 15 | ||||
| -rw-r--r-- | lang/ocaml/files/patch-configure | 18 | ||||
| -rw-r--r-- | lang/ocaml/pkg-plist | 88 |
3 files changed, 72 insertions, 49 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 173a1e683a75..8286f18e4fa0 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -39,6 +39,16 @@ PATTERN= [[:space:]]*(do|then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]] .include <bsd.port.pre.mk> +.if ${ARCH} == powerpc +ARCH= power +.endif + +.if ${ARCH} == power +PLIST_SUB+= PROF="@comment " +.else +PLIST_SUB+= PROF="" +.endif + MAN1!= ${CAT} ${FILESDIR}/man1 MANN!= ${CAT} ${FILESDIR}/mann MLINKS!=${CAT} ${FILESDIR}/manlinks @@ -85,6 +95,11 @@ CONFIGURE_ARGS+= -tkdefs \ BROKEN= ocamlc.opt seg-faults on ${ARCH}, please try to fix .endif +post-extract: +.if ${ARCH} == power + ${MV} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S +.endif + post-configure: # CFLAGS safeness @${REINPLACE_CMD} -E \ diff --git a/lang/ocaml/files/patch-configure b/lang/ocaml/files/patch-configure index 05bb718cf2b7..4e1e92c3a821 100644 --- a/lang/ocaml/files/patch-configure +++ b/lang/ocaml/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig 2009-05-20 19:33:09.000000000 +0400 -+++ configure 2009-06-29 14:12:59.000000000 +0400 +--- configure.orig 2009-05-20 08:33:09.000000000 -0700 ++++ configure 2010-03-20 02:36:54.000000000 -0700 @@ -85,6 +85,8 @@ withcurses=no;; -no-shared-libs) @@ -9,7 +9,15 @@ -x11include*|--x11include*) x11_include_dir=$2; shift;; -x11lib*|--x11lib*) -@@ -751,6 +753,7 @@ +@@ -642,6 +644,7 @@ + hppa*-*-gnu*) arch=hppa; system=gnu;; + powerpc*-*-linux*) arch=power; model=ppc; system=elf;; + powerpc-*-netbsd*) arch=power; model=ppc; system=elf;; ++ powerpc-*-freebsd*) arch=power; model=ppc; system=bsd;; + 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 @@ i386,*,bsd_elf) profiling='prof';; amd64,*,macosx) profiling='prof';; i386,*,macosx) profiling='prof';; @@ -17,7 +25,7 @@ sparc,*,solaris) profiling='prof' case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; -@@ -1195,133 +1198,24 @@ +@@ -1195,133 +1199,24 @@ x11_include="not found" x11_link="not found" @@ -162,7 +170,7 @@ else echo "Location of X11 include files: $x11_include/X11" echo "Options for linking with X11: $x11_link" -@@ -1448,7 +1342,7 @@ +@@ -1448,7 +1343,7 @@ then tk_libs="$tk_libs $dllib" elif sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent then diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist index 1441629d7ce8..6a649e7dc430 100644 --- a/lang/ocaml/pkg-plist +++ b/lang/ocaml/pkg-plist @@ -43,7 +43,7 @@ lib/ocaml/arg.cmi lib/ocaml/arg.cmx lib/ocaml/arg.ml lib/ocaml/arg.mli -lib/ocaml/arg.p.cmx +%%PROF%%lib/ocaml/arg.p.cmx lib/ocaml/arith_flags.cmx lib/ocaml/arith_status.cmi lib/ocaml/arith_status.cmx @@ -52,12 +52,12 @@ lib/ocaml/array.cmi lib/ocaml/array.cmx lib/ocaml/array.ml lib/ocaml/array.mli -lib/ocaml/array.p.cmx +%%PROF%%lib/ocaml/array.p.cmx lib/ocaml/arrayLabels.cmi lib/ocaml/arrayLabels.cmx lib/ocaml/arrayLabels.ml lib/ocaml/arrayLabels.mli -lib/ocaml/arrayLabels.p.cmx +%%PROF%%lib/ocaml/arrayLabels.p.cmx lib/ocaml/big_int.cmi lib/ocaml/big_int.cmx lib/ocaml/big_int.mli @@ -72,12 +72,12 @@ lib/ocaml/buffer.cmi lib/ocaml/buffer.cmx lib/ocaml/buffer.ml lib/ocaml/buffer.mli -lib/ocaml/buffer.p.cmx +%%PROF%%lib/ocaml/buffer.p.cmx lib/ocaml/callback.cmi lib/ocaml/callback.cmx lib/ocaml/callback.ml lib/ocaml/callback.mli -lib/ocaml/callback.p.cmx +%%PROF%%lib/ocaml/callback.p.cmx lib/ocaml/caml/alloc.h lib/ocaml/caml/bigarray.h lib/ocaml/caml/callback.h @@ -98,17 +98,17 @@ lib/ocaml/camlinternalLazy.cmi lib/ocaml/camlinternalLazy.cmx lib/ocaml/camlinternalLazy.ml lib/ocaml/camlinternalLazy.mli -lib/ocaml/camlinternalLazy.p.cmx +%%PROF%%lib/ocaml/camlinternalLazy.p.cmx lib/ocaml/camlinternalMod.cmi lib/ocaml/camlinternalMod.cmx lib/ocaml/camlinternalMod.ml lib/ocaml/camlinternalMod.mli -lib/ocaml/camlinternalMod.p.cmx +%%PROF%%lib/ocaml/camlinternalMod.p.cmx lib/ocaml/camlinternalOO.cmi lib/ocaml/camlinternalOO.cmx lib/ocaml/camlinternalOO.ml lib/ocaml/camlinternalOO.mli -lib/ocaml/camlinternalOO.p.cmx +%%PROF%%lib/ocaml/camlinternalOO.p.cmx lib/ocaml/camlp4/Camlp4.cmi lib/ocaml/camlp4/Camlp4Bin.cmi lib/ocaml/camlp4/Camlp4Bin.cmo @@ -258,12 +258,12 @@ lib/ocaml/char.cmi lib/ocaml/char.cmx lib/ocaml/char.ml lib/ocaml/char.mli -lib/ocaml/char.p.cmx +%%PROF%%lib/ocaml/char.p.cmx lib/ocaml/complex.cmi lib/ocaml/complex.cmx lib/ocaml/complex.ml lib/ocaml/complex.mli -lib/ocaml/complex.p.cmx +%%PROF%%lib/ocaml/complex.p.cmx lib/ocaml/condition.mli lib/ocaml/dbm.a lib/ocaml/dbm.cma @@ -276,7 +276,7 @@ lib/ocaml/digest.cmi lib/ocaml/digest.cmx lib/ocaml/digest.ml lib/ocaml/digest.mli -lib/ocaml/digest.p.cmx +%%PROF%%lib/ocaml/digest.p.cmx lib/ocaml/dynlink.a lib/ocaml/dynlink.cma lib/ocaml/dynlink.cmi @@ -290,22 +290,22 @@ lib/ocaml/filename.cmi lib/ocaml/filename.cmx lib/ocaml/filename.ml lib/ocaml/filename.mli -lib/ocaml/filename.p.cmx +%%PROF%%lib/ocaml/filename.p.cmx lib/ocaml/format.cmi lib/ocaml/format.cmx lib/ocaml/format.ml lib/ocaml/format.mli -lib/ocaml/format.p.cmx +%%PROF%%lib/ocaml/format.p.cmx lib/ocaml/gc.cmi lib/ocaml/gc.cmx lib/ocaml/gc.ml lib/ocaml/gc.mli -lib/ocaml/gc.p.cmx +%%PROF%%lib/ocaml/gc.p.cmx lib/ocaml/genlex.cmi lib/ocaml/genlex.cmx lib/ocaml/genlex.ml lib/ocaml/genlex.mli -lib/ocaml/genlex.p.cmx +%%PROF%%lib/ocaml/genlex.p.cmx %%X11%%lib/ocaml/graphics.a %%X11%%lib/ocaml/graphics.cma %%X11%%lib/ocaml/graphics.cmi @@ -320,17 +320,17 @@ lib/ocaml/hashtbl.cmi lib/ocaml/hashtbl.cmx lib/ocaml/hashtbl.ml lib/ocaml/hashtbl.mli -lib/ocaml/hashtbl.p.cmx +%%PROF%%lib/ocaml/hashtbl.p.cmx lib/ocaml/int32.cmi lib/ocaml/int32.cmx lib/ocaml/int32.ml lib/ocaml/int32.mli -lib/ocaml/int32.p.cmx +%%PROF%%lib/ocaml/int32.p.cmx lib/ocaml/int64.cmi lib/ocaml/int64.cmx lib/ocaml/int64.ml lib/ocaml/int64.mli -lib/ocaml/int64.p.cmx +%%PROF%%lib/ocaml/int64.p.cmx lib/ocaml/int_misc.cmx %%TK%%lib/ocaml/labltk/balloon.cmi %%TK%%lib/ocaml/labltk/balloon.cmx @@ -661,13 +661,13 @@ lib/ocaml/lazy.cmi lib/ocaml/lazy.cmx lib/ocaml/lazy.ml lib/ocaml/lazy.mli -lib/ocaml/lazy.p.cmx +%%PROF%%lib/ocaml/lazy.p.cmx lib/ocaml/ld.conf lib/ocaml/lexing.cmi lib/ocaml/lexing.cmx lib/ocaml/lexing.ml lib/ocaml/lexing.mli -lib/ocaml/lexing.p.cmx +%%PROF%%lib/ocaml/lexing.p.cmx lib/ocaml/libasmrun.a lib/ocaml/libasmrunp.a lib/ocaml/libbigarray.a @@ -684,27 +684,27 @@ lib/ocaml/list.cmi lib/ocaml/list.cmx lib/ocaml/list.ml lib/ocaml/list.mli -lib/ocaml/list.p.cmx +%%PROF%%lib/ocaml/list.p.cmx lib/ocaml/listLabels.cmi lib/ocaml/listLabels.cmx lib/ocaml/listLabels.ml lib/ocaml/listLabels.mli -lib/ocaml/listLabels.p.cmx +%%PROF%%lib/ocaml/listLabels.p.cmx lib/ocaml/map.cmi lib/ocaml/map.cmx lib/ocaml/map.ml lib/ocaml/map.mli -lib/ocaml/map.p.cmx +%%PROF%%lib/ocaml/map.p.cmx lib/ocaml/marshal.cmi lib/ocaml/marshal.cmx lib/ocaml/marshal.ml lib/ocaml/marshal.mli -lib/ocaml/marshal.p.cmx +%%PROF%%lib/ocaml/marshal.p.cmx lib/ocaml/moreLabels.cmi lib/ocaml/moreLabels.cmx lib/ocaml/moreLabels.ml lib/ocaml/moreLabels.mli -lib/ocaml/moreLabels.p.cmx +%%PROF%%lib/ocaml/moreLabels.p.cmx lib/ocaml/mutex.mli lib/ocaml/nat.cmi lib/ocaml/nat.cmx @@ -713,7 +713,7 @@ lib/ocaml/nativeint.cmi lib/ocaml/nativeint.cmx lib/ocaml/nativeint.ml lib/ocaml/nativeint.mli -lib/ocaml/nativeint.p.cmx +%%PROF%%lib/ocaml/nativeint.p.cmx lib/ocaml/num.cmi lib/ocaml/num.cmx lib/ocaml/num.mli @@ -725,7 +725,7 @@ lib/ocaml/obj.cmi lib/ocaml/obj.cmx lib/ocaml/obj.ml lib/ocaml/obj.mli -lib/ocaml/obj.p.cmx +%%PROF%%lib/ocaml/obj.p.cmx lib/ocaml/ocamlbuild/ocamlbuild.cmo lib/ocaml/ocamlbuild/ocamlbuild.cmx lib/ocaml/ocamlbuild/ocamlbuild.o @@ -798,41 +798,41 @@ lib/ocaml/oo.cmi lib/ocaml/oo.cmx lib/ocaml/oo.ml lib/ocaml/oo.mli -lib/ocaml/oo.p.cmx +%%PROF%%lib/ocaml/oo.p.cmx lib/ocaml/outcometree.cmi lib/ocaml/outcometree.mli lib/ocaml/parsing.cmi lib/ocaml/parsing.cmx lib/ocaml/parsing.ml lib/ocaml/parsing.mli -lib/ocaml/parsing.p.cmx +%%PROF%%lib/ocaml/parsing.p.cmx lib/ocaml/pervasives.cmi lib/ocaml/pervasives.cmx lib/ocaml/pervasives.ml lib/ocaml/pervasives.mli -lib/ocaml/pervasives.p.cmx +%%PROF%%lib/ocaml/pervasives.p.cmx lib/ocaml/printexc.cmi lib/ocaml/printexc.cmx lib/ocaml/printexc.ml lib/ocaml/printexc.mli -lib/ocaml/printexc.p.cmx +%%PROF%%lib/ocaml/printexc.p.cmx lib/ocaml/printf.cmi lib/ocaml/printf.cmx lib/ocaml/printf.ml lib/ocaml/printf.mli -lib/ocaml/printf.p.cmx +%%PROF%%lib/ocaml/printf.p.cmx lib/ocaml/profiling.cmi lib/ocaml/profiling.cmo lib/ocaml/queue.cmi lib/ocaml/queue.cmx lib/ocaml/queue.ml lib/ocaml/queue.mli -lib/ocaml/queue.p.cmx +%%PROF%%lib/ocaml/queue.p.cmx lib/ocaml/random.cmi lib/ocaml/random.cmx lib/ocaml/random.ml lib/ocaml/random.mli -lib/ocaml/random.p.cmx +%%PROF%%lib/ocaml/random.p.cmx lib/ocaml/ratio.cmi lib/ocaml/ratio.cmx lib/ocaml/ratio.mli @@ -840,28 +840,28 @@ lib/ocaml/scanf.cmi lib/ocaml/scanf.cmx lib/ocaml/scanf.ml lib/ocaml/scanf.mli -lib/ocaml/scanf.p.cmx +%%PROF%%lib/ocaml/scanf.p.cmx lib/ocaml/scrapelabels lib/ocaml/set.cmi lib/ocaml/set.cmx lib/ocaml/set.ml lib/ocaml/set.mli -lib/ocaml/set.p.cmx +%%PROF%%lib/ocaml/set.p.cmx lib/ocaml/sort.cmi lib/ocaml/sort.cmx lib/ocaml/sort.ml lib/ocaml/sort.mli -lib/ocaml/sort.p.cmx +%%PROF%%lib/ocaml/sort.p.cmx lib/ocaml/stack.cmi lib/ocaml/stack.cmx lib/ocaml/stack.ml lib/ocaml/stack.mli -lib/ocaml/stack.p.cmx +%%PROF%%lib/ocaml/stack.p.cmx lib/ocaml/stdLabels.cmi lib/ocaml/stdLabels.cmx lib/ocaml/stdLabels.ml lib/ocaml/stdLabels.mli -lib/ocaml/stdLabels.p.cmx +%%PROF%%lib/ocaml/stdLabels.p.cmx lib/ocaml/std_exit.cmi lib/ocaml/std_exit.cmo lib/ocaml/std_exit.cmx @@ -885,17 +885,17 @@ lib/ocaml/stream.cmi lib/ocaml/stream.cmx lib/ocaml/stream.ml lib/ocaml/stream.mli -lib/ocaml/stream.p.cmx +%%PROF%%lib/ocaml/stream.p.cmx lib/ocaml/string.cmi lib/ocaml/string.cmx lib/ocaml/string.ml lib/ocaml/string.mli -lib/ocaml/string.p.cmx +%%PROF%%lib/ocaml/string.p.cmx lib/ocaml/stringLabels.cmi lib/ocaml/stringLabels.cmx lib/ocaml/stringLabels.ml lib/ocaml/stringLabels.mli -lib/ocaml/stringLabels.p.cmx +%%PROF%%lib/ocaml/stringLabels.p.cmx lib/ocaml/stublibs/dllbigarray.so %%X11%%lib/ocaml/stublibs/dllgraphics.so %%TK%%lib/ocaml/stublibs/dlllabltk.so @@ -910,7 +910,7 @@ lib/ocaml/sys.cmi lib/ocaml/sys.cmx lib/ocaml/sys.ml lib/ocaml/sys.mli -lib/ocaml/sys.p.cmx +%%PROF%%lib/ocaml/sys.p.cmx lib/ocaml/thread.mli lib/ocaml/threadUnix.mli lib/ocaml/threads/condition.cmi @@ -959,7 +959,7 @@ lib/ocaml/weak.cmi lib/ocaml/weak.cmx lib/ocaml/weak.ml lib/ocaml/weak.mli -lib/ocaml/weak.p.cmx +%%PROF%%lib/ocaml/weak.p.cmx %%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile %%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile.nt %%TK%%%%EXAMPLESDIR%%/examples_camltk/addition.ml |