diff --git a/lang/camlp4/Makefile b/lang/camlp4/Makefile
index 6dee7889546..b5e81584521 100644
--- a/lang/camlp4/Makefile
+++ b/lang/camlp4/Makefile
@@ -1,16 +1,26 @@
-# $OpenBSD: Makefile,v 1.16 2001/06/20 01:43:24 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.17 2001/09/11 12:16:32 heko Exp $
 
 COMMENT=	"Pre-Processor-Pretty-Printer for Objective Caml"
+COMMENT-doc=	"Camlp4 documentation"
 
-DISTNAME=	camlp4-3.00
-PKGNAME=	camlp4-3.00
+VERSION=	3.02
+DISTNAME=	camlp4-${VERSION}
+PKGNAME=	camlp4-${VERSION}
+PKGNAME-doc=	camlp4-doc-${VERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+                ${DISTNAME}-refman.html${EXTRACT_SUFX} \
+                ${DISTNAME}-tutorial.html${EXTRACT_SUFX}
 CATEGORIES=	lang
-NEED_VERSION=	1.402
-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/Daniel.de_Rauglaudre/Camlp4/
+NEED_VERSION=	1.454
+MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/ \
+		http://cristal.inria.fr/~ddr/Camlp4/ftp/
+
+HOMEPAGE=	http://caml.inria.fr/camlp4/
 
 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>
 
 BUILD_DEPENDS=	ocamlc::lang/ocaml
+RUN_DEPENDS=	ocamlrun::lang/ocaml
 
 # License: BSD
 PERMIT_PACKAGE_CDROM=   No
@@ -18,6 +28,9 @@ PERMIT_PACKAGE_FTP=     No
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
+MULTI_PACKAGES=	-doc
+SUBPACKAGE?=
+
 do-configure:
 	@sed -e s,@PREFIX@,${PREFIX}, <${FILESDIR}/Makefile.cnf.template >${WRKSRC}/config/Makefile.cnf
 	@cd ${WRKSRC}/config && echo ""| cat Makefile.tpl - Makefile.cnf >>Makefile
@@ -25,6 +38,11 @@ do-configure:
 USE_GMAKE=	Yes
 ALL_TARGET=	world bootstrap opt
 
-WRKDIST=		${WRKDIR}/camlp4-3.00
+WRKDIST=		${WRKDIR}/camlp4-${VERSION}
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/camlp4
+	cd ${PREFIX}/share/doc/camlp4 && pax -s /${DISTNAME}-refman.html/refman/ -rzf ${DISTDIR}/${DISTNAME}-refman.html${EXTRACT_SUFX}
+	cd ${PREFIX}/share/doc/camlp4 && pax -s /${DISTNAME}-tutorial.html/tutorial/ -rzf ${DISTDIR}/${DISTNAME}-tutorial.html${EXTRACT_SUFX}
 
 .include <bsd.port.mk>
diff --git a/lang/camlp4/files/Makefile.cnf.template b/lang/camlp4/files/Makefile.cnf.template
index c5d1dae1c3d..4ca76672598 100644
--- a/lang/camlp4/files/Makefile.cnf.template
+++ b/lang/camlp4/files/Makefile.cnf.template
@@ -1,3 +1,5 @@
+OTOP=../ocaml_stuff
+OPT=
 OLIBDIR=$(DESTDIR)@PREFIX@/lib/ocaml
 BINDIR=$(DESTDIR)@PREFIX@/bin
 LIBDIR=$(DESTDIR)@PREFIX@/lib/camlp4
diff --git a/lang/camlp4/files/md5 b/lang/camlp4/files/md5
index bdddd1bc6cd..dfcd89dc8f0 100644
--- a/lang/camlp4/files/md5
+++ b/lang/camlp4/files/md5
@@ -1,3 +1,9 @@
-MD5 (camlp4-3.00.tar.gz) = 35d918bd70a7d325787346db33733973
-RMD160 (camlp4-3.00.tar.gz) = 602c1da48f28940a0646f1bb4107e7f7b3c31425
-SHA1 (camlp4-3.00.tar.gz) = 82315fd4e616735ec8b5aef10593b7e8e31327e8
+MD5 (camlp4-3.02-refman.html.tar.gz) = d30e06c1e84a4b341ce7770d8fe483d4
+MD5 (camlp4-3.02-tutorial.html.tar.gz) = 188dbc170f0b43e3b38f9a894b070a6d
+MD5 (camlp4-3.02.tar.gz) = aa4e733599ed67acea48e3a1a659c383
+RMD160 (camlp4-3.02-refman.html.tar.gz) = d22aeb2d7e49ad73b266a248b8a68e00af2eae3e
+RMD160 (camlp4-3.02-tutorial.html.tar.gz) = 890903cba00a78b439a4f6ff73ea6a702710ac16
+RMD160 (camlp4-3.02.tar.gz) = 8c8a069a1c4582d0b209342bfa094e38b9a2ec9a
+SHA1 (camlp4-3.02-refman.html.tar.gz) = 041a08231d6cd3a9cb4c111c693874f94d4708a1
+SHA1 (camlp4-3.02-tutorial.html.tar.gz) = fb106883d381717920eebe412ae433a46072ef25
+SHA1 (camlp4-3.02.tar.gz) = c04ddabbc2bf3136832625ff732334a89c452fa9
diff --git a/lang/camlp4/patches/patch-aa b/lang/camlp4/patches/patch-aa
deleted file mode 100644
index b75f74b9187..00000000000
--- a/lang/camlp4/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- config/Makefile.tpl.orig	Sun Nov 21 21:49:11 1999
-+++ config/Makefile.tpl	Sun Nov 21 21:49:20 1999
-@@ -2,8 +2,8 @@
- 
- EXE=
- COMP=../tools/compile
--OCAMLC=ocamlc.opt
--OCAMLOPT=ocamlopt.opt
-+OCAMLC=ocamlc
-+OCAMLOPT=ocamlopt
- OCAMLCFLAGS=
- MKDIR=mkdir -p
- 
diff --git a/lang/camlp4/pkg/DESCR b/lang/camlp4/pkg/DESCR
index a24a13ab470..51135c64d1e 100644
--- a/lang/camlp4/pkg/DESCR
+++ b/lang/camlp4/pkg/DESCR
@@ -1 +1,7 @@
 Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml.
+It offers tools for syntax (grammars) and the ability to modify 
+the concrete syntax of the language (quotations, syntax extensions). 
+Camlp4 can parse normal Ocaml concrete syntax or any other 
+user-definable syntax.
+
+WWW:	${HOMEPAGE}
diff --git a/lang/camlp4/pkg/DESCR-doc b/lang/camlp4/pkg/DESCR-doc
new file mode 100644
index 00000000000..1e89771ca96
--- /dev/null
+++ b/lang/camlp4/pkg/DESCR-doc
@@ -0,0 +1,3 @@
+Camlp4 documentation, refman.html and tutorial.html.
+
+WWW: ${HOMEPAGE}
diff --git a/lang/camlp4/pkg/PLIST b/lang/camlp4/pkg/PLIST
index 7b0e96393d2..2d18476e642 100644
--- a/lang/camlp4/pkg/PLIST
+++ b/lang/camlp4/pkg/PLIST
@@ -1,9 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2000/05/21 19:55:08 angelos Exp $
+@comment $OpenBSD: PLIST,v 1.4 2001/09/11 12:16:32 heko Exp $
 bin/camlp4
 bin/camlp4o
-bin/camlp4o.opt
 bin/camlp4r
-bin/camlp4r.opt
 bin/mkcamlp4
 bin/ocpp
 bin/odyl
@@ -13,7 +11,12 @@ lib/camlp4/camlp4_top.cma
 lib/camlp4/camlp4o.cma
 lib/camlp4/camlp4r.cma
 lib/camlp4/crc.cmo
-lib/camlp4/extract_crc
+lib/camlp4/extfun.cmi
+lib/camlp4/extfun.cmx
+lib/camlp4/extfun.mli
+lib/camlp4/fstream.cmi
+lib/camlp4/fstream.cmx
+lib/camlp4/fstream.mli
 lib/camlp4/gramext.cmi
 lib/camlp4/gramext.cmx
 lib/camlp4/gramext.mli
@@ -31,9 +34,12 @@ lib/camlp4/odyl.cma
 lib/camlp4/odyl.cmo
 lib/camlp4/pa_extend.cmo
 lib/camlp4/pa_extend_m.cmo
+lib/camlp4/pa_extfun.cmo
 lib/camlp4/pa_format.cmo
+lib/camlp4/pa_fstream.cmo
 lib/camlp4/pa_ifdef.cmi
 lib/camlp4/pa_ifdef.cmo
+lib/camlp4/pa_lisp.cmo
 lib/camlp4/pa_o.cmi
 lib/camlp4/pa_o.cmo
 lib/camlp4/pa_olabl.cmo
@@ -51,6 +57,7 @@ lib/camlp4/plexer.mli
 lib/camlp4/pr_depend.cmo
 lib/camlp4/pr_dump.cmo
 lib/camlp4/pr_extend.cmo
+lib/camlp4/pr_extfun.cmo
 lib/camlp4/pr_null.cmo
 lib/camlp4/pr_o.cmo
 lib/camlp4/pr_op.cmo
@@ -60,6 +67,8 @@ lib/camlp4/q_MLast.cmo
 lib/camlp4/q_phony.cmo
 lib/camlp4/quotation.cmi
 lib/camlp4/quotation.mli
+lib/camlp4/spretty.cmi
+lib/camlp4/spretty.mli
 lib/camlp4/stdpp.cmi
 lib/camlp4/stdpp.cmx
 lib/camlp4/stdpp.mli
@@ -68,9 +77,7 @@ lib/camlp4/token.cmx
 lib/camlp4/token.mli
 man/man1/camlp4.1
 man/man1/camlp4o.1
-man/man1/camlp4o.opt.1
 man/man1/camlp4r.1
-man/man1/camlp4r.opt.1
 man/man1/mkcamlp4.1
 man/man1/ocpp.1
 @dirrm lib/camlp4
diff --git a/lang/camlp4/pkg/PLIST-doc b/lang/camlp4/pkg/PLIST-doc
new file mode 100644
index 00000000000..3e64c9fa98a
--- /dev/null
+++ b/lang/camlp4/pkg/PLIST-doc
@@ -0,0 +1,28 @@
+@comment $OpenBSD: PLIST-doc,v 1.1 2001/09/11 12:16:32 heko Exp $
+share/doc/camlp4/refman/contents_motif.gif
+share/doc/camlp4/refman/index.html
+share/doc/camlp4/refman/manual001.html
+share/doc/camlp4/refman/manual002.html
+share/doc/camlp4/refman/manual003.html
+share/doc/camlp4/refman/manual004.html
+share/doc/camlp4/refman/manual005.html
+share/doc/camlp4/refman/manual006.html
+share/doc/camlp4/refman/manual007.html
+share/doc/camlp4/refman/manual008.html
+share/doc/camlp4/refman/manual009.html
+share/doc/camlp4/refman/next_motif.gif
+share/doc/camlp4/refman/previous_motif.gif
+share/doc/camlp4/tutorial/contents_motif.gif
+share/doc/camlp4/tutorial/index.html
+share/doc/camlp4/tutorial/next_motif.gif
+share/doc/camlp4/tutorial/previous_motif.gif
+share/doc/camlp4/tutorial/tutorial001.html
+share/doc/camlp4/tutorial/tutorial002.html
+share/doc/camlp4/tutorial/tutorial003.html
+share/doc/camlp4/tutorial/tutorial004.html
+share/doc/camlp4/tutorial/tutorial005.html
+share/doc/camlp4/tutorial/tutorial006.html
+share/doc/camlp4/tutorial/tutorial007.html
+@dirrm share/doc/camlp4/tutorial
+@dirrm share/doc/camlp4/refman
+@dirrm share/doc/camlp4