Upgrade to 3.06 => remove BROKEN.

PR:		ports/43405
Submitted by:	maintainer

4 files changed, 181 insertions, 100 deletions

diff --git a/devel/camlp4/Makefile b/devel/camlp4/Makefile
index 8eee64f6de78..83b8662bfe60 100644
--- a/devel/camlp4/Makefile
+++ b/devel/camlp4/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:   brs
+# New ports collection makefile for:   camlp4
 # Date created:        12 July 2000
 # Whom:                Kim Scarborough <user@unknown.nu>
 #
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	camlp4
-PORTVERSION=	3.02
+PORTVERSION=	3.06
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/ \
 		http://cristal.inria.fr/~ddr/Camlp4/ftp/ \
 		http://www.unknown.nu/ports/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DOCFILES}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-manual.html${EXTRACT_SUFX} \
+	      	${DISTNAME}-tutorial.html${EXTRACT_SUFX}
 
 MAINTAINER=	user@unknown.nu
 
-BROKEN=		"Does not build"
-
 BUILD_DEPENDS=	ocamlc.opt:${PORTSDIR}/lang/ocaml
 
 HAS_CONFIGURE=	yes
-CONFIGURE_WRKSRC=	${WRKSRC}/config
-CONFIGURE_SCRIPT=	configure_batch
-CONFIGURE_ENV=	PREFIX=${PREFIX}
 ALL_TARGET=	world bootstrap opt
 
 MAN1=		camlp4.1
@@ -29,4 +27,22 @@ 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
 
+CONFIGURE_ARGS=	--prefix ${PREFIX}
+
+.if !defined(NOPORTDOCS)
+DOCFILES=	${DISTNAME}-manual.html${EXTRACT_SUFX} ${DISTNAME}-manual.ps.gz \
+	  	${DISTNAME}-tutorial.html${EXTRACT_SUFX} ${DISTNAME}-tutorial.ps.gz
+.endif
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/html/manual/lib
+	@${MKDIR} ${DOCSDIR}/html/tutorial
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}-manual.html/lib/* ${DOCSDIR}/html/manual/lib/
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}-manual.html/[c-im-p]* ${DOCSDIR}/html/manual/
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}-tutorial.html/* ${DOCSDIR}/html/tutorial/
+	@${INSTALL_DATA} ${DISTDIR}/${DISTNAME}-manual.ps.gz ${DOCSDIR}/
+	@${INSTALL_DATA} ${DISTDIR}/${DISTNAME}-tutorial.ps.gz ${DOCSDIR}/
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/camlp4/distinfo b/devel/camlp4/distinfo
index 096f2d0b154d..32ee76dcdc35 100644
--- a/devel/camlp4/distinfo
+++ b/devel/camlp4/distinfo
@@ -1 +1,5 @@
-MD5 (camlp4-3.02.tar.gz) = aa4e733599ed67acea48e3a1a659c383
+MD5 (camlp4-3.06.tar.gz) = 4f0bd2797a76162c5b75ed961bd13e5e
+MD5 (camlp4-3.06-manual.html.tar.gz) = 21370bae4e7f6435b38aeb21db7ce8bb
+MD5 (camlp4-3.06-manual.ps.gz) = 9e63aa74f8632e421a503693e732473a
+MD5 (camlp4-3.06-tutorial.html.tar.gz) = 96d8eb4ca5abd58c9a280ba59f73b192
+MD5 (camlp4-3.06-tutorial.ps.gz) = 2542e23effc18a75669b6e923eef9082
diff --git a/devel/camlp4/files/patch-aa b/devel/camlp4/files/patch-aa
deleted file mode 100644
index 8e590cc5e1c5..000000000000
--- a/devel/camlp4/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** config/configure_batch.orig	Wed May 12 01:11:18 1999
---- config/configure_batch	Wed Jul 12 15:20:17 2000
-***************
-*** 1,7 ****
-  #! /bin/sh
-  # $Id: configure_batch,v 2.1 1999/05/12 06:11:18 ddr Exp $
-  
-! prefix=/usr/local
-  bindir=''
-  libdir=''
-  mandir=''
---- 1,7 ----
-  #! /bin/sh
-  # $Id: configure_batch,v 2.1 1999/05/12 06:11:18 ddr Exp $
-  
-! prefix=$PREFIX
-  bindir=''
-  libdir=''
-  mandir=''
diff --git a/devel/camlp4/pkg-plist b/devel/camlp4/pkg-plist
index 3b5bacafb27d..1fd793a45a0f 100644
--- a/devel/camlp4/pkg-plist
+++ b/devel/camlp4/pkg-plist
@@ -1,77 +1,157 @@
 bin/camlp4
-bin/camlp4o
 bin/camlp4r
+bin/camlp4sch
+bin/camlp4o
 bin/mkcamlp4
 bin/ocpp
-bin/odyl
-lib/camlp4/ast2pt.cmi
-lib/camlp4/camlp4.cma
-lib/camlp4/camlp4_top.cma
-lib/camlp4/camlp4o.cma
-lib/camlp4/camlp4r.cma
-lib/camlp4/crc.cmo
-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
-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_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
-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_extfun.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/spretty.cmi
-lib/camlp4/spretty.mli
-lib/camlp4/stdpp.cmi
-lib/camlp4/stdpp.cmx
-lib/camlp4/stdpp.mli
-lib/camlp4/token.cmi
-lib/camlp4/token.cmx
-lib/camlp4/token.mli
-@dirrm lib/camlp4
+lib/ocaml/camlp4/odyl.cma
+lib/ocaml/camlp4/odyl.cmo
+lib/ocaml/camlp4/spretty.mli
+lib/ocaml/camlp4/pcaml.mli
+lib/ocaml/camlp4/ast2pt.mli
+lib/ocaml/camlp4/quotation.mli
+lib/ocaml/camlp4/mLast.mli
+lib/ocaml/camlp4/spretty.cmi
+lib/ocaml/camlp4/pcaml.cmi
+lib/ocaml/camlp4/ast2pt.cmi
+lib/ocaml/camlp4/quotation.cmi
+lib/ocaml/camlp4/mLast.cmi
+lib/ocaml/camlp4/camlp4.cma
+lib/ocaml/camlp4/pa_extend.cmo
+lib/ocaml/camlp4/pa_ifdef.cmo
+lib/ocaml/camlp4/pa_extend_m.cmo
+lib/ocaml/camlp4/pr_dump.cmo
+lib/ocaml/camlp4/pa_rp.cmo
+lib/ocaml/camlp4/pa_r.cmo
+lib/ocaml/camlp4/q_MLast.cmo
+lib/ocaml/camlp4/pa_extend.cmi
+lib/ocaml/camlp4/pa_ifdef.cmi
+lib/ocaml/camlp4/q_phony.cmo
+lib/ocaml/camlp4/pr_null.cmo
+lib/ocaml/camlp4/pr_extfun.cmo
+lib/ocaml/camlp4/pr_extend.cmo
+lib/ocaml/camlp4/pr_op.cmo
+lib/ocaml/camlp4/pr_o.cmo
+lib/ocaml/camlp4/pr_rp.cmo
+lib/ocaml/camlp4/pr_r.cmo
+lib/ocaml/camlp4/pa_lefteval.cmo
+lib/ocaml/camlp4/pa_fstream.cmo
+lib/ocaml/camlp4/pa_extfun.cmo
+lib/ocaml/camlp4/pa_extfold.cmo
+lib/ocaml/camlp4/pa_scheme.cmo
+lib/ocaml/camlp4/pa_lisp.cmo
+lib/ocaml/camlp4/pa_sml.cmo
+lib/ocaml/camlp4/pa_olabl.cmo
+lib/ocaml/camlp4/pa_format.cmo
+lib/ocaml/camlp4/pa_ru.cmo
+lib/ocaml/camlp4/pa_oop.cmo
+lib/ocaml/camlp4/pa_op.cmo
+lib/ocaml/camlp4/pa_o.cmo
+lib/ocaml/camlp4/pr_depend.cmo
+lib/ocaml/camlp4/pa_o.cmi
+lib/ocaml/camlp4/lib.sml
+lib/ocaml/camlp4/crc.cmo
+lib/ocaml/camlp4/camlp4_top.cma
+lib/ocaml/camlp4/camlp4sch.cma
+lib/ocaml/camlp4/camlp4r.cma
+lib/ocaml/camlp4/camlp4o.cma
+lib/ocaml/camlp4/ocpp.cmo
+lib/ocaml/camlp4/gramlib.cma
+lib/ocaml/camlp4/stdpp.mli
+lib/ocaml/camlp4/plexer.mli
+lib/ocaml/camlp4/grammar.mli
+lib/ocaml/camlp4/gramext.mli
+lib/ocaml/camlp4/fstream.mli
+lib/ocaml/camlp4/extfun.mli
+lib/ocaml/camlp4/extfold.mli
+lib/ocaml/camlp4/token.mli
+lib/ocaml/camlp4/extfold.cmi
+lib/ocaml/camlp4/stdpp.cmi
+lib/ocaml/camlp4/plexer.cmi
+lib/ocaml/camlp4/grammar.cmi
+lib/ocaml/camlp4/gramext.cmi
+lib/ocaml/camlp4/fstream.cmi
+lib/ocaml/camlp4/extfun.cmi
+lib/ocaml/camlp4/token.cmi
+lib/ocaml/camlp4/gramlib.cmxa
+lib/ocaml/camlp4/stdpp.cmx
+lib/ocaml/camlp4/plexer.cmx
+lib/ocaml/camlp4/grammar.cmx
+lib/ocaml/camlp4/gramext.cmx
+lib/ocaml/camlp4/fstream.cmx
+lib/ocaml/camlp4/extfun.cmx
+lib/ocaml/camlp4/extfold.cmx
+lib/ocaml/camlp4/token.cmx
+lib/ocaml/camlp4/gramlib.a
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Extfun.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Grammar.Entry.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Grammar.GLexerType.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Grammar.GMake.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Grammar.S.Entry.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Grammar.S.Unsafe.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Grammar.S.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Grammar.Unsafe.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Grammar.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Pcaml.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Plexer.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Quotation.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Stdpp.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/Token.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/index.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/index_attributes.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/index_class_types.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/index_classes.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/style.css
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/index_exceptions.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/index_methods.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/index_module_types.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/index_modules.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/index_types.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/index_values.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Extfun.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Grammar.Entry.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Grammar.GLexerType.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Grammar.GMake.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Grammar.S.Entry.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Grammar.S.Unsafe.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Grammar.S.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Grammar.Unsafe.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Grammar.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Pcaml.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Plexer.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Quotation.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Stdpp.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/lib/type_Token.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/contents_motif.gif
+%%PORTDOCS%%share/doc/camlp4/html/manual/index.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/manual001.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/manual002.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/manual003.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/manual004.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/manual005.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/manual006.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/manual007.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/manual008.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/manual009.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/manual010.html
+%%PORTDOCS%%share/doc/camlp4/html/manual/next_motif.gif
+%%PORTDOCS%%share/doc/camlp4/html/manual/previous_motif.gif
+%%PORTDOCS%%share/doc/camlp4/html/tutorial/contents_motif.gif
+%%PORTDOCS%%share/doc/camlp4/html/tutorial/index.html
+%%PORTDOCS%%share/doc/camlp4/html/tutorial/next_motif.gif
+%%PORTDOCS%%share/doc/camlp4/html/tutorial/previous_motif.gif
+%%PORTDOCS%%share/doc/camlp4/html/tutorial/tutorial001.html
+%%PORTDOCS%%share/doc/camlp4/html/tutorial/tutorial002.html
+%%PORTDOCS%%share/doc/camlp4/html/tutorial/tutorial003.html
+%%PORTDOCS%%share/doc/camlp4/html/tutorial/tutorial004.html
+%%PORTDOCS%%share/doc/camlp4/html/tutorial/tutorial005.html
+%%PORTDOCS%%share/doc/camlp4/html/tutorial/tutorial006.html
+%%PORTDOCS%%share/doc/camlp4/html/tutorial/tutorial007.html
+%%PORTDOCS%%share/doc/camlp4/html/tutorial/tutorial008.html
+%%PORTDOCS%%share/doc/camlp4/camlp4-3.06-manual.ps.gz
+%%PORTDOCS%%share/doc/camlp4/camlp4-3.06-tutorial.ps.gz
+%%PORTDOCS%%@dirrm share/doc/camlp4/html/manual/lib
+%%PORTDOCS%%@dirrm share/doc/camlp4/html/manual
+%%PORTDOCS%%@dirrm share/doc/camlp4/html/tutorial
+%%PORTDOCS%%@dirrm share/doc/camlp4/html
+%%PORTDOCS%%@dirrm share/doc/camlp4