5 files changed, 56 insertions, 72 deletions

diff --git a/devel/camlp4/Makefile b/devel/camlp4/Makefile
index 887486a1651e..77ea8dfa98ef 100644
--- a/devel/camlp4/Makefile
+++ b/devel/camlp4/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	camlp4
-PORTVERSION=	3.00
+PORTVERSION=	3.01
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/ \
+		http://cristal.inria.fr/~ddr/Camlp4/ftp/ \
 		http://www.unknown.nu/ports/
 
 MAINTAINER=	user@unknown.nu
@@ -22,8 +23,8 @@ CONFIGURE_ENV=	PREFIX=${PREFIX}
 ALL_TARGET=	world bootstrap opt
 
 MAN1=		camlp4.1
-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
+MLINKS=		camlp4.1 camlp4o.1 camlp4.1 camlp4o.opt.1 \
+		camlp4.1 camlp4r.1 camlp4.1 camlp4r.opt.1 \
+		camlp4.1 mkcamlp4.1 camlp4.1 ocpp.1
 
 .include <bsd.port.mk>
diff --git a/devel/camlp4/distinfo b/devel/camlp4/distinfo
index 98633632ac06..45aa5b1d8e5e 100644
--- a/devel/camlp4/distinfo
+++ b/devel/camlp4/distinfo
@@ -1 +1 @@
-MD5 (camlp4-3.00.tar.gz) = 35d918bd70a7d325787346db33733973
+MD5 (camlp4-3.01.tar.gz) = 9baa7f4adbaa8f88eeb0e754bc681aec
diff --git a/devel/camlp4/files/patch-ab b/devel/camlp4/files/patch-ab
deleted file mode 100644
index 8e31f491c393..000000000000
--- a/devel/camlp4/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** 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-descr b/devel/camlp4/pkg-descr
index 2e963ec6078e..f9d769dc2d03 100644
--- a/devel/camlp4/pkg-descr
+++ b/devel/camlp4/pkg-descr
@@ -1,3 +1,5 @@
 Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml. It offers
 syntactic library tools and the ability to extend and/or redefine the
 concrete syntax of Objective Caml.
+
+WWW: http://caml.inria.fr/camlp4/
diff --git a/devel/camlp4/pkg-plist b/devel/camlp4/pkg-plist
index ed08654a0465..833de550ed0e 100644
--- a/devel/camlp4/pkg-plist
+++ b/devel/camlp4/pkg-plist
@@ -1,66 +1,66 @@
-bin/odyl
 bin/camlp4
-bin/camlp4r
 bin/camlp4o
+bin/camlp4r
 bin/mkcamlp4
 bin/ocpp
-lib/camlp4/odyl.cma
-lib/camlp4/odyl.cmo
-lib/camlp4/pcaml.mli
-lib/camlp4/quotation.mli
-lib/camlp4/mLast.mli
-lib/camlp4/pcaml.cmi
+bin/odyl
 lib/camlp4/ast2pt.cmi
-lib/camlp4/quotation.cmi
-lib/camlp4/mLast.cmi
 lib/camlp4/camlp4.cma
-lib/camlp4/extract_crc
-lib/camlp4/pr_dump.cmo
-lib/camlp4/pa_extend_m.cmo
-lib/camlp4/pa_extend.cmo
-lib/camlp4/pa_rp.cmo
-lib/camlp4/pa_r.cmo
-lib/camlp4/q_MLast.cmo
-lib/camlp4/q_phony.cmo
-lib/camlp4/pr_depend.cmo
-lib/camlp4/pr_null.cmo
-lib/camlp4/pr_extend.cmo
-lib/camlp4/pr_op.cmo
-lib/camlp4/pr_o.cmo
-lib/camlp4/pr_rp.cmo
-lib/camlp4/pr_r.cmo
-lib/camlp4/pa_ifdef.cmo
-lib/camlp4/pa_format.cmo
-lib/camlp4/pa_ru.cmo
-lib/camlp4/pa_oop.cmo
-lib/camlp4/pa_op.cmo
-lib/camlp4/pa_o.cmo
-lib/camlp4/pa_sml.cmo
-lib/camlp4/pa_o.cmi
-lib/camlp4/pa_ifdef.cmi
-lib/camlp4/lib.sml
 lib/camlp4/camlp4_top.cma
-lib/camlp4/camlp4r.cma
 lib/camlp4/camlp4o.cma
-lib/camlp4/ocpp.cmo
+lib/camlp4/camlp4r.cma
 lib/camlp4/crc.cmo
-lib/camlp4/token.mli
-lib/camlp4/stdpp.mli
-lib/camlp4/plexer.mli
-lib/camlp4/grammar.mli
-lib/camlp4/gramext.mli
-lib/camlp4/gramlib.cma
-lib/camlp4/token.cmi
-lib/camlp4/stdpp.cmi
-lib/camlp4/plexer.cmi
-lib/camlp4/grammar.cmi
+lib/camlp4/extract_crc
 lib/camlp4/gramext.cmi
 lib/camlp4/gramext.cmx
+lib/camlp4/gramext.mli
 lib/camlp4/gramlib.a
+lib/camlp4/gramlib.cma
 lib/camlp4/gramlib.cmxa
+lib/camlp4/grammar.cmi
 lib/camlp4/grammar.cmx
+lib/camlp4/grammar.mli
+lib/camlp4/lib.sml
+lib/camlp4/mLast.cmi
+lib/camlp4/mLast.mli
+lib/camlp4/ocpp.cmo
+lib/camlp4/odyl.cma
+lib/camlp4/odyl.cmo
+lib/camlp4/pa_extend.cmo
+lib/camlp4/pa_extend_m.cmo
+lib/camlp4/pa_format.cmo
+lib/camlp4/pa_ifdef.cmi
+lib/camlp4/pa_ifdef.cmo
+lib/camlp4/pa_o.cmi
+lib/camlp4/pa_o.cmo
+lib/camlp4/pa_olabl.cmo
+lib/camlp4/pa_oop.cmo
+lib/camlp4/pa_op.cmo
+lib/camlp4/pa_r.cmo
+lib/camlp4/pa_rp.cmo
+lib/camlp4/pa_ru.cmo
+lib/camlp4/pa_sml.cmo
+lib/camlp4/pcaml.cmi
+lib/camlp4/pcaml.mli
+lib/camlp4/plexer.cmi
 lib/camlp4/plexer.cmx
+lib/camlp4/plexer.mli
+lib/camlp4/pr_depend.cmo
+lib/camlp4/pr_dump.cmo
+lib/camlp4/pr_extend.cmo
+lib/camlp4/pr_null.cmo
+lib/camlp4/pr_o.cmo
+lib/camlp4/pr_op.cmo
+lib/camlp4/pr_r.cmo
+lib/camlp4/pr_rp.cmo
+lib/camlp4/q_MLast.cmo
+lib/camlp4/q_phony.cmo
+lib/camlp4/quotation.cmi
+lib/camlp4/quotation.mli
+lib/camlp4/stdpp.cmi
 lib/camlp4/stdpp.cmx
+lib/camlp4/stdpp.mli
+lib/camlp4/token.cmi
 lib/camlp4/token.cmx
-lib/camlp4/pa_olabl.cmo
+lib/camlp4/token.mli
 @dirrm lib/camlp4