Update to ocaml-3.09.3, mainly bugfixes (no language changes).

Also modify ocaml.port.mk to depend on the exact version of ocaml being
compiled against, since the OCaml library format makes no guarantees about
working across versions.  This dependency should ensure that packages compiled
against different ocaml versions aren't mixed and matched.
This commit is contained in:
avsm 2006-12-26 22:07:18 +00:00
parent 2634ddb00f
commit 58d761b343
5 changed files with 50 additions and 14 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.36 2006/11/13 11:20:25 steven Exp $
# $OpenBSD: Makefile,v 1.37 2006/12/26 22:07:18 avsm Exp $
NOT_FOR_ARCHS= hppa
COMMENT= "ML language based on complete class-based objective system"
BASENAME= ocaml-3.09
DISTNAME= ${BASENAME}.2
DISTNAME= ${BASENAME}.3
CATEGORIES= lang
MASTER_SITES= http://caml.inria.fr/distrib/${BASENAME}/
DOCFILES= ${BASENAME}-refman.html.tar.gz

View File

@ -1,8 +1,8 @@
MD5 (ocaml-3.09-refman.html.tar.gz) = b25eb211bf91bcaa536b12d12731ceec
MD5 (ocaml-3.09.2.tar.gz) = dc4a298cfa8c65fe4e506a06fe514ccd
MD5 (ocaml-3.09.3.tar.gz) = 11a91651007f70a2cb4d5ecfe20fab89
RMD160 (ocaml-3.09-refman.html.tar.gz) = 3053df3ba5dca3bf684b4ba72be93e8f733c116d
RMD160 (ocaml-3.09.2.tar.gz) = de40773b8168832921b2e628b0f4f2103cd31f5a
RMD160 (ocaml-3.09.3.tar.gz) = 080f58ae4f21fb306c2beb224ae56f585e3776ed
SHA1 (ocaml-3.09-refman.html.tar.gz) = 84b7971dd1ca249f2630435c6c8de54a86b0d9b6
SHA1 (ocaml-3.09.2.tar.gz) = 98a66efc2726a0877574113af473596af8b1887c
SHA1 (ocaml-3.09.3.tar.gz) = 401ea0ed5f14c2db08bfa704b8ad9acf29f0620d
SIZE (ocaml-3.09-refman.html.tar.gz) = 484037
SIZE (ocaml-3.09.2.tar.gz) = 2481166
SIZE (ocaml-3.09.3.tar.gz) = 2485013

View File

@ -1,4 +1,4 @@
# $OpenBSD: ocaml.port.mk,v 1.6 2006/05/29 03:44:49 avsm Exp $
# $OpenBSD: ocaml.port.mk,v 1.7 2006/12/26 22:07:18 avsm Exp $
# regular file usage for bytecode:
# PLIST -- bytecode base files
@ -9,6 +9,8 @@
# PFRAG.foo-native -- nativecode files for FLAVOR == foo
# PFRAG.no-foo-native -- nativecode files for FLAVOR != foo
OCAML_VERSION=3.09.3
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "powerpc"
@ -20,12 +22,12 @@ PKG_ARGS+=-Dnative=1
.else
MODOCAML_NATIVE=No
RUN_DEPENDS+= ::lang/ocaml
RUN_DEPENDS+= :ocaml-${OCAML_VERSION}:lang/ocaml
# remove native base file entry from PLIST
PKG_ARGS+=-Dnative=0
.endif
BUILD_DEPENDS+= ::lang/ocaml
BUILD_DEPENDS+= :ocaml-${OCAML_VERSION}:lang/ocaml
MAKE_ENV+= OCAMLFIND_DESTDIR=${DESTDIR}${PREFIX}/lib/ocaml/site-lib

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.native,v 1.6 2006/05/28 15:28:54 avsm Exp $
@comment $OpenBSD: PFRAG.native,v 1.7 2006/12/26 22:07:18 avsm Exp $
bin/camlp4o.opt
bin/camlp4r.opt
bin/ocamlc.opt
@ -27,6 +27,28 @@ lib/ocaml/camlinternalMod.cmx
lib/ocaml/camlinternalMod.p.cmx
lib/ocaml/camlinternalOO.cmx
lib/ocaml/camlinternalOO.p.cmx
lib/ocaml/camlp4/argl.cmi
lib/ocaml/camlp4/argl.cmo
lib/ocaml/camlp4/ast2pt.cmx
lib/ocaml/camlp4/ast2pt.o
lib/ocaml/camlp4/camlp4.cma
lib/ocaml/camlp4/extfold.o
lib/ocaml/camlp4/extfun.o
lib/ocaml/camlp4/fstream.o
lib/ocaml/camlp4/gramext.o
lib/ocaml/camlp4/grammar.o
lib/ocaml/camlp4/pa_o_fast.o
lib/ocaml/camlp4/pcaml.cmx
lib/ocaml/camlp4/pcaml.o
lib/ocaml/camlp4/plexer.o
lib/ocaml/camlp4/quotation.cmx
lib/ocaml/camlp4/quotation.o
lib/ocaml/camlp4/reloc.cmx
lib/ocaml/camlp4/reloc.o
lib/ocaml/camlp4/spretty.cmx
lib/ocaml/camlp4/spretty.o
lib/ocaml/camlp4/stdpp.o
lib/ocaml/camlp4/token.o
lib/ocaml/camlp4/argl.cmx
lib/ocaml/camlp4/argl.o
lib/ocaml/camlp4/camlp4.a

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2006/05/28 15:28:54 avsm Exp $
@comment $OpenBSD: PLIST,v 1.17 2006/12/26 22:07:18 avsm Exp $
bin/camlp4
bin/camlp4o
bin/camlp4r
@ -66,24 +66,27 @@ lib/ocaml/camlinternalOO.cmi
lib/ocaml/camlinternalOO.ml
lib/ocaml/camlinternalOO.mli
lib/ocaml/camlp4/
lib/ocaml/camlp4/argl.cmi
lib/ocaml/camlp4/argl.cmo
lib/ocaml/camlp4/ast2pt.cmi
lib/ocaml/camlp4/ast2pt.cmo
lib/ocaml/camlp4/ast2pt.mli
lib/ocaml/camlp4/camlp4.cma
lib/ocaml/camlp4/camlp4_top.cma
lib/ocaml/camlp4/camlp4o.cma
lib/ocaml/camlp4/camlp4r.cma
lib/ocaml/camlp4/extfold.cmi
lib/ocaml/camlp4/extfold.cmo
lib/ocaml/camlp4/extfold.mli
lib/ocaml/camlp4/extfun.cmi
lib/ocaml/camlp4/extfun.cmo
lib/ocaml/camlp4/extfun.mli
lib/ocaml/camlp4/fstream.cmi
lib/ocaml/camlp4/fstream.cmo
lib/ocaml/camlp4/fstream.mli
lib/ocaml/camlp4/gramext.cmi
lib/ocaml/camlp4/gramext.cmo
lib/ocaml/camlp4/gramext.mli
lib/ocaml/camlp4/gramlib.cma
lib/ocaml/camlp4/grammar.cmi
lib/ocaml/camlp4/grammar.cmo
lib/ocaml/camlp4/grammar.mli
lib/ocaml/camlp4/mLast.cmi
lib/ocaml/camlp4/mLast.mli
@ -108,8 +111,10 @@ lib/ocaml/camlp4/pa_r.cmo
lib/ocaml/camlp4/pa_rp.cmo
lib/ocaml/camlp4/pa_ru.cmo
lib/ocaml/camlp4/pcaml.cmi
lib/ocaml/camlp4/pcaml.cmo
lib/ocaml/camlp4/pcaml.mli
lib/ocaml/camlp4/plexer.cmi
lib/ocaml/camlp4/plexer.cmo
lib/ocaml/camlp4/plexer.mli
lib/ocaml/camlp4/pr_depend.cmo
lib/ocaml/camlp4/pr_dump.cmo
@ -123,12 +128,19 @@ lib/ocaml/camlp4/pr_rp.cmo
lib/ocaml/camlp4/q_MLast.cmo
lib/ocaml/camlp4/q_phony.cmo
lib/ocaml/camlp4/quotation.cmi
lib/ocaml/camlp4/quotation.cmo
lib/ocaml/camlp4/quotation.mli
lib/ocaml/camlp4/reloc.cmi
lib/ocaml/camlp4/reloc.cmo
lib/ocaml/camlp4/reloc.mli
lib/ocaml/camlp4/spretty.cmi
lib/ocaml/camlp4/spretty.cmo
lib/ocaml/camlp4/spretty.mli
lib/ocaml/camlp4/stdpp.cmi
lib/ocaml/camlp4/stdpp.cmo
lib/ocaml/camlp4/stdpp.mli
lib/ocaml/camlp4/token.cmi
lib/ocaml/camlp4/token.cmo
lib/ocaml/camlp4/token.mli
lib/ocaml/char.cmi
lib/ocaml/char.ml