diff options
-rw-r--r-- | lang/ocaml/Makefile | 8 | ||||
-rw-r--r-- | lang/ocaml/distinfo | 6 | ||||
-rw-r--r-- | lang/ocaml/files/patch-camlp4-man::Makefile | 4 | ||||
-rw-r--r-- | lang/ocaml/files/patch-camlp4::lib::Makefile | 6 | ||||
-rw-r--r-- | lang/ocaml/files/patch-configure | 10 | ||||
-rw-r--r-- | lang/ocaml/files/patch-ocamldoc::Makefile | 12 | ||||
-rw-r--r-- | lang/ocaml/files/patch-stdlib::Makefile | 6 |
7 files changed, 27 insertions, 25 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 1e0f7b8..b4b3455 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -6,11 +6,13 @@ # PORTNAME= ocaml -PORTVERSION= 3.09.0 +PORTVERSION= 3.09.2 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}/ + ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/${DISTNAME:R}/ \ + ${MASTER_SITE_GENTOO} +MASTER_SITE_SUBDIR= distfiles PKGNAMESUFFIX= ${SFX} MAINTAINER?= ports@FreeBSD.org @@ -88,7 +90,7 @@ MODOPT= camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt .include <bsd.port.pre.mk> .if ${ARCH} == sparc64 || ${ARCH} == ia64 -BROKEN= "ocamlc.opt seg-faults on ${ARCH}, please try to fix" +BROKEN= ocamlc.opt seg-faults on ${ARCH}, please try to fix .endif PLIST_SUB+= PROF="" diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index c82d5ee..9fc7a97 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,3 +1,3 @@ -MD5 (ocaml-3.09.0.tar.bz2) = 834f88b1f39aa066bb620747764c0588 -SHA256 (ocaml-3.09.0.tar.bz2) = f64248d171f72a8d980ccd39d31036e747ac5584aa72a272be84a6602b4ab4bd -SIZE (ocaml-3.09.0.tar.bz2) = 2013495 +MD5 (ocaml-3.09.2.tar.bz2) = 63428ce7e114520e8f529c9ca809a1b0 +SHA256 (ocaml-3.09.2.tar.bz2) = 2115d6a4e420b5517ed7313c64bd6bd93f610ec208250b7d025595376180b0b1 +SIZE (ocaml-3.09.2.tar.bz2) = 2036341 diff --git a/lang/ocaml/files/patch-camlp4-man::Makefile b/lang/ocaml/files/patch-camlp4-man::Makefile index 193781d..2626d25 100644 --- a/lang/ocaml/files/patch-camlp4-man::Makefile +++ b/lang/ocaml/files/patch-camlp4-man::Makefile @@ -1,5 +1,5 @@ ---- camlp4/man/Makefile.orig Sat Nov 22 17:30:44 2003 -+++ camlp4/man/Makefile Sat Nov 22 04:48:25 2003 +--- ./camlp4/man/Makefile.orig Thu Jul 3 20:14:49 2003 ++++ ./camlp4/man/Makefile Sun May 21 14:02:41 2006 @@ -3,7 +3,6 @@ include ../config/Makefile diff --git a/lang/ocaml/files/patch-camlp4::lib::Makefile b/lang/ocaml/files/patch-camlp4::lib::Makefile index 3b948ca..174a410 100644 --- a/lang/ocaml/files/patch-camlp4::lib::Makefile +++ b/lang/ocaml/files/patch-camlp4::lib::Makefile @@ -1,6 +1,6 @@ ---- camlp4/lib/Makefile.orig Fri Apr 22 05:28:15 2005 -+++ camlp4/lib/Makefile Fri Apr 22 05:28:41 2005 -@@ -49,7 +49,8 @@ +--- ./camlp4/lib/Makefile.orig Tue Nov 30 21:57:03 2004 ++++ ./camlp4/lib/Makefile Sun May 21 14:02:41 2006 +@@ -51,7 +51,8 @@ installopt: for f in $(TARGET:.cma=.cmxa) $(TARGET:.cma=.p.cmxa) *.cmx ; do \ diff --git a/lang/ocaml/files/patch-configure b/lang/ocaml/files/patch-configure index f54943e..1d822d8 100644 --- a/lang/ocaml/files/patch-configure +++ b/lang/ocaml/files/patch-configure @@ -1,14 +1,14 @@ ---- configure.orig Wed Sep 7 12:41:56 2005 -+++ configure Wed Sep 7 12:30:03 2005 -@@ -653,6 +653,7 @@ - alpha,*,digital) profiling='prof';; +--- ./configure.orig Thu Mar 30 14:00:19 2006 ++++ ./configure Sun May 21 14:02:41 2006 +@@ -667,6 +667,7 @@ i386,*,linux_elf) profiling='prof';; + i386,*,gnu) profiling='prof';; i386,*,bsd_elf) profiling='prof';; + *,*,freebsd) profiling='prof';; sparc,*,solaris) profiling='prof' case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; -@@ -1123,117 +1124,14 @@ +@@ -1107,117 +1108,14 @@ x11_include="not found" x11_link="not found" diff --git a/lang/ocaml/files/patch-ocamldoc::Makefile b/lang/ocaml/files/patch-ocamldoc::Makefile index 544893e..f551737 100644 --- a/lang/ocaml/files/patch-ocamldoc::Makefile +++ b/lang/ocaml/files/patch-ocamldoc::Makefile @@ -1,16 +1,16 @@ ---- ocamldoc/Makefile.orig Sat Nov 22 17:38:34 2003 -+++ ocamldoc/Makefile Sat Nov 22 04:34:14 2003 +--- ./ocamldoc/Makefile.orig Thu Nov 10 17:44:36 2005 ++++ ./ocamldoc/Makefile Sun May 21 14:02:41 2006 @@ -40,7 +40,7 @@ - OCAMLDOC_LIBA=odoc_info.a INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc + INSTALL_CUSTOMDIR=$(INSTALL_LIBDIR)/custom INSTALL_BINDIR=$(OCAMLBIN) -INSTALL_MANODIR=$(MANDIR)/man3 +INSTALL_MANODIR=$(MANDIR)/mann - INSTALL_MLIS=odoc_info.mli + INSTALL_MLIS=odoc_info.mli INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi) -@@ -281,7 +281,9 @@ - $(CP) ocamldoc.hva *.cmi $(GENERATORS) $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR) +@@ -261,7 +261,9 @@ + $(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 - $(CP) stdlib_man/* $(INSTALL_MANODIR) diff --git a/lang/ocaml/files/patch-stdlib::Makefile b/lang/ocaml/files/patch-stdlib::Makefile index 9ed197b..9bd92e1 100644 --- a/lang/ocaml/files/patch-stdlib::Makefile +++ b/lang/ocaml/files/patch-stdlib::Makefile @@ -1,6 +1,6 @@ ---- stdlib/Makefile.bak Fri Apr 22 05:04:24 2005 -+++ stdlib/Makefile Fri Apr 22 05:13:40 2005 -@@ -47,8 +47,7 @@ +--- ./stdlib/Makefile.orig Mon Nov 29 17:53:30 2004 ++++ ./stdlib/Makefile Sun May 21 14:02:41 2006 +@@ -48,8 +48,7 @@ rm -f std_exit.p.cmi install: |