5 files changed, 78 insertions, 32 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 32d70d9848be..a56b6e445ddc 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	ocaml
-PORTVERSION=	3.09.2
-PORTREVISION=	2
+PORTVERSION=	3.09.3
+PORTREVISION=	0
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME:R}/ \
 		ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \
@@ -142,11 +142,6 @@ post-install:
 . endfor
 .endif
 
-.for module in ${MODOPT}
-	@${ECHO_CMD} "${module:S|^|bin/|}" >> ${TMPPLIST}
-	@${ECHO_CMD} "${module:S|^|bin/|}.opt" >> ${TMPPLIST}
-.endfor
-
 # Add compiler's libs if required
 .if defined(WITH_CMP_LIB)
 	@${MKDIR}  ${PREFIX}/lib/ocaml/compiler-lib
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 9fc7a97fa0dd..c03154e57a21 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,3 +1,3 @@
-MD5 (ocaml-3.09.2.tar.bz2) = 63428ce7e114520e8f529c9ca809a1b0
-SHA256 (ocaml-3.09.2.tar.bz2) = 2115d6a4e420b5517ed7313c64bd6bd93f610ec208250b7d025595376180b0b1
-SIZE (ocaml-3.09.2.tar.bz2) = 2036341
+MD5 (ocaml-3.09.3.tar.bz2) = 8b3744efd0d51b82d55b61d0e2bf0e2b
+SHA256 (ocaml-3.09.3.tar.bz2) = 607842b4f4917a759f19541a421370a834f5b948855ca54cef40d22b19a0934f
+SIZE (ocaml-3.09.3.tar.bz2) = 2038617
diff --git a/lang/ocaml/files/patch-camlp4_camlp4_Makefile b/lang/ocaml/files/patch-camlp4_camlp4_Makefile
new file mode 100644
index 000000000000..7c8690c03eb3
--- /dev/null
+++ b/lang/ocaml/files/patch-camlp4_camlp4_Makefile
@@ -0,0 +1,14 @@
+--- camlp4/camlp4/Makefile.orig	Sat Sep 23 20:02:56 2006
++++ camlp4/camlp4/Makefile	Sat Sep 23 20:13:00 2006
+@@ -75,7 +75,10 @@
+ 	-$(MKDIR) "$(LIBDIR)/camlp4"
+ 	cp $(CAMLP4) "$(BINDIR)/."
+ 	for ext in mli cmi cmo cmx o; do for mod in $(EXPORTED); do \
+-	  cp $${mod}.$${ext} "$(LIBDIR)/camlp4/."; done; done
++	  if [ -e "$${mod}.$${ext}" ]; then \
++		cp $${mod}.$${ext} "$(LIBDIR)/camlp4/."; \
++	  fi; \
++	done; done
+ 	cp  argl.cmi argl.cmo "$(LIBDIR)/camlp4/."
+ 	for f in argl.o argl.cmx; do \
+ 	  if test -r $$f ; then \
diff --git a/lang/ocaml/files/patch-camlp4_lib_Makefile b/lang/ocaml/files/patch-camlp4_lib_Makefile
deleted file mode 100644
index 174a410b3b4e..000000000000
--- a/lang/ocaml/files/patch-camlp4_lib_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./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 \
--		test -f $$f && cp $$f "$(LIBDIR)/camlp4/." || true ; \
-+		test -f $$f && \
-+		cp $$f "$(LIBDIR)/camlp4/." || true ; \
- 	done
- 	# Special treatment for this one: some versions of make don't like $(A) in $(TARGET:.cma=.$(A)) 
- 	target="`echo $(TARGET) | sed -e 's/\.cma$$/.$(A)/'`" ; \
diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist
index ec40ecce0141..fa9b77707569 100644
--- a/lang/ocaml/pkg-plist
+++ b/lang/ocaml/pkg-plist
@@ -1,12 +1,26 @@
 bin/camlp4
+bin/camlp4o
+bin/camlp4o.opt
+bin/camlp4r
+bin/camlp4r.opt
 %%TK%%bin/labltk
 bin/mkcamlp4
 bin/ocaml
 %%TK%%bin/ocamlbrowser
+bin/ocamlc
+bin/ocamlc.opt
 bin/ocamlcp
 bin/ocamldebug
+bin/ocamldep
+bin/ocamldep.opt
+bin/ocamldoc
+bin/ocamldoc.opt
+bin/ocamllex
+bin/ocamllex.opt
 bin/ocamlmklib
 bin/ocamlmktop
+bin/ocamlopt
+bin/ocamlopt.opt
 bin/ocamlprof
 bin/ocamlrun
 bin/ocamlyacc
@@ -81,7 +95,10 @@ lib/ocaml/camlp4/argl.cmo
 lib/ocaml/camlp4/argl.cmx
 lib/ocaml/camlp4/argl.o
 lib/ocaml/camlp4/ast2pt.cmi
+lib/ocaml/camlp4/ast2pt.cmo
+lib/ocaml/camlp4/ast2pt.cmx
 lib/ocaml/camlp4/ast2pt.mli
+lib/ocaml/camlp4/ast2pt.o
 lib/ocaml/camlp4/camlp4.a
 lib/ocaml/camlp4/camlp4.cma
 lib/ocaml/camlp4/camlp4.cmxa
@@ -89,23 +106,33 @@ 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.cmx
 lib/ocaml/camlp4/extfold.mli
+lib/ocaml/camlp4/extfold.o
 lib/ocaml/camlp4/extfun.cmi
+lib/ocaml/camlp4/extfun.cmo
 lib/ocaml/camlp4/extfun.cmx
 lib/ocaml/camlp4/extfun.mli
+lib/ocaml/camlp4/extfun.o
 lib/ocaml/camlp4/fstream.cmi
+lib/ocaml/camlp4/fstream.cmo
 lib/ocaml/camlp4/fstream.cmx
 lib/ocaml/camlp4/fstream.mli
+lib/ocaml/camlp4/fstream.o
 lib/ocaml/camlp4/gramext.cmi
+lib/ocaml/camlp4/gramext.cmo
 lib/ocaml/camlp4/gramext.cmx
 lib/ocaml/camlp4/gramext.mli
+lib/ocaml/camlp4/gramext.o
 lib/ocaml/camlp4/gramlib.a
 lib/ocaml/camlp4/gramlib.cma
 lib/ocaml/camlp4/gramlib.cmxa
 lib/ocaml/camlp4/grammar.cmi
+lib/ocaml/camlp4/grammar.cmo
 lib/ocaml/camlp4/grammar.cmx
 lib/ocaml/camlp4/grammar.mli
+lib/ocaml/camlp4/grammar.o
 lib/ocaml/camlp4/mLast.cmi
 lib/ocaml/camlp4/mLast.mli
 lib/ocaml/camlp4/ocpp.cmo
@@ -145,6 +172,7 @@ 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_o_fast.o
 lib/ocaml/camlp4/pa_oop.cmo
 lib/ocaml/camlp4/pa_oop.cmx
 lib/ocaml/camlp4/pa_oop.o
@@ -161,10 +189,15 @@ lib/ocaml/camlp4/pa_ru.cmo
 lib/ocaml/camlp4/pa_ru.cmx
 lib/ocaml/camlp4/pa_ru.o
 lib/ocaml/camlp4/pcaml.cmi
+lib/ocaml/camlp4/pcaml.cmo
+lib/ocaml/camlp4/pcaml.cmx
 lib/ocaml/camlp4/pcaml.mli
+lib/ocaml/camlp4/pcaml.o
 lib/ocaml/camlp4/plexer.cmi
+lib/ocaml/camlp4/plexer.cmo
 lib/ocaml/camlp4/plexer.cmx
 lib/ocaml/camlp4/plexer.mli
+lib/ocaml/camlp4/plexer.o
 lib/ocaml/camlp4/pr_depend.cmo
 lib/ocaml/camlp4/pr_depend.cmx
 lib/ocaml/camlp4/pr_depend.o
@@ -199,15 +232,30 @@ 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.cmo
+lib/ocaml/camlp4/quotation.cmx
 lib/ocaml/camlp4/quotation.mli
+lib/ocaml/camlp4/quotation.o
+lib/ocaml/camlp4/reloc.cmi
+lib/ocaml/camlp4/reloc.cmo
+lib/ocaml/camlp4/reloc.cmx
+lib/ocaml/camlp4/reloc.mli
+lib/ocaml/camlp4/reloc.o
 lib/ocaml/camlp4/spretty.cmi
+lib/ocaml/camlp4/spretty.cmo
+lib/ocaml/camlp4/spretty.cmx
 lib/ocaml/camlp4/spretty.mli
+lib/ocaml/camlp4/spretty.o
 lib/ocaml/camlp4/stdpp.cmi
+lib/ocaml/camlp4/stdpp.cmo
 lib/ocaml/camlp4/stdpp.cmx
 lib/ocaml/camlp4/stdpp.mli
+lib/ocaml/camlp4/stdpp.o
 lib/ocaml/camlp4/token.cmi
+lib/ocaml/camlp4/token.cmo
 lib/ocaml/camlp4/token.cmx
 lib/ocaml/camlp4/token.mli
+lib/ocaml/camlp4/token.o
 lib/ocaml/char.cmi
 lib/ocaml/char.cmx
 lib/ocaml/char.ml
@@ -426,6 +474,7 @@ lib/ocaml/int_misc.cmx
 %%TK%%lib/ocaml/labltk/entry.cmx
 %%TK%%lib/ocaml/labltk/entry.mli
 %%TK%%lib/ocaml/labltk/fileevent.cmi
+%%TK%%lib/ocaml/labltk/fileevent.cmx
 %%TK%%lib/ocaml/labltk/fileevent.mli
 %%TK%%lib/ocaml/labltk/fileselect.cmi
 %%TK%%lib/ocaml/labltk/fileselect.cmx
@@ -544,11 +593,13 @@ lib/ocaml/int_misc.cmx
 %%TK%%lib/ocaml/labltk/place.mli
 %%TK%%lib/ocaml/labltk/pp
 %%TK%%lib/ocaml/labltk/protocol.cmi
+%%TK%%lib/ocaml/labltk/protocol.cmx
 %%TK%%lib/ocaml/labltk/protocol.mli
 %%TK%%lib/ocaml/labltk/radiobutton.cmi
 %%TK%%lib/ocaml/labltk/radiobutton.cmx
 %%TK%%lib/ocaml/labltk/radiobutton.mli
 %%TK%%lib/ocaml/labltk/rawwidget.cmi
+%%TK%%lib/ocaml/labltk/rawwidget.cmx
 %%TK%%lib/ocaml/labltk/rawwidget.mli
 %%TK%%lib/ocaml/labltk/scale.cmi
 %%TK%%lib/ocaml/labltk/scale.cmx
@@ -566,8 +617,10 @@ lib/ocaml/int_misc.cmx
 %%TK%%lib/ocaml/labltk/text.cmx
 %%TK%%lib/ocaml/labltk/text.mli
 %%TK%%lib/ocaml/labltk/textvariable.cmi
+%%TK%%lib/ocaml/labltk/textvariable.cmx
 %%TK%%lib/ocaml/labltk/textvariable.mli
 %%TK%%lib/ocaml/labltk/timer.cmi
+%%TK%%lib/ocaml/labltk/timer.cmx
 %%TK%%lib/ocaml/labltk/timer.mli
 %%TK%%lib/ocaml/labltk/tk.cmi
 %%TK%%lib/ocaml/labltk/tk.cmx
@@ -577,6 +630,10 @@ lib/ocaml/int_misc.cmx
 %%TK%%lib/ocaml/labltk/tkanim.cmxa
 %%TK%%lib/ocaml/labltk/tkanim.mli
 %%TK%%lib/ocaml/labltk/tkcompiler
+%%TK%%lib/ocaml/labltk/tkthread.cmi
+%%TK%%lib/ocaml/labltk/tkthread.cmo
+%%TK%%lib/ocaml/labltk/tkthread.mli
+%%TK%%lib/ocaml/labltk/tkthread.o
 %%TK%%lib/ocaml/labltk/tkvars.cmi
 %%TK%%lib/ocaml/labltk/tkvars.cmx
 %%TK%%lib/ocaml/labltk/tkvars.mli
@@ -587,6 +644,7 @@ lib/ocaml/int_misc.cmx
 %%TK%%lib/ocaml/labltk/toplevel.cmx
 %%TK%%lib/ocaml/labltk/toplevel.mli
 %%TK%%lib/ocaml/labltk/widget.cmi
+%%TK%%lib/ocaml/labltk/widget.cmx
 %%TK%%lib/ocaml/labltk/widget.mli
 %%TK%%lib/ocaml/labltk/winfo.cmi
 %%TK%%lib/ocaml/labltk/winfo.cmx
@@ -594,16 +652,6 @@ lib/ocaml/int_misc.cmx
 %%TK%%lib/ocaml/labltk/wm.cmi
 %%TK%%lib/ocaml/labltk/wm.cmx
 %%TK%%lib/ocaml/labltk/wm.mli
-%%TK%%lib/ocaml/labltk/fileevent.cmx
-%%TK%%lib/ocaml/labltk/protocol.cmx
-%%TK%%lib/ocaml/labltk/rawwidget.cmx
-%%TK%%lib/ocaml/labltk/textvariable.cmx
-%%TK%%lib/ocaml/labltk/timer.cmx
-%%TK%%lib/ocaml/labltk/tkthread.cmi
-%%TK%%lib/ocaml/labltk/tkthread.cmo
-%%TK%%lib/ocaml/labltk/tkthread.mli
-%%TK%%lib/ocaml/labltk/tkthread.o
-%%TK%%lib/ocaml/labltk/widget.cmx
 lib/ocaml/lazy.cmi
 lib/ocaml/lazy.cmx
 lib/ocaml/lazy.ml
@@ -930,3 +978,4 @@ lib/ocaml/weak.p.cmx
 %%TK%%@dirrm lib/ocaml/labltk
 @dirrm lib/ocaml/camlp4
 @dirrm lib/ocaml/caml
+@comment lib/ocaml will be added by Makefile