1 files changed, 39 insertions, 9 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index a6f72ef9623a..e6df93648898 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -6,20 +6,23 @@
 #
 
 PORTNAME=	ocaml
-PORTVERSION=	3.04
+PORTVERSION=	3.05
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/distrib/ \
 		ftp://ftp.inria.fr/lang/caml-light/ \
 		ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/
+PKGNAMESUFFIX=	${TKSFX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DOCFILES}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-refman.html${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME}-refman.html${EXTRACT_SUFX}
 
 MAINTAINER=	patrick@watson.org
 
 .if defined(WITHOUT_TK)
-PLIST_SUB+=	LABLTK:="@comment "
+PLIST_SUB+=	TK="@comment "
+TKSFX=		-notk
 .else
-PLIST_SUB+=	LABLTK:=""
+PLIST_SUB+=	TK=""
 BUILD_DEPENDS+=	${LOCALBASE}/include/tcl8.3:${PORTSDIR}/lang/tcl83
 BUILD_DEPENDS+=	${LOCALBASE}/include/tk8.3:${PORTSDIR}/x11-toolkits/tk83
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
@@ -27,17 +30,36 @@ LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
 USE_XLIB=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	world opt opt.opt
+ALL_TARGET=	world.opt
 
 .if ${MACHINE_ARCH} != "i386"
-PLIST_SUB+=	PROF:="@comment "
+PLIST_SUB+=	PROF="@comment "
 .else
-PLIST_SUB+=	PROF:=""
+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
+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 \
+		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 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
 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 \
@@ -48,7 +70,9 @@ CONFIGURE_ARGS=	-prefix ${PREFIX} \
 		-x11lib ${X11BASE}/lib \
 		-with-pthread
 
-.if !defined(WITHOUT_TK)
+.if defined(WITHOUT_TK)
+CONFIGURE_ARGS+=-no-tk
+.else
 CONFIGURE_ARGS+=-tkdefs "-I${PREFIX}/include/tcl8.3 -I${PREFIX}/include/tk8.3"
 .endif
 
@@ -71,8 +95,14 @@ post-install:
 .if !defined(WITHOUT_TK)
 	@${MKDIR} ${EXAMPLESDIR}
 	@${MKDIR} ${EXAMPLESDIR}/labltk
-	@cd ${WRKSRC}/otherlibs/labltk/example; \
+	@${MKDIR} ${EXAMPLESDIR}/camltk
+	@${MKDIR} ${EXAMPLESDIR}/camltk/images
+	@cd ${WRKSRC}/otherlibs/labltk/examples_labltk; \
 		${INSTALL_DATA} * ${EXAMPLESDIR}/labltk
+	@cd ${WRKSRC}/otherlibs/labltk/examples_camltk/images; \
+		${INSTALL_DATA} * ${EXAMPLESDIR}/camltk/images
+	@cd ${WRKSRC}/otherlibs/labltk/examples_camltk; \
+		${INSTALL_DATA} [A-Za-hj-z]* ${EXAMPLESDIR}/camltk
 .endif
 	@strip ${PREFIX}/bin/ocamlrun ${PREFIX}/bin/ocamlyacc