Upgrade to v1.34. Unbreak with OCaml v3.08. Pick up the version number

of the documentation PS file from PORTVERSION.

5 files changed, 35 insertions, 6 deletions

diff --git a/devel/ocamlweb/Makefile b/devel/ocamlweb/Makefile
index 198b9b77c5c0..fcf7be00460d 100644
--- a/devel/ocamlweb/Makefile
+++ b/devel/ocamlweb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ocamlweb
-PORTVERSION=	1.32
+PORTVERSION=	1.34
 CATEGORIES=	devel
 MASTER_SITES=	http://www.lri.fr/~filliatr/ftp/ocamlweb/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DOCFILES}
@@ -22,6 +22,7 @@ GNU_CONFIGURE= yes
 
 .if !defined(NOPORTDOCS)
 DOCFILES=	${PORTNAME}-${PORTVERSION}-man.ps.gz
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 .endif
 
 MAN1=		ocamlweb.1
diff --git a/devel/ocamlweb/distinfo b/devel/ocamlweb/distinfo
index 491f75c3b6ed..49cd496dbf95 100644
--- a/devel/ocamlweb/distinfo
+++ b/devel/ocamlweb/distinfo
@@ -1,4 +1,4 @@
-MD5 (ocamlweb-1.32.tar.gz) = cc9e90e04db07764419e1d153d4978b2
-SIZE (ocamlweb-1.32.tar.gz) = 173449
-MD5 (ocamlweb-1.32-man.ps.gz) = 17612d19a6a56794cdc6da0cda8aa296
-SIZE (ocamlweb-1.32-man.ps.gz) = 56978
+MD5 (ocamlweb-1.34.tar.gz) = 901b36d5b3b3305bce679d10b2a57af6
+SIZE (ocamlweb-1.34.tar.gz) = 118959
+MD5 (ocamlweb-1.34-man.ps.gz) = 026a1adc7b3bedc7e390db2534470fc9
+SIZE (ocamlweb-1.34-man.ps.gz) = 56981
diff --git a/devel/ocamlweb/files/patch-ocaml-parser::terminfo.ml b/devel/ocamlweb/files/patch-ocaml-parser::terminfo.ml
new file mode 100644
index 000000000000..6f25a47e0c06
--- /dev/null
+++ b/devel/ocamlweb/files/patch-ocaml-parser::terminfo.ml
@@ -0,0 +1,14 @@
+--- ocaml-parser/terminfo.ml--	Mon Aug 16 21:38:18 2004
++++ ocaml-parser/terminfo.ml	Mon Aug 16 21:38:30 2004
+@@ -19,7 +19,7 @@
+   | Bad_term
+   | Good_term of int
+ ;;
+-external setup : out_channel -> status = "terminfo_setup";;
+-external backup : int -> unit = "terminfo_backup";;
+-external standout : bool -> unit = "terminfo_standout";;
+-external resume : int -> unit = "terminfo_resume";;
++external setup : out_channel -> status = "caml_terminfo_setup";;
++external backup : int -> unit = "caml_terminfo_backup";;
++external standout : bool -> unit = "caml_terminfo_standout";;
++external resume : int -> unit = "caml_terminfo_resume";;
diff --git a/devel/ocamlweb/files/patch-ocaml-parser::terminfo.mli b/devel/ocamlweb/files/patch-ocaml-parser::terminfo.mli
new file mode 100644
index 000000000000..6b6796a10b10
--- /dev/null
+++ b/devel/ocamlweb/files/patch-ocaml-parser::terminfo.mli
@@ -0,0 +1,14 @@
+--- ocaml-parser/terminfo.mli--	Mon Aug 16 21:37:42 2004
++++ ocaml-parser/terminfo.mli	Mon Aug 16 21:37:56 2004
+@@ -19,7 +19,7 @@
+   | Bad_term
+   | Good_term of int  (* number of lines of the terminal *)
+ ;;
+-external setup : out_channel -> status = "terminfo_setup";;
+-external backup : int -> unit = "terminfo_backup";;
+-external standout : bool -> unit = "terminfo_standout";;
+-external resume : int -> unit = "terminfo_resume";;
++external setup : out_channel -> status = "caml_terminfo_setup";;
++external backup : int -> unit = "caml_terminfo_backup";;
++external standout : bool -> unit = "caml_terminfo_standout";;
++external resume : int -> unit = "caml_terminfo_resume";;
diff --git a/devel/ocamlweb/pkg-plist b/devel/ocamlweb/pkg-plist
index 9a63d2b1cf21..f9dae1a5e628 100644
--- a/devel/ocamlweb/pkg-plist
+++ b/devel/ocamlweb/pkg-plist
@@ -1,6 +1,6 @@
 bin/ocamlweb
 share/texmf/tex/latex/misc/ocamlweb.sty
-%%PORTDOCS%%share/doc/ocamlweb/ocamlweb-1.32-man.ps.gz
+%%PORTDOCS%%share/doc/ocamlweb/ocamlweb-%%PORTVERSION%%-man.ps.gz
 %%PORTDOCS%%@dirrm share/doc/ocamlweb
 @exec %D/bin/mktexlsr
 @unexec %D/bin/mktexlsr