kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 3.08.0

Browse source 
PR:		ports/69254
Submitted by:	Eugene Ossintsev (maintainer)
This commit is contained in:
Volker Stolz 2004-07-19 21:13:24 +00:00
parent 8383a8f87f
commit 526d3996ba
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=114247
8 changed files with 71 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lang/ocaml/Makefile
View file

@ -6,17 +6,12 @@
#
PORTNAME= ocaml
PORTVERSION= 3.07.2
PORTVERSION= 3.08.0
CATEGORIES= lang
MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME}/ \
ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME}/ \
ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/${DISTNAME}/
MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:S/.0$//}/ \
ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:S/.0$//}/ \
ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/${DISTNAME:S/.0$//}/
PKGNAMESUFFIX= ${SFX}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.2$//}
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= ${DISTNAME}-patch2.diffs
PATCH_DIST_STRIP=-p1
MAINTAINER?= eugos@gmx.net
COMMENT?= The Objective Caml compiler and programming environment
@ -46,15 +41,9 @@ LIB_DEPENDS+= tk84.1:${PORTSDIR}/x11-toolkits/tk84
HAS_CONFIGURE= yes
ALL_TARGET= world.opt
.if ${MACHINE_ARCH} != "i386"
PLIST_SUB+= PROF="@comment "
.else
PLIST_SUB+= PROF=""
.endif
MAN1= ocamlcp.1 ocamldep.1 ocamldebug.1 ocamlopt.1 ocamlrun.1 \
ocamlyacc.1 ocamlmktop.1 ocaml.1 ocamlc.1 ocamllex.1 \
ocamlprof.1 camlp4.1
MAN1= ocamlcp.1 ocamldep.1 ocamldebug.1 ocamldoc.1 ocamlopt.1 \
ocamlrun.1 ocamlyacc.1 ocamlmktop.1 ocaml.1 ocamlc.1 \
ocamllex.1 ocamlprof.1 camlp4.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 Char.n \
@ -77,7 +66,7 @@ MANN= Arg.n Array.n ArrayLabels.n Bigarray.Array1.n \
MLINKS= ocamlc.1 ocamlc.opt.1 ocamlopt.1 ocamlopt.opt.1 \
camlp4.1 camlp4o.1 camlp4.1 camlp4r.1 camlp4.1 mkcamlp4.1 \
camlp4.1 camlp4o.opt.1 camlp4.1 camlp4r.opt.1 \
camlp4.1 ocpp.1 camlp4.1 camlp4sch.1
camlp4.1 ocpp.1
CONFIGURE_ARGS= -prefix ${PREFIX} -with-pthread
@ -92,8 +81,10 @@ CONFIGURE_ARGS+= -tkdefs "-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/t
.include <bsd.port.pre.mk>
.if ${ARCH} == "sparc64"
BROKEN= "Coredump during build on sparc64"
.if ${ARCH} != "i386"
PLIST_SUB+= PROF="@comment "
.else
PLIST_SUB+= PROF=""
.endif
post-install:

6
lang/ocaml/distinfo
View file

@ -1,4 +1,2 @@
MD5 (ocaml-3.07.tar.gz) = 2dd038055f5e1350078ad81270411b78
SIZE (ocaml-3.07.tar.gz) = 2537449
MD5 (ocaml-3.07-patch2.diffs) = f91d1f1e531f77011bd554817dbbc12a
SIZE (ocaml-3.07-patch2.diffs) = 42799
MD5 (ocaml-3.08.0.tar.gz) = c6ef478362295c150101cdd2efcd38e0
SIZE (ocaml-3.08.0.tar.gz) = 2458425

10
lang/ocaml/files/patch-camlp4-lib::Makefile
View file

@ -1,10 +0,0 @@
--- camlp4/lib/Makefile.orig Sun Dec 14 02:41:09 2003
+++ camlp4/lib/Makefile Sun Dec 14 02:41:24 2003
@@ -43,6 +43,6 @@
installopt:
cp $(TARGET:.cma=.cmxa) *.cmx "$(LIBDIR)/camlp4/."
- tar cf - $(TARGET:.cma=.$(A)) | (cd "$(LIBDIR)/camlp4/."; tar xf -)
+ tar cf - $(TARGET:S/.cma$/.$(A)/) | (cd "$(LIBDIR)/camlp4/."; tar xf -)
include .depend

11
lang/ocaml/files/patch-camlp4-meta::Makefile
View file

@ -1,11 +0,0 @@
--- camlp4/meta/Makefile.orig Sun Dec 14 02:40:05 2003
+++ camlp4/meta/Makefile Sun Dec 14 02:40:20 2003
@@ -49,7 +49,7 @@
cp camlp4r$(EXE) "$(BINDIR)/."
if test -f camlp4r.opt; then \
cp camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\
- for target in $(OBJSX) $(OBJSX:.cmx=.$(O)) ; do \
+ for target in $(OBJSX) $(OBJSX:S/.cmx$/.$(O)/) ; do \
if test -f $$target; then \
cp $$target "$(LIBDIR)/camlp4/."; \
fi; \

10
lang/ocaml/files/patch-camlp4-ocaml_src-lib::Makefile
View file

@ -1,10 +0,0 @@
--- camlp4/ocaml_src/lib/Makefile.orig Sun Dec 14 02:38:28 2003
+++ camlp4/ocaml_src/lib/Makefile Sun Dec 14 02:38:55 2003
@@ -43,6 +43,6 @@
installopt:
cp $(TARGET:.cma=.cmxa) *.cmx "$(LIBDIR)/camlp4/."
- tar cf - $(TARGET:.cma=.$(A)) | (cd "$(LIBDIR)/camlp4/."; tar xf -)
+ tar cf - $(TARGET:S/.cma$/.$(A)/) | (cd "$(LIBDIR)/camlp4/."; tar xf -)
include .depend

11
lang/ocaml/files/patch-camlp4-ocaml_src-meta::Makefile
View file

@ -1,11 +0,0 @@
--- camlp4/ocaml_src/meta/Makefile.orig Sun Dec 14 02:33:49 2003
+++ camlp4/ocaml_src/meta/Makefile Sun Dec 14 02:35:12 2003
@@ -49,7 +49,7 @@
cp camlp4r$(EXE) "$(BINDIR)/."
if test -f camlp4r.opt; then \
cp camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\
- for target in $(OBJSX) $(OBJSX:.cmx=.$(O)) ; do \
+ for target in $(OBJSX) $(OBJSX:S/.cmx$/.$(O)/) ; do \
if test -f $$target; then \
cp $$target "$(LIBDIR)/camlp4/."; \
fi; \

30
lang/ocaml/files/patch-configure
View file

@ -1,24 +1,6 @@
--- configure.orig Thu Sep 25 01:17:13 2003
+++ configure Mon Feb 2 04:21:43 2004
@@ -559,6 +559,8 @@
powerpc-*-darwin*) arch=power; model=ppc; system=rhapsody;;
arm*-*-linux*) arch=arm; system=linux;;
ia64-*-linux*) arch=ia64; system=linux;;
+ ia64-*-freebsd*) arch=ia64; system=freebsd;;
+ amd64-*-freebsd*) arch=amd64; system=freebsd;;
x86_64-*-linux*) arch=amd64; system=linux;;
esac
@@ -621,7 +623,7 @@
power,*,bsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
power,*,rhapsody) ;;
arm,*,linux) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
- ia64,*,linux) asflags=-xexplicit
+ ia64,*,*) asflags=-xexplicit
aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM) -Wa,-xexplicit';;
amd64,*,*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
esac
@@ -1097,116 +1099,14 @@
--- configure.orig Thu Jul 15 16:17:46 2004
+++ configure Thu Jul 15 16:58:51 2004
@@ -1113,116 +1113,14 @@
x11_include="not found"
x11_link="not found"
@ -74,7 +56,7 @@
-else
- x11_try_lib_dir=`echo $x11_include | sed -e 's|include|lib|'`
+if [ -n "$x11_include_dir" ]; then
+ x11_include="$x11_include_dir"
+ x11_include="$x11_include_dir"
fi
-for dir in \
@ -135,8 +117,8 @@
-done
-
+if [ -n "$x11_lib_dir" ]; then
+ x11_link="-L$x11_lib_dir -lX11"
+ x11_libs="-L$x11_lib_dir"
+ x11_link="-L$x11_lib_dir -lX11"
+ x11_libs="-L$x11_lib_dir"
+fi
if test "$x11_include" = "not found" || test "$x11_link" = "not found"

73
lang/ocaml/pkg-plist
View file

@ -4,7 +4,6 @@ bin/camlp4o
bin/camlp4o.opt
bin/camlp4r
bin/camlp4r.opt
bin/camlp4sch
%%TK%%bin/labltk
bin/mkcamlp4
bin/ocaml
@ -30,6 +29,7 @@ bin/ocpp
lib/ocaml/caml/alloc.h
lib/ocaml/caml/bigarray.h
lib/ocaml/caml/callback.h
lib/ocaml/caml/compatibility.h
lib/ocaml/caml/config.h
lib/ocaml/caml/custom.h
lib/ocaml/caml/fail.h
@ -46,26 +46,19 @@ lib/ocaml/camlp4/camlp4.cmxa
lib/ocaml/camlp4/camlp4_top.cma
lib/ocaml/camlp4/camlp4o.cma
lib/ocaml/camlp4/camlp4r.cma
lib/ocaml/camlp4/camlp4sch.cma
lib/ocaml/camlp4/extfold.cmi
lib/ocaml/camlp4/extfold.cmx
lib/ocaml/camlp4/extfold.mli
lib/ocaml/camlp4/extfun.cmi
lib/ocaml/camlp4/extfun.cmx
lib/ocaml/camlp4/extfun.mli
lib/ocaml/camlp4/fstream.cmi
lib/ocaml/camlp4/fstream.cmx
lib/ocaml/camlp4/fstream.mli
lib/ocaml/camlp4/gramext.cmi
lib/ocaml/camlp4/gramext.cmx
lib/ocaml/camlp4/gramext.mli
lib/ocaml/camlp4/gramlib.a
lib/ocaml/camlp4/gramlib.cma
lib/ocaml/camlp4/gramlib.cmxa
lib/ocaml/camlp4/grammar.cmi
lib/ocaml/camlp4/grammar.cmx
lib/ocaml/camlp4/grammar.mli
lib/ocaml/camlp4/lib.sml
lib/ocaml/camlp4/mLast.cmi
lib/ocaml/camlp4/mLast.mli
lib/ocaml/camlp4/ocpp.cmo
@ -73,24 +66,44 @@ lib/ocaml/camlp4/odyl.a
lib/ocaml/camlp4/odyl.cma
lib/ocaml/camlp4/odyl.cmo
lib/ocaml/camlp4/odyl.cmxa
lib/ocaml/camlp4/odyl.cmx
lib/ocaml/camlp4/odyl.o
lib/ocaml/camlp4/odyl_main.cmi
lib/ocaml/camlp4/pa_extend.cmi
lib/ocaml/camlp4/pa_extend.cmo
lib/ocaml/camlp4/pa_extend.cmx
lib/ocaml/camlp4/pa_extend.o
lib/ocaml/camlp4/pa_extend_m.cmo
lib/ocaml/camlp4/pa_extend_m.cmx
lib/ocaml/camlp4/pa_extend_m.o
lib/ocaml/camlp4/pa_extfold.cmo
lib/ocaml/camlp4/pa_extfold.cmx
lib/ocaml/camlp4/pa_extfold.o
lib/ocaml/camlp4/pa_extfun.cmo
lib/ocaml/camlp4/pa_format.cmo
lib/ocaml/camlp4/pa_extfun.cmx
lib/ocaml/camlp4/pa_extfun.o
lib/ocaml/camlp4/pa_fstream.cmo
lib/ocaml/camlp4/pa_fstream.cmx
lib/ocaml/camlp4/pa_fstream.o
lib/ocaml/camlp4/pa_ifdef.cmo
lib/ocaml/camlp4/pa_lefteval.cmo
lib/ocaml/camlp4/pa_lisp.cmo
lib/ocaml/camlp4/pa_ifdef.cmx
lib/ocaml/camlp4/pa_ifdef.o
lib/ocaml/camlp4/pa_macro.cmi
lib/ocaml/camlp4/pa_macro.cmo
lib/ocaml/camlp4/pa_macro.cmx
lib/ocaml/camlp4/pa_macro.o
lib/ocaml/camlp4/pa_o.cmi
lib/ocaml/camlp4/pa_o.cmo
lib/ocaml/camlp4/pa_olabl.cmo
lib/ocaml/camlp4/pa_o.cmx
lib/ocaml/camlp4/pa_o.o
lib/ocaml/camlp4/pa_o_fast.cmi
lib/ocaml/camlp4/pa_o_fast.cmx
lib/ocaml/camlp4/pa_oop.cmo
lib/ocaml/camlp4/pa_oop.cmx
lib/ocaml/camlp4/pa_oop.o
lib/ocaml/camlp4/pa_op.cmo
lib/ocaml/camlp4/pa_op.cmx
lib/ocaml/camlp4/pa_op.o
lib/ocaml/camlp4/pa_r.cmo
lib/ocaml/camlp4/pa_r.cmx
lib/ocaml/camlp4/pa_r.o
@ -98,37 +111,52 @@ lib/ocaml/camlp4/pa_rp.cmo
lib/ocaml/camlp4/pa_rp.cmx
lib/ocaml/camlp4/pa_rp.o
lib/ocaml/camlp4/pa_ru.cmo
lib/ocaml/camlp4/pa_scheme.cmo
lib/ocaml/camlp4/pa_sml.cmo
lib/ocaml/camlp4/pa_ru.cmx
lib/ocaml/camlp4/pa_ru.o
lib/ocaml/camlp4/pcaml.cmi
lib/ocaml/camlp4/pcaml.mli
lib/ocaml/camlp4/plexer.cmi
lib/ocaml/camlp4/plexer.cmx
lib/ocaml/camlp4/plexer.mli
lib/ocaml/camlp4/pr_depend.cmo
lib/ocaml/camlp4/pr_depend.cmx
lib/ocaml/camlp4/pr_depend.o
lib/ocaml/camlp4/pr_dump.cmo
lib/ocaml/camlp4/pr_dump.cmx
lib/ocaml/camlp4/pr_dump.o
lib/ocaml/camlp4/pr_extend.cmo
lib/ocaml/camlp4/pr_extend.cmx
lib/ocaml/camlp4/pr_extend.o
lib/ocaml/camlp4/pr_extfun.cmo
lib/ocaml/camlp4/pr_extfun.cmx
lib/ocaml/camlp4/pr_extfun.o
lib/ocaml/camlp4/pr_null.cmo
lib/ocaml/camlp4/pr_null.cmx
lib/ocaml/camlp4/pr_null.o
lib/ocaml/camlp4/pr_o.cmo
lib/ocaml/camlp4/pr_o.cmx
lib/ocaml/camlp4/pr_o.o
lib/ocaml/camlp4/pr_op.cmo
lib/ocaml/camlp4/pr_op.cmx
lib/ocaml/camlp4/pr_op.o
lib/ocaml/camlp4/pr_r.cmo
lib/ocaml/camlp4/pr_r.cmx
lib/ocaml/camlp4/pr_r.o
lib/ocaml/camlp4/pr_rp.cmo
lib/ocaml/camlp4/pr_scheme.cmo
lib/ocaml/camlp4/pr_schemep.cmo
lib/ocaml/camlp4/pr_rp.cmx
lib/ocaml/camlp4/pr_rp.o
lib/ocaml/camlp4/q_MLast.cmo
lib/ocaml/camlp4/q_MLast.cmx
lib/ocaml/camlp4/q_MLast.o
lib/ocaml/camlp4/q_phony.cmo
lib/ocaml/camlp4/q_phony.cmx
lib/ocaml/camlp4/q_phony.o
lib/ocaml/camlp4/quotation.cmi
lib/ocaml/camlp4/quotation.mli
lib/ocaml/camlp4/spretty.cmi
lib/ocaml/camlp4/spretty.mli
lib/ocaml/camlp4/stdpp.cmi
lib/ocaml/camlp4/stdpp.cmx
lib/ocaml/camlp4/stdpp.mli
lib/ocaml/camlp4/token.cmi
lib/ocaml/camlp4/token.cmx
lib/ocaml/camlp4/token.mli
%%TK%%lib/ocaml/labltk/balloon.cmi
%%TK%%lib/ocaml/labltk/balloon.cmx
@ -452,8 +480,8 @@ lib/ocaml/ocamldoc/odoc_ast.cmi
lib/ocaml/ocamldoc/odoc_class.cmi
lib/ocaml/ocamldoc/odoc_comments.cmi
lib/ocaml/ocamldoc/odoc_comments_global.cmi
lib/ocaml/ocamldoc/odoc_config.cmi
lib/ocaml/ocamldoc/odoc_control.cmi
lib/ocaml/ocamldoc/odoc_crc.cmi
lib/ocaml/ocamldoc/odoc_cross.cmi
lib/ocaml/ocamldoc/odoc_dag2html.cmi
lib/ocaml/ocamldoc/odoc_dep.cmi
@ -481,11 +509,13 @@ lib/ocaml/ocamldoc/odoc_ocamlhtml.cmi
lib/ocaml/ocamldoc/odoc_opt.cmi
lib/ocaml/ocamldoc/odoc_parameter.cmi
lib/ocaml/ocamldoc/odoc_parser.cmi
lib/ocaml/ocamldoc/odoc_print.cmi
lib/ocaml/ocamldoc/odoc_scan.cmi
lib/ocaml/ocamldoc/odoc_search.cmi
lib/ocaml/ocamldoc/odoc_see_lexer.cmi
lib/ocaml/ocamldoc/odoc_sig.cmi
lib/ocaml/ocamldoc/odoc_str.cmi
lib/ocaml/ocamldoc/odoc_test.cmi
lib/ocaml/ocamldoc/odoc_texi.cmi
lib/ocaml/ocamldoc/odoc_text.cmi
lib/ocaml/ocamldoc/odoc_text_lexer.cmi
@ -649,8 +679,6 @@ lib/ocaml/int64.ml
lib/ocaml/int64.mli
%%PROF%%lib/ocaml/int64.p.cmx
lib/ocaml/int_misc.cmx
lib/ocaml/labelled.cmx
%%PROF%%lib/ocaml/labelled.p.cmx
lib/ocaml/lazy.cmi
lib/ocaml/lazy.cmx
lib/ocaml/lazy.ml
@ -879,6 +907,7 @@ lib/ocaml/weak.mli
@dirrm lib/ocaml/caml
@dirrm lib/ocaml/camlp4
%%TK%%@dirrm lib/ocaml/labltk
@dirrm lib/ocaml/ocamldoc/custom
@dirrm lib/ocaml/ocamldoc
@dirrm lib/ocaml/stublibs
@dirrm lib/ocaml/threads