Date: Wed, 26 Mar 2014 17:50:29 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349272 - in head/lang/ocaml: . files Message-ID: <201403261750.s2QHoTV7006221@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Mar 26 17:50:28 2014 New Revision: 349272 URL: http://svnweb.freebsd.org/changeset/ports/349272 QAT: https://qat.redports.org/buildarchive/r349272/ Log: ocaml update 1/4: lang/ocaml upgrade from 3.12 to 4.00 There have been manual outstanding PRs on OCAML that have dragged on for well more than a year. In the meantime, FreeBSD has been painfully stucking on version 3.12 of Ocaml. Meanwhile, DragonFly's dports have been maintaining version 4.00. With a "Just do it" attitude, the dports version of Ocaml has been brought in. This doesn't have stage support, nor is the the latest version available. The idea is just get a working base Ocaml 4.00 in ports and then have the maintainer update the appropriate PRs. As a consequence, updates to omake, ocaml-findlib, and ocaml-images is also required and upcoming. Urged by: portmgr (bapt) Related PR: ports/173364 Related PR: ports/173453 Added: head/lang/ocaml/files/edit_pkg-plist.sed (contents, props changed) head/lang/ocaml/files/patch-config-auto-aux-async_io.c (contents, props changed) head/lang/ocaml/files/patch-testsuite-backtrace-Makefile (contents, props changed) Deleted: head/lang/ocaml/files/patch-Makefile Modified: head/lang/ocaml/Makefile head/lang/ocaml/distinfo head/lang/ocaml/files/manfiles head/lang/ocaml/files/patch-configure (contents, props changed) head/lang/ocaml/files/patch-ocamldoc_Makefile head/lang/ocaml/pkg-plist Modified: head/lang/ocaml/Makefile ============================================================================== --- head/lang/ocaml/Makefile Wed Mar 26 17:46:06 2014 (r349271) +++ head/lang/ocaml/Makefile Wed Mar 26 17:50:28 2014 (r349272) @@ -2,20 +2,19 @@ # $FreeBSD$ PORTNAME= ocaml -PORTVERSION= 3.12.1 -PORTREVISION= 1 +PORTVERSION= 4.00.1 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \ - ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \ - ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/${DISTNAME:R}/ \ ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR= distfiles PKGNAMESUFFIX= ${SFX} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= michael.grunewald@laposte.net COMMENT?= The Objective Caml compiler and programming environment -USE_BZIP2= yes +USES= gmake tar:bzip2 REINPLACE_ARGS= -i "" HAS_CONFIGURE= yes ALL_TARGET= world.opt @@ -23,21 +22,33 @@ STRIP= SSP_UNSAFE= yes MAKE_JOBS_UNSAFE= yes -CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" -cc "${CC}" -as "${AS}" \ - -aspp "${CC} -c" -partialld "${LD} -r" -OPTIONS_DEFINE= X11 TK THREADS CMP_LIB OPT_DEF -OPTIONS_DEFAULT= X11 TK THREADS +CONFIGURE_ARGS= -verbose -prefix "${PREFIX}" \ + -cc "${CC} ${CFLAGS}" \ + -as "${AS} ${ASFLAGS}" \ + -aspp "${CC} -c" \ + -partialld "${LD} -r" + +OPTIONS_DEFINE= X11 TK THREADS OPT_DEF DOCS +OPTIONS_DEFAULT=X11 TK THREADS TK_DESC= LablTk library (requires X11 support) -CMP_LIB_DESC= Install compiler's libraries -OPT_DEF_DESC= Use system-optimized binaries by default +CMP_LIB_DESC= Install compiler libraries +OPT_DEF_DESC= Use system-optimizes binaries by default +PORTDOCS= htmlman ${DOCSDISTNAME}-refman.ps.gz \ + ${DOCSDISTNAME}-refman.pdf MODOPT= camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt PATTERN= [[:space:]]*(do|then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]] +DOCSDISTNAME= ${DISTNAME:C/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/\1.\2/} NO_STAGE= yes - .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MDOCS} +DISTFILES+= ${DOCSDISTNAME}-refman-html.tar.gz \ + ${DOCSDISTNAME}-refman.ps.gz \ + ${DOCSDISTNAME}-refman.pdf +.endif + .if ${PORT_OPTIONS:MTHREADS} PLIST_SUB+= THREADS="" THR_CPP= ${PTHREAD_CFLAGS} @@ -79,27 +90,28 @@ CONFIGURE_ARGS+= -tkdefs \ .endif .include <bsd.port.pre.mk> - .include "${FILESDIR}/manfiles" -.if ${ARCH} == powerpc -ARCH= power -.endif +OCAML_ARCH= ${ARCH:S/x86_64/amd64/:S/powerpc/power/} -.if ${ARCH} == power +.if ${OCAML_ARCH} == power PLIST_SUB+= PROF="@comment " .else PLIST_SUB+= PROF="" .endif -.if ${ARCH} == sparc64 -BROKEN= ocamlc.opt seg-faults on ${ARCH}, please try to fix -.endif - post-extract: -.if ${ARCH} == power +.if ${OCAML_ARCH} == power ${MV} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S .endif +.if ${PORT_OPTIONS:MDOCS} + @if ! (cd ${WRKDIR} && \ + ${TAR} xf ${_DISTDIR}${DOCSDISTNAME}-refman-html.tar.gz \ + ) \ + then \ + exit 1; \ + fi; +.endif post-patch: @${REINPLACE_CMD} \ @@ -131,7 +143,7 @@ post-configure: # user's umask(1) @${FIND} ${WRKDIR} -type f -name Makefile -print0 | \ ${XARGS} -0 -n 5 -x ${REINPLACE_CMD} -E \ - -e 's,\$$\(ARCH\),${ARCH:sparc64=sparc},g' \ + -e 's,\$$\(ARCH\),${OCAML_ARCH},g' \ -e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \4,' \ -e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \4,' \ -e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \ @@ -154,8 +166,16 @@ post-install: "! -name .cvsignore") .endif -.for PROG in camlp4o.opt camlp4r.opt ocamlc.opt ocamldep.opt ocamldoc.opt \ - ocamllex.opt ocamlopt.opt ocamlrun ocamlyacc +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + (cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${DOCSDIR}) + ${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${DOCSDIR} + ${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${DOCSDIR} +.endif + +.for PROG in camlp4o.opt camlp4of.opt camlp4oof.opt camlp4orf.opt \ + camlp4r.opt camlp4rf.opt ocamlc.opt ocamldep.opt ocamldoc.opt \ + ocamllex.opt ocamlopt.opt ocamlrun ocamlyacc @${STRIP_CMD} ${PREFIX}/bin/${PROG} .endfor @@ -175,19 +195,4 @@ post-install: . endfor .endif -# Add compiler's libs if required -.if ${PORT_OPTIONS:MCMP_LIB} - @${MKDIR} ${PREFIX}/lib/ocaml/compiler-lib - @${INSTALL_DATA} ${WRKSRC}/utils/*.cm* ${PREFIX}/lib/ocaml/compiler-lib - @${INSTALL_DATA} ${WRKSRC}/utils/*.o ${PREFIX}/lib/ocaml/compiler-lib - @${INSTALL_DATA} ${WRKSRC}/parsing/*.cm* ${PREFIX}/lib/ocaml/compiler-lib - @${INSTALL_DATA} ${WRKSRC}/parsing/*.o ${PREFIX}/lib/ocaml/compiler-lib - @${INSTALL_DATA} ${WRKSRC}/typing/*.cm* ${PREFIX}/lib/ocaml/compiler-lib - @${INSTALL_DATA} ${WRKSRC}/typing/*.o ${PREFIX}/lib/ocaml/compiler-lib - @${FIND} ${PREFIX}/lib/ocaml/compiler-lib -type f | \ - ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} - @${ECHO_CMD} "@dirrm lib/ocaml/compiler-lib" >> ${TMPPLIST} -.endif - @${ECHO_CMD} "@unexec rmdir "%D/lib/ocaml" 2>/dev/null || true" >> ${TMPPLIST} - .include <bsd.port.post.mk> Modified: head/lang/ocaml/distinfo ============================================================================== --- head/lang/ocaml/distinfo Wed Mar 26 17:46:06 2014 (r349271) +++ head/lang/ocaml/distinfo Wed Mar 26 17:50:28 2014 (r349272) @@ -1,2 +1,8 @@ -SHA256 (ocaml-3.12.1.tar.bz2) = edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d -SIZE (ocaml-3.12.1.tar.bz2) = 2949124 +SHA256 (ocaml-4.00.1.tar.bz2) = 33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951 +SIZE (ocaml-4.00.1.tar.bz2) = 2762205 +SHA256 (ocaml-4.00-refman-html.tar.gz) = 8ca43859d8a71f0941a2453b7b808d7e58ad54804a9cf285875fa30e6576b31a +SIZE (ocaml-4.00-refman-html.tar.gz) = 549757 +SHA256 (ocaml-4.00-refman.ps.gz) = 6146264fef7ae73f7ebb8dc49a3b1adae9d5bd4f9a14a2670c9d43f7e6a253c3 +SIZE (ocaml-4.00-refman.ps.gz) = 1075658 +SHA256 (ocaml-4.00-refman.pdf) = 76ba2cf60a605b2427f995563f6dc6c7dbb39be6b066f6d96b23926e8cc9babc +SIZE (ocaml-4.00-refman.pdf) = 1453678 Added: head/lang/ocaml/files/edit_pkg-plist.sed ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ocaml/files/edit_pkg-plist.sed Wed Mar 26 17:50:28 2014 (r349272) @@ -0,0 +1,6 @@ +/.p.cmx$/s@^@%%PROF%%@ +/examples_labeltk/{ + s@share/examples@%%EXAMPLESDIR%%@ + s@^@%%TK%%@ +} +/graphics/s@^@%%X11%%@ Modified: head/lang/ocaml/files/manfiles ============================================================================== --- head/lang/ocaml/files/manfiles Wed Mar 26 17:46:06 2014 (r349271) +++ head/lang/ocaml/files/manfiles Wed Mar 26 17:50:28 2014 (r349272) @@ -8,91 +8,94 @@ MAN1= ocaml.1 \ ocamllex.1 \ ocamlmktop.1 \ ocamlopt.1 \ + ocamloptp.1 \ ocamlprof.1 \ ocamlrun.1 \ ocamlyacc.1 -MANN= Arg.n \ - Array.n \ - ArrayLabels.n \ - Bigarray.Array1.n \ - Bigarray.Array2.n \ - Bigarray.Array3.n \ - Bigarray.Genarray.n \ - Bigarray.n \ - Buffer.n \ - Callback.n \ - CamlinternalOO.n \ - CamlinternalLazy.n \ - CamlinternalMod.n \ - Char.n \ - Complex.n \ - Digest.n \ - Filename.n \ - Format.n \ - Gc.n \ - Genlex.n \ - Hashtbl.HashedType.n \ - Hashtbl.Make.n \ - Hashtbl.S.n \ - Hashtbl.n \ - Int32.n \ - Int64.n \ - Lazy.n \ - Lexing.n \ - List.n \ - ListLabels.n \ - Map.Make.n \ - Map.OrderedType.n \ - Map.S.n \ - Map.n \ - Marshal.n \ - MoreLabels.Hashtbl.HashedType.n \ - MoreLabels.Hashtbl.Make.n \ - MoreLabels.Hashtbl.S.n \ - MoreLabels.Hashtbl.n \ - MoreLabels.Map.Make.n \ - MoreLabels.Map.OrderedType.n \ - MoreLabels.Map.S.n \ - MoreLabels.Map.n \ - MoreLabels.Set.Make.n \ - MoreLabels.Set.OrderedType.n \ - MoreLabels.Set.S.n \ - MoreLabels.Set.n \ - MoreLabels.n \ - Nativeint.n \ - Num.n \ - Obj.n \ - Oo.n \ - Parsing.n \ - Pervasives.LargeFile.n \ - Pervasives.n \ - Printexc.n \ - Printf.n \ - Queue.n \ - Random.n \ - Random.State.n \ - Scanf.Scanning.n \ - Scanf.n \ - Set.Make.n \ - Set.OrderedType.n \ - Set.S.n \ - Set.n \ - Sort.n \ - Stack.n \ - StdLabels.Array.n \ - StdLabels.List.n \ - StdLabels.String.n \ - StdLabels.n \ - Str.n \ - Stream.n \ - String.n \ - StringLabels.n \ - Sys.n \ - Unix.LargeFile.n \ - Unix.n \ - Weak.Make.n \ - Weak.S.n \ - Weak.n +MANN= Arg.3o \ + Array.3o \ + ArrayLabels.3o \ + Bigarray.3o \ + Bigarray.Array1.3o \ + Bigarray.Array2.3o \ + Bigarray.Array3.3o \ + Bigarray.Genarray.3o \ + Buffer.3o \ + Callback.3o \ + CamlinternalLazy.3o \ + CamlinternalMod.3o \ + CamlinternalOO.3o \ + Complex.3o \ + Digest.3o \ + Filename.3o \ + Format.3o \ + Gc.3o \ + Genlex.3o \ + Hashtbl.3o \ + Hashtbl.HashedType.3o \ + Hashtbl.Make.3o \ + Hashtbl.MakeSeeded.3o \ + Hashtbl.S.3o \ + Hashtbl.SeededHashedType.3o \ + Hashtbl.SeededS.3o \ + Int32.3o \ + Int64.3o \ + Lexing.3o \ + List.3o \ + ListLabels.3o \ + Map.3o \ + Map.Make.3o \ + Map.OrderedType.3o \ + Map.S.3o \ + Marshal.3o \ + MoreLabels.3o \ + MoreLabels.Hashtbl.3o \ + MoreLabels.Hashtbl.HashedType.3o \ + MoreLabels.Hashtbl.Make.3o \ + MoreLabels.Hashtbl.MakeSeeded.3o \ + MoreLabels.Hashtbl.S.3o \ + MoreLabels.Hashtbl.SeededHashedType.3o \ + MoreLabels.Hashtbl.SeededS.3o \ + MoreLabels.Map.3o \ + MoreLabels.Map.Make.3o \ + MoreLabels.Map.OrderedType.3o \ + MoreLabels.Map.S.3o \ + MoreLabels.Set.3o \ + MoreLabels.Set.Make.3o \ + MoreLabels.Set.OrderedType.3o \ + MoreLabels.Set.S.3o \ + Nativeint.3o \ + Num.3o \ + Obj.3o \ + Oo.3o \ + Parsing.3o \ + Pervasives.3o \ + Pervasives.LargeFile.3o \ + Printexc.3o \ + Printf.3o \ + Queue.3o \ + Random.3o \ + Random.State.3o \ + Scanf.3o \ + Scanf.Scanning.3o \ + Set.Make.3o \ + Set.OrderedType.3o \ + Set.S.3o \ + Sort.3o \ + Stack.3o \ + StdLabels.3o \ + StdLabels.Array.3o \ + StdLabels.List.3o \ + StdLabels.String.3o \ + Str.3o \ + Stream.3o \ + StringLabels.3o \ + Sys.3o \ + Unix.3o \ + Unix.LargeFile.3o \ + Weak.3o \ + Weak.Make.3o \ + Weak.S.3o MLINKS= ocamlc.1 ocamlc.opt.1 ocamlopt.1 ocamlopt.opt.1 Added: head/lang/ocaml/files/patch-config-auto-aux-async_io.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ocaml/files/patch-config-auto-aux-async_io.c Wed Mar 26 17:50:28 2014 (r349272) @@ -0,0 +1,10 @@ +--- config/auto-aux/async_io.c 2012-11-01 17:36:02.000000000 +0100 ++++ config/auto-aux/async_io.c.orig 2012-11-01 17:35:46.000000000 +0100 +@@ -13,7 +13,8 @@ + + /* $Id: async_io.c 11156 2011-07-27 14:17:02Z doligez $ */ + ++#include <stdlib.h> + #include <stdio.h> + #include <fcntl.h> + #include <signal.h> Modified: head/lang/ocaml/files/patch-configure ============================================================================== --- head/lang/ocaml/files/patch-configure Wed Mar 26 17:46:06 2014 (r349271) +++ head/lang/ocaml/files/patch-configure Wed Mar 26 17:50:28 2014 (r349272) @@ -1,200 +1,143 @@ -$FreeBSD$ - ---- configure.orig 2011-07-04 22:15:01.000000000 +0100 -+++ configure 2012-01-15 20:29:30.319674803 +0000 -@@ -85,6 +85,8 @@ +--- configure.orig 2012-06-26 15:33:50.000000000 +0000 ++++ configure +@@ -88,6 +88,8 @@ while : ; do withcurses=no;; - -no-shared-libs) + -no-shared-libs|--no-shared-libs) withsharedlibs=no;; + -no-x11|--no-x11) + x11_wanted=no;; -x11include*|--x11include*) x11_include_dir=$2; shift;; -x11lib*|--x11lib*) -@@ -521,7 +523,7 @@ +@@ -537,9 +539,9 @@ if test $withsharedlibs = "yes"; then mksharedlib="$flexlink" mkmaindll="$flexlink -maindll" shared_libraries_supported=true;; - *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*) -+ *-*-linux-gnu|*-*-linux|*-*-freebsd*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*) ++ *-*-linux-gnu|*-*-linux|*-*-dragonfly*|*-*-freebsd*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*) sharedcccompopts="-fPIC" - mksharedlib="$bytecc -shared" +- mksharedlib="$bytecc -shared" ++ mksharedlib="$bytecc $bytecclinkopts -shared" bytecclinkopts="$bytecclinkopts -Wl,-E" -@@ -636,6 +638,7 @@ - i[345]86-*-netbsd*) natdynlink=true;; - x86_64-*-netbsd*) natdynlink=true;; - i386-*-gnu0.3) natdynlink=true;; -+ *-*-freebsd*) natdynlink=true;; - esac - fi - -@@ -687,6 +690,7 @@ - hppa*-*-gnu*) arch=hppa; system=gnu;; + byteccrpath="-Wl,-rpath," + mksharedlibrpath="-Wl,-rpath," +@@ -549,7 +551,7 @@ if test $withsharedlibs = "yes"; then + case "$bytecc" in + gcc*) + sharedcccompopts="-fPIC" +- mksharedlib="$bytecc -shared" ++ mksharedlib="$bytecc $bytecclinkopts -shared" + byteccrpath="-Wl,-rpath," + mksharedlibrpath="-Wl,-rpath," + shared_libraries_supported=true;; +@@ -565,11 +567,11 @@ if test $withsharedlibs = "yes"; then + gcc*) + sharedcccompopts="-fPIC" + if sh ./solaris-ld; then +- mksharedlib="$bytecc -shared" ++ mksharedlib="$bytecc $bytecclinkopts -shared" + byteccrpath="-R" + mksharedlibrpath="-R" + else +- mksharedlib="$bytecc -shared" ++ mksharedlib="$bytecc $bytecclinkopts -shared" + bytecclinkopts="$bytecclinkopts -Wl,-E" + natdynlinkopts="-Wl,-E" + byteccrpath="-Wl,-rpath," +@@ -593,12 +595,12 @@ if test $withsharedlibs = "yes"; then + mksharedlibrpath="-rpath " + shared_libraries_supported=true;; + i[3456]86-*-darwin[89].*) +- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress" ++ mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress -read_only_relocs suppress" + bytecccompopts="$dl_defs $bytecccompopts" + dl_needs_underscore=false + shared_libraries_supported=true;; + *-apple-darwin*) +- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress" ++ mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress" + bytecccompopts="$dl_defs $bytecccompopts" + dl_needs_underscore=false + shared_libraries_supported=true;; +@@ -608,7 +610,7 @@ if test $withsharedlibs = "yes"; then + shared_libraries_supported=false;; + *-*-openbsd*) + sharedcccompopts="-fPIC" +- mksharedlib="$bytecc -shared" ++ mksharedlib="$bytecc $bytecclinkopts -shared" + bytecclinkopts="$bytecclinkopts -Wl,-E" + natdynlinkopts="-Wl,-E" + byteccrpath="-Wl,-rpath," +@@ -633,7 +635,7 @@ if test $withsharedlibs = "yes"; then + x86_64-*-linux*) natdynlink=true;; + i[3456]86-*-darwin[89].*) natdynlink=true;; + i[3456]86-*-darwin*) +- if test $arch64 == true; then ++ if test $arch64 = true; then + natdynlink=true + fi;; + x86_64-*-darwin*) natdynlink=true;; +@@ -641,6 +643,8 @@ if test $withsharedlibs = "yes"; then + sparc*-*-linux*) natdynlink=true;; + i686-*-kfreebsd*) natdynlink=true;; + x86_64-*-kfreebsd*) natdynlink=true;; ++ i[345]86-*-dragonfly*) natdynlink=true;; ++ x86_64-*-dragonfly*) natdynlink=true;; + i[345]86-*-freebsd*) natdynlink=true;; + x86_64-*-freebsd*) natdynlink=true;; + i[345]86-*-openbsd*) natdynlink=true;; +@@ -672,6 +676,7 @@ case "$host" in + sparc*-*-gnu*) arch=sparc; system=gnu;; + 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*) if $arch64; then + arch=amd64; system=solaris +@@ -687,6 +692,7 @@ case "$host" in + fi;; + i[3456]86-*-gnu*) arch=i386; system=gnu;; powerpc*-*-linux*) arch=power; model=ppc; system=elf;; ++ powerpc-*-freebsd*) 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;; -@@ -796,6 +800,7 @@ - i386,*,bsd_elf) profiling='prof';; - amd64,*,macosx) profiling='prof';; - i386,*,macosx) profiling='prof';; -+ *,*,freebsd) profiling='prof';; - sparc,*,solaris) - profiling='prof' - case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; -@@ -1256,133 +1261,24 @@ - x11_include="not found" - x11_link="not found" - --for dir in \ -- $x11_include_dir \ -- \ -- /usr/X11R7/include \ -- /usr/include/X11R7 \ -- /usr/local/X11R7/include \ -- /usr/local/include/X11R7 \ -- /opt/X11R7/include \ -- \ -- /usr/X11R6/include \ -- /usr/include/X11R6 \ -- /usr/local/X11R6/include \ -- /usr/local/include/X11R6 \ -- /opt/X11R6/include \ -- \ -- /usr/X11/include \ -- /usr/include/X11 \ -- /usr/local/X11/include \ -- /usr/local/include/X11 \ -- /opt/X11/include \ -- \ -- /usr/X11R5/include \ -- /usr/include/X11R5 \ -- /usr/local/X11R5/include \ -- /usr/local/include/X11R5 \ -- /usr/local/x11r5/include \ -- /opt/X11R5/include \ -- \ -- /usr/X11R4/include \ -- /usr/include/X11R4 \ -- /usr/local/X11R4/include \ -- /usr/local/include/X11R4 \ -- \ -- /usr/X386/include \ -- /usr/x386/include \ -- /usr/XFree86/include/X11 \ -- \ -- /usr/include \ -- /usr/local/include \ -- /usr/unsupported/include \ -- /usr/athena/include \ -- /usr/lpp/Xamples/include \ -- \ -- /usr/openwin/include \ -- /usr/openwin/share/include \ -- ; \ --do -- if test -f $dir/X11/X.h; then -- x11_include=$dir -- break -- fi --done -- --if test "$x11_include" = "not found"; then -- x11_try_lib_dir='' --else -- x11_try_lib_dir=`echo $x11_include | sed -e 's|include|lib|'` -+if [ -n "$x11_include_dir" ]; then -+ x11_include="$x11_include_dir" +@@ -700,6 +706,7 @@ case "$host" in + arm*-*-linux-gnueabi) arch=arm; system=linux_eabi;; + x86_64-*-linux*) arch=amd64; system=linux;; + x86_64-*-gnu*) arch=amd64; system=gnu;; ++ x86_64-*-dragonfly*) arch=amd64; system=dragonfly;; + x86_64-*-freebsd*) arch=amd64; system=freebsd;; + x86_64-*-netbsd*) arch=amd64; system=netbsd;; + x86_64-*-openbsd*) arch=amd64; system=openbsd;; +@@ -724,7 +731,7 @@ else fi --for dir in \ -- $x11_lib_dir \ -- $x11_try_lib_dir \ -- \ -- /usr/X11R6/lib64 \ -- /usr/X11R6/lib \ -- /usr/lib/X11R6 \ -- /usr/local/X11R6/lib \ -- /usr/local/lib/X11R6 \ -- /opt/X11R6/lib \ -- \ -- /usr/X11/lib \ -- /usr/lib/X11 \ -- /usr/local/X11/lib \ -- /usr/local/lib/X11 \ -- /opt/X11/lib \ -- \ -- /usr/X11R5/lib \ -- /usr/lib/X11R5 \ -- /usr/local/X11R5/lib \ -- /usr/local/lib/X11R5 \ -- /usr/local/x11r5/lib \ -- /opt/X11R5/lib \ -- \ -- /usr/X11R4/lib \ -- /usr/lib/X11R4 \ -- /usr/local/X11R4/lib \ -- /usr/local/lib/X11R4 \ -- \ -- /usr/X386/lib \ -- /usr/x386/lib \ -- /usr/XFree86/lib/X11 \ -- \ -- /usr/lib64 \ -- /usr/lib \ -- /usr/local/lib \ -- /usr/unsupported/lib \ -- /usr/athena/lib \ -- /usr/lpp/Xamples/lib \ -- /lib/usr/lib/X11 \ -- \ -- /usr/openwin/lib \ -- /usr/openwin/share/lib \ -- ; \ --do -- if test -f $dir/libX11.a || \ -- test -f $dir/libX11.so || \ -- test -f $dir/libX11.dll.a || \ -- test -f $dir/libX11.dylib || \ -- test -f $dir/libX11.sa; then -- if test $dir = /usr/lib; then -- x11_link="-lX11" -- else -- x11_libs="-L$dir" -- case "$host" in -- *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";; -- *) x11_link="-L$dir -lX11";; -- esac -- fi -- break -- fi --done -- -+if [ -n "$x11_lib_dir" ]; then -+ x11_link="-L$x11_lib_dir -lX11" -+ x11_libs="-L$x11_lib_dir" -+fi + nativecccompopts='' +-nativecclinkopts='' ++nativecclinkopts="" + nativeccrpath="$byteccrpath" + + case "$arch,$nativecc,$system,$host_type" in +@@ -786,6 +793,8 @@ case "$arch,$model,$system" in + amd64,*,linux) profiling='prof';; + amd64,*,gnu) profiling='prof';; + arm,*,linux*) profiling='prof';; ++ *,*,dragonfly) profiling='prof';; ++ *,*,freebsd) profiling='prof';; + *) profiling='noprof';; + esac + +@@ -1544,10 +1553,10 @@ fi + # Look for BFD library - if test "$x11_include" = "not found" || test "$x11_link" = "not found" - then - echo "X11 not found, the \"graph\" library will not be supported." - x11_include="" -+elif test "$x11_wanted" = "no" -+then -+ echo "X11 support was disabled, the \"graph\" library will not be supported." -+ x11_include="" -+ x11_link="" + if ./hasgot -i bfd.h && \ +- ./hasgot -lbfd -ldl -liberty -lz bfd_openr; then ++ ./hasgot -lbfd $dllib -liberty -lz bfd_openr; then + echo "BFD library found." + echo "#define HAS_LIBBFD" >> s.h +- echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile ++ echo "LIBBFD_LINK=-lbfd $dllib -liberty -lz" >> Makefile else - echo "Location of X11 include files: $x11_include/X11" - echo "Options for linking with X11: $x11_link" -@@ -1509,7 +1405,7 @@ - then tk_libs="$tk_libs $dllib" - elif sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent - then -- tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib" -+ tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj.$tclmin $dllib" - elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent - then - tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib" + echo "BFD library not found, 'objinfo' will be unable to display info on .cmxs files" + echo "LIBBFD_LINK=" >> Makefile Modified: head/lang/ocaml/files/patch-ocamldoc_Makefile ============================================================================== --- head/lang/ocaml/files/patch-ocamldoc_Makefile Wed Mar 26 17:46:06 2014 (r349271) +++ head/lang/ocaml/files/patch-ocamldoc_Makefile Wed Mar 26 17:50:28 2014 (r349272) @@ -9,16 +9,3 @@ INSTALL_MLIS=odoc_info.mli INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi) -@@ -265,7 +265,11 @@ - $(CP) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR) - $(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR) - if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi -- if test -d stdlib_man; then $(CP) stdlib_man/* $(INSTALL_MANODIR); else : ; fi -+ if test -d stdlib_man; then \ -+ for f in stdlib_man/*; do \ -+ $(BSD_INSTALL_MAN) $$f $(INSTALL_MANODIR)/`basename $$f .3o`.n; \ -+ done; \ -+ fi - - installopt: - if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi Added: head/lang/ocaml/files/patch-testsuite-backtrace-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ocaml/files/patch-testsuite-backtrace-Makefile Wed Mar 26 17:50:28 2014 (r349272) @@ -0,0 +1,11 @@ +--- testsuite/tests/backtrace/Makefile.orig 2012-11-01 20:28:23.000000000 +0100 ++++ testsuite/tests/backtrace/Makefile 2012-11-01 20:28:30.000000000 +0100 +@@ -6,7 +6,7 @@ + $(OCAMLC) -g -o $(EXECNAME) $$file; \ + for arg in a b c d ''; do \ + printf " ... testing '$$file' (with argument '$$arg'):"; \ +- OCAMLRUNPARAM=b=1 $(EXECNAME) $$arg > `basename $$file ml`$$arg.result 2>&1; \ ++ sh -c "OCAMLRUNPARAM=b=1 $(EXECNAME) $$arg; true" > `basename $$file ml`$$arg.result 2>&1; \ + $(DIFF) `basename $$file ml`$$arg.reference `basename $$file ml`$$arg.result > /dev/null && echo " => passed" || (echo " => failed" && exit 1); \ + done; \ + done Modified: head/lang/ocaml/pkg-plist ============================================================================== --- head/lang/ocaml/pkg-plist Wed Mar 26 17:46:06 2014 (r349271) +++ head/lang/ocaml/pkg-plist Wed Mar 26 17:50:28 2014 (r349272) @@ -1,4 +1,3 @@ -bin/ocamlobjinfo bin/camlp4 bin/camlp4boot bin/camlp4o @@ -33,12 +32,15 @@ bin/ocamllex bin/ocamllex.opt bin/ocamlmklib bin/ocamlmktop +bin/ocamlobjinfo bin/ocamlopt bin/ocamlopt.opt +bin/ocamloptp bin/ocamlprof bin/ocamlrun bin/ocamlyacc lib/ocaml/Makefile.config +lib/ocaml/VERSION lib/ocaml/arg.cmi lib/ocaml/arg.cmx lib/ocaml/arg.ml @@ -85,6 +87,7 @@ lib/ocaml/caml/compatibility.h lib/ocaml/caml/config.h lib/ocaml/caml/custom.h lib/ocaml/caml/fail.h +lib/ocaml/caml/hash.h lib/ocaml/caml/intext.h lib/ocaml/caml/memory.h lib/ocaml/caml/misc.h @@ -261,29 +264,158 @@ lib/ocaml/char.cmx lib/ocaml/char.ml lib/ocaml/char.mli %%PROF%%lib/ocaml/char.p.cmx +lib/ocaml/compiler-libs/annot.cmi +lib/ocaml/compiler-libs/arch.cmi +lib/ocaml/compiler-libs/asmgen.cmi +lib/ocaml/compiler-libs/asmlibrarian.cmi +lib/ocaml/compiler-libs/asmlink.cmi +lib/ocaml/compiler-libs/asmpackager.cmi +lib/ocaml/compiler-libs/asttypes.cmi +lib/ocaml/compiler-libs/btype.cmi +lib/ocaml/compiler-libs/bytegen.cmi +lib/ocaml/compiler-libs/bytelibrarian.cmi +lib/ocaml/compiler-libs/bytelink.cmi +lib/ocaml/compiler-libs/bytepackager.cmi +lib/ocaml/compiler-libs/bytesections.cmi +lib/ocaml/compiler-libs/ccomp.cmi +lib/ocaml/compiler-libs/clambda.cmi +lib/ocaml/compiler-libs/clflags.cmi +lib/ocaml/compiler-libs/closure.cmi +lib/ocaml/compiler-libs/cmi_format.cmi +lib/ocaml/compiler-libs/cmm.cmi +lib/ocaml/compiler-libs/cmmgen.cmi +lib/ocaml/compiler-libs/cmo_format.cmi +lib/ocaml/compiler-libs/cmt_format.cmi +lib/ocaml/compiler-libs/cmx_format.cmi +lib/ocaml/compiler-libs/coloring.cmi +lib/ocaml/compiler-libs/comballoc.cmi +lib/ocaml/compiler-libs/compile.cmi +lib/ocaml/compiler-libs/compilenv.cmi +lib/ocaml/compiler-libs/config.cmi +lib/ocaml/compiler-libs/consistbl.cmi +lib/ocaml/compiler-libs/ctype.cmi +lib/ocaml/compiler-libs/datarepr.cmi +lib/ocaml/compiler-libs/debuginfo.cmi +lib/ocaml/compiler-libs/dll.cmi +lib/ocaml/compiler-libs/emit.cmi +lib/ocaml/compiler-libs/emitaux.cmi +lib/ocaml/compiler-libs/emitcode.cmi +lib/ocaml/compiler-libs/env.cmi +lib/ocaml/compiler-libs/errors.cmi +lib/ocaml/compiler-libs/expunge.cmi +lib/ocaml/compiler-libs/genprintval.cmi +lib/ocaml/compiler-libs/ident.cmi +lib/ocaml/compiler-libs/includeclass.cmi +lib/ocaml/compiler-libs/includecore.cmi +lib/ocaml/compiler-libs/includemod.cmi +lib/ocaml/compiler-libs/instruct.cmi +lib/ocaml/compiler-libs/interf.cmi +lib/ocaml/compiler-libs/lambda.cmi +lib/ocaml/compiler-libs/lexer.cmi +lib/ocaml/compiler-libs/linearize.cmi +lib/ocaml/compiler-libs/liveness.cmi +lib/ocaml/compiler-libs/location.cmi +lib/ocaml/compiler-libs/longident.cmi +lib/ocaml/compiler-libs/mach.cmi +lib/ocaml/compiler-libs/main.cmi +lib/ocaml/compiler-libs/main.cmo +lib/ocaml/compiler-libs/main.cmx +lib/ocaml/compiler-libs/main.o +lib/ocaml/compiler-libs/main_args.cmi +lib/ocaml/compiler-libs/matching.cmi +lib/ocaml/compiler-libs/meta.cmi +lib/ocaml/compiler-libs/misc.cmi +lib/ocaml/compiler-libs/mtype.cmi +lib/ocaml/compiler-libs/ocamlbytecomp.a +lib/ocaml/compiler-libs/ocamlbytecomp.cma +lib/ocaml/compiler-libs/ocamlbytecomp.cmxa +lib/ocaml/compiler-libs/ocamlcommon.a +lib/ocaml/compiler-libs/ocamlcommon.cma +lib/ocaml/compiler-libs/ocamlcommon.cmxa +lib/ocaml/compiler-libs/ocamloptcomp.a +lib/ocaml/compiler-libs/ocamloptcomp.cma +lib/ocaml/compiler-libs/ocamloptcomp.cmxa +lib/ocaml/compiler-libs/ocamltoplevel.cma +lib/ocaml/compiler-libs/opcodes.cmi +lib/ocaml/compiler-libs/oprint.cmi +lib/ocaml/compiler-libs/optcompile.cmi +lib/ocaml/compiler-libs/opterrors.cmi +lib/ocaml/compiler-libs/optmain.cmi +lib/ocaml/compiler-libs/optmain.cmo +lib/ocaml/compiler-libs/optmain.cmx +lib/ocaml/compiler-libs/optmain.o +lib/ocaml/compiler-libs/outcometree.cmi +lib/ocaml/compiler-libs/parmatch.cmi +lib/ocaml/compiler-libs/parse.cmi +lib/ocaml/compiler-libs/parser.cmi +lib/ocaml/compiler-libs/parsetree.cmi +lib/ocaml/compiler-libs/path.cmi +lib/ocaml/compiler-libs/pparse.cmi +lib/ocaml/compiler-libs/predef.cmi +lib/ocaml/compiler-libs/primitive.cmi +lib/ocaml/compiler-libs/printast.cmi +lib/ocaml/compiler-libs/printclambda.cmi +lib/ocaml/compiler-libs/printcmm.cmi +lib/ocaml/compiler-libs/printinstr.cmi +lib/ocaml/compiler-libs/printlambda.cmi +lib/ocaml/compiler-libs/printlinear.cmi +lib/ocaml/compiler-libs/printmach.cmi +lib/ocaml/compiler-libs/printtyp.cmi +lib/ocaml/compiler-libs/printtyped.cmi +lib/ocaml/compiler-libs/proc.cmi +lib/ocaml/compiler-libs/reg.cmi +lib/ocaml/compiler-libs/reload.cmi +lib/ocaml/compiler-libs/reloadgen.cmi +lib/ocaml/compiler-libs/runtimedef.cmi +lib/ocaml/compiler-libs/schedgen.cmi +lib/ocaml/compiler-libs/scheduling.cmi +lib/ocaml/compiler-libs/selectgen.cmi +lib/ocaml/compiler-libs/selection.cmi +lib/ocaml/compiler-libs/simplif.cmi +lib/ocaml/compiler-libs/spill.cmi +lib/ocaml/compiler-libs/split.cmi +lib/ocaml/compiler-libs/stypes.cmi +lib/ocaml/compiler-libs/subst.cmi +lib/ocaml/compiler-libs/switch.cmi +lib/ocaml/compiler-libs/symtable.cmi +lib/ocaml/compiler-libs/syntaxerr.cmi +lib/ocaml/compiler-libs/tbl.cmi +lib/ocaml/compiler-libs/terminfo.cmi +lib/ocaml/compiler-libs/topdirs.cmi +lib/ocaml/compiler-libs/toploop.cmi +lib/ocaml/compiler-libs/topmain.cmi +lib/ocaml/compiler-libs/topstart.cmi +lib/ocaml/compiler-libs/topstart.cmo +lib/ocaml/compiler-libs/trace.cmi +lib/ocaml/compiler-libs/translclass.cmi +lib/ocaml/compiler-libs/translcore.cmi +lib/ocaml/compiler-libs/translmod.cmi +lib/ocaml/compiler-libs/translobj.cmi +lib/ocaml/compiler-libs/typeclass.cmi +lib/ocaml/compiler-libs/typecore.cmi +lib/ocaml/compiler-libs/typedecl.cmi +lib/ocaml/compiler-libs/typedtree.cmi +lib/ocaml/compiler-libs/typemod.cmi +lib/ocaml/compiler-libs/typeopt.cmi +lib/ocaml/compiler-libs/types.cmi +lib/ocaml/compiler-libs/typetexp.cmi +lib/ocaml/compiler-libs/warnings.cmi lib/ocaml/complex.cmi lib/ocaml/complex.cmx lib/ocaml/complex.ml lib/ocaml/complex.mli %%PROF%%lib/ocaml/complex.p.cmx %%THREADS%%lib/ocaml/condition.mli -lib/ocaml/dbm.a -lib/ocaml/dbm.cma -lib/ocaml/dbm.cmi -lib/ocaml/dbm.cmx -lib/ocaml/dbm.cmxa -lib/ocaml/dbm.cmxs -lib/ocaml/dbm.mli lib/ocaml/digest.cmi lib/ocaml/digest.cmx lib/ocaml/digest.ml lib/ocaml/digest.mli %%PROF%%lib/ocaml/digest.p.cmx lib/ocaml/dynlink.a -lib/ocaml/dynlink.cmx -lib/ocaml/dynlink.cmxa lib/ocaml/dynlink.cma lib/ocaml/dynlink.cmi +lib/ocaml/dynlink.cmx +lib/ocaml/dynlink.cmxa lib/ocaml/dynlink.mli %%THREADS%%lib/ocaml/event.mli lib/ocaml/expunge @@ -671,7 +803,6 @@ lib/ocaml/libcamlrun.a lib/ocaml/libcamlrun_shared.so lib/ocaml/libcamlstr.a %%X11%%lib/ocaml/libgraphics.a -lib/ocaml/libmldbm.a lib/ocaml/libnums.a %%THREADS%%lib/ocaml/libthreads.a %%THREADS%%lib/ocaml/libthreadsnat.a @@ -721,8 +852,8 @@ lib/ocaml/obj.cmi lib/ocaml/obj.cmx lib/ocaml/obj.ml lib/ocaml/obj.mli -lib/ocaml/objinfo_helper %%PROF%%lib/ocaml/obj.p.cmx +lib/ocaml/objinfo_helper lib/ocaml/ocamlbuild/ocamlbuild.cmo lib/ocaml/ocamlbuild/ocamlbuild.cmx lib/ocaml/ocamlbuild/ocamlbuild.o @@ -756,6 +887,7 @@ lib/ocaml/ocamldoc/odoc_dep.cmi lib/ocaml/ocamldoc/odoc_dot.cmi lib/ocaml/ocamldoc/odoc_env.cmi lib/ocaml/ocamldoc/odoc_exception.cmi +lib/ocaml/ocamldoc/odoc_gen.cmi lib/ocaml/ocamldoc/odoc_global.cmi lib/ocaml/ocamldoc/odoc_html.cmi lib/ocaml/ocamldoc/odoc_info.a @@ -796,8 +928,6 @@ lib/ocaml/oo.cmx lib/ocaml/oo.ml lib/ocaml/oo.mli %%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 @@ -820,6 +950,8 @@ lib/ocaml/printf.mli %%PROF%%lib/ocaml/printf.p.cmx lib/ocaml/profiling.cmi lib/ocaml/profiling.cmo +lib/ocaml/profiling.cmx +lib/ocaml/profiling.o lib/ocaml/queue.cmi lib/ocaml/queue.cmx lib/ocaml/queue.ml @@ -863,7 +995,7 @@ lib/ocaml/std_exit.cmo lib/ocaml/std_exit.cmx lib/ocaml/std_exit.ml lib/ocaml/std_exit.o -lib/ocaml/std_exit.p.cmx +%%PROF%%lib/ocaml/std_exit.p.cmx lib/ocaml/std_exit.p.o lib/ocaml/stdlib.a lib/ocaml/stdlib.cma @@ -893,10 +1025,9 @@ lib/ocaml/stringLabels.ml lib/ocaml/stringLabels.mli %%PROF%%lib/ocaml/stringLabels.p.cmx lib/ocaml/stublibs/dllbigarray.so +lib/ocaml/stublibs/dllcamlstr.so %%X11%%lib/ocaml/stublibs/dllgraphics.so %%TK%%lib/ocaml/stublibs/dlllabltk.so -lib/ocaml/stublibs/dllcamlstr.so -lib/ocaml/stublibs/dllmldbm.so lib/ocaml/stublibs/dllnums.so %%THREADS%%lib/ocaml/stublibs/dllthreads.so lib/ocaml/stublibs/dllunix.so @@ -922,10 +1053,6 @@ lib/ocaml/sys.mli %%THREADS%%lib/ocaml/threads/threads.cma %%THREADS%%lib/ocaml/threads/threads.cmxa lib/ocaml/topdirs.cmi -lib/ocaml/toplevellib.cma -lib/ocaml/toploop.cmi -lib/ocaml/topmain.cmi -lib/ocaml/topstart.cmo lib/ocaml/unix.a *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403261750.s2QHoTV7006221>