Update to 3.00

PR:		21485
Submitted by:	maintainer

4 files changed, 26 insertions, 11 deletions

diff --git a/devel/camlp4/Makefile b/devel/camlp4/Makefile
index aa78edbe9151..887486a1651e 100644
--- a/devel/camlp4/Makefile
+++ b/devel/camlp4/Makefile
@@ -4,20 +4,15 @@
 #
 # $FreeBSD$
 #
-# This is not the current version, but the version needs to
-# be <= the version of ocaml, which hasn't been updated. Once
-# the ocaml maintainer updates it, I'll update this.
 
 PORTNAME=	camlp4
-PORTVERSION=	2.04
+PORTVERSION=	3.00
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/OLD/2.04/ \
+MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/ \
 		http://www.unknown.nu/ports/
 
 MAINTAINER=	user@unknown.nu
 
-BROKEN=		"Does not compile"
-
 BUILD_DEPENDS=	ocamlc.opt:${PORTSDIR}/lang/ocaml
 
 HAS_CONFIGURE=	yes
@@ -27,8 +22,8 @@ CONFIGURE_ENV=	PREFIX=${PREFIX}
 ALL_TARGET=	world bootstrap opt
 
 MAN1=		camlp4.1
-MANLINKS=	camlp4.1 camlp4o.1 camlp4.1 camlp4r.1 camlp4.1 mkcamlp4.1 \
-		camlp4.1 ocpp.1
-MANCOMPRESSED=	no
+MLINKS=	camlp4.1 camlp4o.1 camlp4.1 camlp4r.1 camlp4.1 mkcamlp4.1 \
+		camlp4.1 ocpp.1 camlp4.1 camlp4o.1 camlp4.1 camlp4r.opt.1 \
+		camlp4.1 camlp4o.opt.1
 
 .include <bsd.port.mk>
diff --git a/devel/camlp4/distinfo b/devel/camlp4/distinfo
index 7ebd4cbc294f..98633632ac06 100644
--- a/devel/camlp4/distinfo
+++ b/devel/camlp4/distinfo
@@ -1 +1 @@
-MD5 (camlp4-2.04.tar.gz) = 4998bcc33f421f548e0d98d70d3fa9d9
+MD5 (camlp4-3.00.tar.gz) = 35d918bd70a7d325787346db33733973
diff --git a/devel/camlp4/files/patch-ab b/devel/camlp4/files/patch-ab
new file mode 100644
index 000000000000..8e31f491c393
--- /dev/null
+++ b/devel/camlp4/files/patch-ab
@@ -0,0 +1,19 @@
+*** Makefile.orig	Tue Apr 18 10:44:11 2000
+--- Makefile	Fri Sep 22 15:04:48 2000
+***************
+*** 11,17 ****
+  	set -e; for i in $(DIRS); do cd $$i; $(MAKE) all; cd ..; done
+  
+  opt:
+! 	set -e; for i in $(OPTDIRS); do cd $$i; $(MAKE) opt; cd ..; done
+  
+  clean_hot:
+  	for i in $(DIRS); do (cd $$i; $(MAKE) clean); done
+--- 11,17 ----
+  	set -e; for i in $(DIRS); do cd $$i; $(MAKE) all; cd ..; done
+  
+  opt:
+! 	cd lib; $(MAKE) opt
+  
+  clean_hot:
+  	for i in $(DIRS); do (cd $$i; $(MAKE) clean); done
diff --git a/devel/camlp4/pkg-plist b/devel/camlp4/pkg-plist
index fb8d453e0eeb..ed08654a0465 100644
--- a/devel/camlp4/pkg-plist
+++ b/devel/camlp4/pkg-plist
@@ -62,4 +62,5 @@ lib/camlp4/grammar.cmx
 lib/camlp4/plexer.cmx
 lib/camlp4/stdpp.cmx
 lib/camlp4/token.cmx
+lib/camlp4/pa_olabl.cmo
 @dirrm lib/camlp4