- Update of coq from 7.4 to 8.0pl2

- Initial patches supplied by Antoine Reilles, thanks !
- Lots of changes/fixes/updates, see: CHANGES

5 files changed, 484 insertions, 71 deletions

diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index 51ec5ccdc17..d54289f7a7d 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,28 +1,39 @@
-# $NetBSD: Makefile,v 1.7 2004/12/24 17:21:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2005/02/05 11:19:02 adrianp Exp $
 #
 
-DISTNAME=	coq-7.4
-PKGREVISION=	3
+DISTNAME=	coq-8.0pl2
 CATEGORIES=	lang math
-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/coq/V7.4/
+MASTER_SITES=	ftp://ftp.inria.fr/INRIA/coq/V8.0pl2/
 
 MAINTAINER=	richards+netbsd@CS.Princeton.EDU
 HOMEPAGE=	http://coq.inria.fr/
 COMMENT=	Theorem prover which extracts programs from proofs
 
-USE_GNU_TOOLS+=	make
-USE_BUILDLINK3=	YES
-HAS_CONFIGURE=	YES
+USE_GNU_TOOLS+=		make
+USE_BUILDLINK3=		YES
+HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	-prefix ${PREFIX}
 CONFIGURE_ARGS+=	-emacslib ${PREFIX}/share/emacs/site-lisp
 CONFIGURE_ARGS+=	-reals all
-BUILD_TARGET=	world
+BUILD_TARGET=		world
+
+BUILDLINK_DEPENDS.ocaml+=       ocaml>=3.06
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+	(${MACHINE_ARCH} == "sparc")
 PLIST_SRC=	${PKGDIR}/PLIST.opt ${PKGDIR}/PLIST
 .endif
 
+.if ${OPSYS} == "Darwin"
+INSTALL_UNSTRIPPED=     yes
+# See PR# 28772 as the above should work but it appears to be ignored
+# so we set it explicitly below not to stip installed binaries.
+_STRIPFLAG_CC=
+_STRIPFLAG_INSTALL=
+.endif
+
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/coq/PLIST b/lang/coq/PLIST
index 19c6620f21e..d0b47f9a398 100644
--- a/lang/coq/PLIST
+++ b/lang/coq/PLIST
@@ -1,31 +1,25 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/22 20:21:17 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/05 11:19:02 adrianp Exp $
 bin/coq-interface
 bin/coq-tex
 bin/coq_makefile
-bin/coq_vo2xml
 bin/coqc
 bin/coqdep
+bin/coqdoc
 bin/coqmktop
 bin/coqtop
 bin/coqtop.byte
+bin/coqwc
+bin/parser
 bin/gallina
-lib/coq/contrib/cc/CC.vo
-lib/coq/contrib/correctness/ArrayPermut.vo
-lib/coq/contrib/correctness/Arrays.vo
-lib/coq/contrib/correctness/Correctness.vo
-lib/coq/contrib/correctness/Exchange.vo
-lib/coq/contrib/correctness/ProgBool.vo
-lib/coq/contrib/correctness/ProgInt.vo
-lib/coq/contrib/correctness/Sorted.vo
-lib/coq/contrib/correctness/Tuples.vo
 lib/coq/contrib/field/Field.vo
 lib/coq/contrib/field/Field_Compl.vo
 lib/coq/contrib/field/Field_Tactic.vo
 lib/coq/contrib/field/Field_Theory.vo
 lib/coq/contrib/fourier/Fourier.vo
 lib/coq/contrib/fourier/Fourier_util.vo
-lib/coq/contrib/interface/Centaur.vo
 lib/coq/contrib/omega/Omega.vo
+lib/coq/contrib/cc/CCSolve.vo
+lib/coq/contrib/interface/vernacrc
 lib/coq/contrib/ring/ArithRing.vo
 lib/coq/contrib/ring/Quote.vo
 lib/coq/contrib/ring/Ring.vo
@@ -36,9 +30,10 @@ lib/coq/contrib/ring/Setoid_ring.vo
 lib/coq/contrib/ring/Setoid_ring_normalize.vo
 lib/coq/contrib/ring/Setoid_ring_theory.vo
 lib/coq/contrib/ring/ZArithRing.vo
+lib/coq/contrib/ring/NArithRing.vo
+lib/coq/contrib/omega/OmegaLemmas.vo
 lib/coq/contrib/romega/ROmega.vo
 lib/coq/contrib/romega/ReflOmegaCore.vo
-lib/coq/states/barestate.coq
 lib/coq/states/initial.coq
 lib/coq/theories/Arith/Arith.vo
 lib/coq/theories/Arith/Between.vo
@@ -49,6 +44,7 @@ lib/coq/theories/Arith/Div2.vo
 lib/coq/theories/Arith/EqNat.vo
 lib/coq/theories/Arith/Euclid.vo
 lib/coq/theories/Arith/Even.vo
+lib/coq/theories/Arith/Factorial.vo
 lib/coq/theories/Arith/Gt.vo
 lib/coq/theories/Arith/Le.vo
 lib/coq/theories/Arith/Lt.vo
@@ -67,16 +63,12 @@ lib/coq/theories/Bool/IfProp.vo
 lib/coq/theories/Bool/Sumbool.vo
 lib/coq/theories/Bool/Zerob.vo
 lib/coq/theories/Init/Datatypes.vo
-lib/coq/theories/Init/DatatypesSyntax.vo
 lib/coq/theories/Init/Logic.vo
-lib/coq/theories/Init/LogicSyntax.vo
 lib/coq/theories/Init/Logic_Type.vo
-lib/coq/theories/Init/Logic_TypeSyntax.vo
 lib/coq/theories/Init/Peano.vo
-lib/coq/theories/Init/PeanoSyntax.vo
 lib/coq/theories/Init/Prelude.vo
+lib/coq/theories/Init/Notations.vo
 lib/coq/theories/Init/Specif.vo
-lib/coq/theories/Init/SpecifSyntax.vo
 lib/coq/theories/Init/Wf.vo
 lib/coq/theories/IntMap/Adalloc.vo
 lib/coq/theories/IntMap/Addec.vo
@@ -96,11 +88,10 @@ lib/coq/theories/IntMap/Maplists.vo
 lib/coq/theories/IntMap/Mapsubset.vo
 lib/coq/theories/Lists/List.vo
 lib/coq/theories/Lists/ListSet.vo
-lib/coq/theories/Lists/PolyList.vo
-lib/coq/theories/Lists/PolyListSyntax.vo
 lib/coq/theories/Lists/Streams.vo
 lib/coq/theories/Lists/TheoryList.vo
 lib/coq/theories/Logic/Berardi.vo
+lib/coq/theories/Lists/MonoList.vo
 lib/coq/theories/Logic/Classical.vo
 lib/coq/theories/Logic/ClassicalFacts.vo
 lib/coq/theories/Logic/Classical_Pred_Set.vo
@@ -113,6 +104,11 @@ lib/coq/theories/Logic/Eqdep_dec.vo
 lib/coq/theories/Logic/Hurkens.vo
 lib/coq/theories/Logic/JMeq.vo
 lib/coq/theories/Logic/ProofIrrelevance.vo
+lib/coq/theories/Logic/ChoiceFacts.vo
+lib/coq/theories/Logic/ClassicalChoice.vo
+lib/coq/theories/Logic/ClassicalDescription.vo
+lib/coq/theories/Logic/Diaconescu.vo
+lib/coq/theories/Logic/RelationalChoice.vo
 lib/coq/theories/Reals/Alembert.vo
 lib/coq/theories/Reals/AltSeries.vo
 lib/coq/theories/Reals/ArithProp.vo
@@ -154,7 +150,6 @@ lib/coq/theories/Reals/Rprod.vo
 lib/coq/theories/Reals/Rseries.vo
 lib/coq/theories/Reals/Rsigma.vo
 lib/coq/theories/Reals/Rsqrt_def.vo
-lib/coq/theories/Reals/Rsyntax.vo
 lib/coq/theories/Reals/Rtopology.vo
 lib/coq/theories/Reals/Rtrigo.vo
 lib/coq/theories/Reals/Rtrigo_alt.vo
@@ -167,7 +162,6 @@ lib/coq/theories/Reals/SeqSeries.vo
 lib/coq/theories/Reals/SplitAbsolu.vo
 lib/coq/theories/Reals/SplitRmult.vo
 lib/coq/theories/Reals/Sqrt_reg.vo
-lib/coq/theories/Reals/TypeSyntax.vo
 lib/coq/theories/Relations/Newman.vo
 lib/coq/theories/Relations/Operators_Properties.vo
 lib/coq/theories/Relations/Relation_Definitions.vo
@@ -209,6 +203,10 @@ lib/coq/theories/Wellfounded/Transitive_Closure.vo
 lib/coq/theories/Wellfounded/Union.vo
 lib/coq/theories/Wellfounded/Well_Ordering.vo
 lib/coq/theories/Wellfounded/Wellfounded.vo
+lib/coq/theories/NArith/BinNat.vo
+lib/coq/theories/NArith/BinPos.vo
+lib/coq/theories/NArith/NArith.vo
+lib/coq/theories/NArith/Pnat.vo
 lib/coq/theories/ZArith/Wf_Z.vo
 lib/coq/theories/ZArith/ZArith.vo
 lib/coq/theories/ZArith/ZArith_base.vo
@@ -222,23 +220,261 @@ lib/coq/theories/ZArith/Zlogarithm.vo
 lib/coq/theories/ZArith/Zmisc.vo
 lib/coq/theories/ZArith/Zpower.vo
 lib/coq/theories/ZArith/Zsqrt.vo
-lib/coq/theories/ZArith/Zsyntax.vo
 lib/coq/theories/ZArith/Zwf.vo
 lib/coq/theories/ZArith/auxiliary.vo
-lib/coq/theories/ZArith/fast_integer.vo
-lib/coq/theories/ZArith/zarith_aux.vo
+lib/coq/theories/ZArith/BinInt.vo
+lib/coq/theories/ZArith/Zabs.vo
+lib/coq/theories/ZArith/Zcompare.vo
+lib/coq/theories/ZArith/Zeven.vo
+lib/coq/theories/ZArith/Zmin.vo
+lib/coq/theories/ZArith/Znat.vo
+lib/coq/theories/ZArith/Znumtheory.vo
+lib/coq/theories/ZArith/Zorder.vo
+lib/coq/contrib7/cc/CCSolve.vo
+lib/coq/contrib7/field/Field.vo
+lib/coq/contrib7/field/Field_Compl.vo
+lib/coq/contrib7/field/Field_Tactic.vo
+lib/coq/contrib7/field/Field_Theory.vo
+lib/coq/contrib7/fourier/Fourier.vo
+lib/coq/contrib7/fourier/Fourier_util.vo
+lib/coq/contrib7/omega/Omega.vo
+lib/coq/contrib7/omega/OmegaLemmas.vo
+lib/coq/contrib7/ring/ArithRing.vo
+lib/coq/contrib7/ring/NArithRing.vo
+lib/coq/contrib7/ring/Quote.vo
+lib/coq/contrib7/ring/Ring.vo
+lib/coq/contrib7/ring/Ring_abstract.vo
+lib/coq/contrib7/ring/Ring_normalize.vo
+lib/coq/contrib7/ring/Ring_theory.vo
+lib/coq/contrib7/ring/Setoid_ring.vo
+lib/coq/contrib7/ring/Setoid_ring_normalize.vo
+lib/coq/contrib7/ring/Setoid_ring_theory.vo
+lib/coq/contrib7/ring/ZArithRing.vo
+lib/coq/contrib7/romega/ROmega.vo
+lib/coq/contrib7/romega/ReflOmegaCore.vo
+lib/coq/ide/.coqide-gtk2rc
+lib/coq/ide/FAQ
+lib/coq/ide/coq.png
+lib/coq/ide/utf8.v
+lib/coq/ide/utf8.vo
+lib/coq/states7/barestate.coq
+lib/coq/states7/initial.coq
+lib/coq/theories7/Arith/Arith.vo
+lib/coq/theories7/Arith/Between.vo
+lib/coq/theories7/Arith/Bool_nat.vo
+lib/coq/theories7/Arith/Compare.vo
+lib/coq/theories7/Arith/Compare_dec.vo
+lib/coq/theories7/Arith/Div2.vo
+lib/coq/theories7/Arith/EqNat.vo
+lib/coq/theories7/Arith/Euclid.vo
+lib/coq/theories7/Arith/Even.vo
+lib/coq/theories7/Arith/Factorial.vo
+lib/coq/theories7/Arith/Gt.vo
+lib/coq/theories7/Arith/Le.vo
+lib/coq/theories7/Arith/Lt.vo
+lib/coq/theories7/Arith/Max.vo
+lib/coq/theories7/Arith/Min.vo
+lib/coq/theories7/Arith/Minus.vo
+lib/coq/theories7/Arith/Mult.vo
+lib/coq/theories7/Arith/Peano_dec.vo
+lib/coq/theories7/Arith/Plus.vo
+lib/coq/theories7/Arith/Wf_nat.vo
+lib/coq/theories7/Bool/Bool.vo
+lib/coq/theories7/Bool/BoolEq.vo
+lib/coq/theories7/Bool/Bvector.vo
+lib/coq/theories7/Bool/DecBool.vo
+lib/coq/theories7/Bool/IfProp.vo
+lib/coq/theories7/Bool/Sumbool.vo
+lib/coq/theories7/Bool/Zerob.vo
+lib/coq/theories7/Init/Datatypes.vo
+lib/coq/theories7/Init/Logic.vo
+lib/coq/theories7/Init/Logic_Type.vo
+lib/coq/theories7/Init/Notations.vo
+lib/coq/theories7/Init/Peano.vo
+lib/coq/theories7/Init/Prelude.vo
+lib/coq/theories7/Init/Specif.vo
+lib/coq/theories7/Init/Wf.vo
+lib/coq/theories7/IntMap/Adalloc.vo
+lib/coq/theories7/IntMap/Addec.vo
+lib/coq/theories7/IntMap/Addr.vo
+lib/coq/theories7/IntMap/Adist.vo
+lib/coq/theories7/IntMap/Allmaps.vo
+lib/coq/theories7/IntMap/Fset.vo
+lib/coq/theories7/IntMap/Lsort.vo
+lib/coq/theories7/IntMap/Map.vo
+lib/coq/theories7/IntMap/Mapaxioms.vo
+lib/coq/theories7/IntMap/Mapc.vo
+lib/coq/theories7/IntMap/Mapcanon.vo
+lib/coq/theories7/IntMap/Mapcard.vo
+lib/coq/theories7/IntMap/Mapfold.vo
+lib/coq/theories7/IntMap/Mapiter.vo
+lib/coq/theories7/IntMap/Maplists.vo
+lib/coq/theories7/IntMap/Mapsubset.vo
+lib/coq/theories7/Lists/List.vo
+lib/coq/theories7/Lists/ListSet.vo
+lib/coq/theories7/Lists/MonoList.vo
+lib/coq/theories7/Lists/PolyList.vo
+lib/coq/theories7/Lists/PolyListSyntax.vo
+lib/coq/theories7/Lists/Streams.vo
+lib/coq/theories7/Lists/TheoryList.vo
+lib/coq/theories7/Logic/Berardi.vo
+lib/coq/theories7/Logic/ChoiceFacts.vo
+lib/coq/theories7/Logic/Classical.vo
+lib/coq/theories7/Logic/ClassicalChoice.vo
+lib/coq/theories7/Logic/ClassicalDescription.vo
+lib/coq/theories7/Logic/ClassicalFacts.vo
+lib/coq/theories7/Logic/Classical_Pred_Set.vo
+lib/coq/theories7/Logic/Classical_Pred_Type.vo
+lib/coq/theories7/Logic/Classical_Prop.vo
+lib/coq/theories7/Logic/Classical_Type.vo
+lib/coq/theories7/Logic/Decidable.vo
+lib/coq/theories7/Logic/Diaconescu.vo
+lib/coq/theories7/Logic/Eqdep.vo
+lib/coq/theories7/Logic/Eqdep_dec.vo
+lib/coq/theories7/Logic/Hurkens.vo
+lib/coq/theories7/Logic/JMeq.vo
+lib/coq/theories7/Logic/ProofIrrelevance.vo
+lib/coq/theories7/Logic/RelationalChoice.vo
+lib/coq/theories7/NArith/BinNat.vo
+lib/coq/theories7/NArith/BinPos.vo
+lib/coq/theories7/NArith/NArith.vo
+lib/coq/theories7/NArith/Pnat.vo
+lib/coq/theories7/Reals/Alembert.vo
+lib/coq/theories7/Reals/AltSeries.vo
+lib/coq/theories7/Reals/ArithProp.vo
+lib/coq/theories7/Reals/Binomial.vo
+lib/coq/theories7/Reals/Cauchy_prod.vo
+lib/coq/theories7/Reals/Cos_plus.vo
+lib/coq/theories7/Reals/Cos_rel.vo
+lib/coq/theories7/Reals/DiscrR.vo
+lib/coq/theories7/Reals/Exp_prop.vo
+lib/coq/theories7/Reals/Integration.vo
+lib/coq/theories7/Reals/MVT.vo
+lib/coq/theories7/Reals/NewtonInt.vo
+lib/coq/theories7/Reals/PSeries_reg.vo
+lib/coq/theories7/Reals/PartSum.vo
+lib/coq/theories7/Reals/RIneq.vo
+lib/coq/theories7/Reals/RList.vo
+lib/coq/theories7/Reals/R_Ifp.vo
+lib/coq/theories7/Reals/R_sqr.vo
+lib/coq/theories7/Reals/R_sqrt.vo
+lib/coq/theories7/Reals/Ranalysis.vo
+lib/coq/theories7/Reals/Ranalysis1.vo
+lib/coq/theories7/Reals/Ranalysis2.vo
+lib/coq/theories7/Reals/Ranalysis3.vo
+lib/coq/theories7/Reals/Ranalysis4.vo
+lib/coq/theories7/Reals/Raxioms.vo
+lib/coq/theories7/Reals/Rbase.vo
+lib/coq/theories7/Reals/Rbasic_fun.vo
+lib/coq/theories7/Reals/Rcomplete.vo
+lib/coq/theories7/Reals/Rdefinitions.vo
+lib/coq/theories7/Reals/Rderiv.vo
+lib/coq/theories7/Reals/Reals.vo
+lib/coq/theories7/Reals/Rfunctions.vo
+lib/coq/theories7/Reals/Rgeom.vo
+lib/coq/theories7/Reals/RiemannInt.vo
+lib/coq/theories7/Reals/RiemannInt_SF.vo
+lib/coq/theories7/Reals/Rlimit.vo
+lib/coq/theories7/Reals/Rpower.vo
+lib/coq/theories7/Reals/Rprod.vo
+lib/coq/theories7/Reals/Rseries.vo
+lib/coq/theories7/Reals/Rsigma.vo
+lib/coq/theories7/Reals/Rsqrt_def.vo
+lib/coq/theories7/Reals/Rsyntax.vo
+lib/coq/theories7/Reals/Rtopology.vo
+lib/coq/theories7/Reals/Rtrigo.vo
+lib/coq/theories7/Reals/Rtrigo_alt.vo
+lib/coq/theories7/Reals/Rtrigo_calc.vo
+lib/coq/theories7/Reals/Rtrigo_def.vo
+lib/coq/theories7/Reals/Rtrigo_fun.vo
+lib/coq/theories7/Reals/Rtrigo_reg.vo
+lib/coq/theories7/Reals/SeqProp.vo
+lib/coq/theories7/Reals/SeqSeries.vo
+lib/coq/theories7/Reals/SplitAbsolu.vo
+lib/coq/theories7/Reals/SplitRmult.vo
+lib/coq/theories7/Reals/Sqrt_reg.vo
+lib/coq/theories7/Relations/Newman.vo
+lib/coq/theories7/Relations/Operators_Properties.vo
+lib/coq/theories7/Relations/Relation_Definitions.vo
+lib/coq/theories7/Relations/Relation_Operators.vo
+lib/coq/theories7/Relations/Relations.vo
+lib/coq/theories7/Relations/Rstar.vo
+lib/coq/theories7/Setoids/Setoid.vo
+lib/coq/theories7/Sets/Classical_sets.vo
+lib/coq/theories7/Sets/Constructive_sets.vo
+lib/coq/theories7/Sets/Cpo.vo
+lib/coq/theories7/Sets/Ensembles.vo
+lib/coq/theories7/Sets/Finite_sets.vo
+lib/coq/theories7/Sets/Finite_sets_facts.vo
+lib/coq/theories7/Sets/Image.vo
+lib/coq/theories7/Sets/Infinite_sets.vo
+lib/coq/theories7/Sets/Integers.vo
+lib/coq/theories7/Sets/Multiset.vo
+lib/coq/theories7/Sets/Partial_Order.vo
+lib/coq/theories7/Sets/Permut.vo
+lib/coq/theories7/Sets/Powerset.vo
+lib/coq/theories7/Sets/Powerset_Classical_facts.vo
+lib/coq/theories7/Sets/Powerset_facts.vo
+lib/coq/theories7/Sets/Relations_1.vo
+lib/coq/theories7/Sets/Relations_1_facts.vo
+lib/coq/theories7/Sets/Relations_2.vo
+lib/coq/theories7/Sets/Relations_2_facts.vo
+lib/coq/theories7/Sets/Relations_3.vo
+lib/coq/theories7/Sets/Relations_3_facts.vo
+lib/coq/theories7/Sets/Uniset.vo
+lib/coq/theories7/Sorting/Heap.vo
+lib/coq/theories7/Sorting/Permutation.vo
+lib/coq/theories7/Sorting/Sorting.vo
+lib/coq/theories7/Wellfounded/Disjoint_Union.vo
+lib/coq/theories7/Wellfounded/Inclusion.vo
+lib/coq/theories7/Wellfounded/Inverse_Image.vo
+lib/coq/theories7/Wellfounded/Lexicographic_Exponentiation.vo
+lib/coq/theories7/Wellfounded/Lexicographic_Product.vo
+lib/coq/theories7/Wellfounded/Transitive_Closure.vo
+lib/coq/theories7/Wellfounded/Union.vo
+lib/coq/theories7/Wellfounded/Well_Ordering.vo
+lib/coq/theories7/Wellfounded/Wellfounded.vo
+lib/coq/theories7/ZArith/BinInt.vo
+lib/coq/theories7/ZArith/Wf_Z.vo
+lib/coq/theories7/ZArith/ZArith.vo
+lib/coq/theories7/ZArith/ZArith_base.vo
+lib/coq/theories7/ZArith/ZArith_dec.vo
+lib/coq/theories7/ZArith/Zabs.vo
+lib/coq/theories7/ZArith/Zbinary.vo
+lib/coq/theories7/ZArith/Zbool.vo
+lib/coq/theories7/ZArith/Zcompare.vo
+lib/coq/theories7/ZArith/Zcomplements.vo
+lib/coq/theories7/ZArith/Zdiv.vo
+lib/coq/theories7/ZArith/Zeven.vo
+lib/coq/theories7/ZArith/Zhints.vo
+lib/coq/theories7/ZArith/Zlogarithm.vo
+lib/coq/theories7/ZArith/Zmin.vo
+lib/coq/theories7/ZArith/Zmisc.vo
+lib/coq/theories7/ZArith/Znat.vo
+lib/coq/theories7/ZArith/Znumtheory.vo
+lib/coq/theories7/ZArith/Zorder.vo
+lib/coq/theories7/ZArith/Zpower.vo
+lib/coq/theories7/ZArith/Zsqrt.vo
+lib/coq/theories7/ZArith/Zsyntax.vo
+lib/coq/theories7/ZArith/Zwf.vo
+lib/coq/theories7/ZArith/auxiliary.vo
+lib/coq/theories7/ZArith/fast_integer.vo
+lib/coq/theories7/ZArith/zarith_aux.vo
 man/man1/coq-interface.1
 man/man1/coq-tex.1
 man/man1/coq_makefile.1
-man/man1/coq_vo2xml.1
 man/man1/coqc.1
 man/man1/coqdep.1
+man/man1/coqdoc.1
 man/man1/coqmktop.1
 man/man1/coqtop.1
 man/man1/coqtop.byte.1
+man/man1/parser.1
 man/man1/gallina.1
+man/man1/coqwc.1
 share/emacs/site-lisp/coq-inferior.el
 share/emacs/site-lisp/coq.el
+share/texmf/tex/latex/misc/coqdoc.sty
 @dirrm lib/coq/theories/ZArith
 @dirrm lib/coq/theories/Wellfounded
 @dirrm lib/coq/theories/Sorting
@@ -252,9 +488,23 @@ share/emacs/site-lisp/coq.el
 @dirrm lib/coq/theories/Init
 @dirrm lib/coq/theories/Bool
 @dirrm lib/coq/theories/Arith
+@dirrm lib/coq/theories/NArith
 @dirrm lib/coq/theories
-@exec ${MKDIR} %D/lib/coq/tactics
-@dirrm lib/coq/tactics
+@dirrm lib/coq/theories7/ZArith
+@dirrm lib/coq/theories7/Wellfounded
+@dirrm lib/coq/theories7/Sorting
+@dirrm lib/coq/theories7/Sets
+@dirrm lib/coq/theories7/Setoids
+@dirrm lib/coq/theories7/Relations
+@dirrm lib/coq/theories7/Reals
+@dirrm lib/coq/theories7/Logic
+@dirrm lib/coq/theories7/Lists
+@dirrm lib/coq/theories7/IntMap
+@dirrm lib/coq/theories7/Init
+@dirrm lib/coq/theories7/Bool
+@dirrm lib/coq/theories7/Arith
+@dirrm lib/coq/theories7/NArith
+@dirrm lib/coq/theories7
 @dirrm lib/coq/states
 @dirrm lib/coq/contrib/romega
 @dirrm lib/coq/contrib/ring
@@ -262,7 +512,15 @@ share/emacs/site-lisp/coq.el
 @dirrm lib/coq/contrib/interface
 @dirrm lib/coq/contrib/fourier
 @dirrm lib/coq/contrib/field
-@dirrm lib/coq/contrib/correctness
 @dirrm lib/coq/contrib/cc
 @dirrm lib/coq/contrib
+@dirrm lib/coq/contrib7/cc
+@dirrm lib/coq/contrib7/field
+@dirrm lib/coq/contrib7/fourier
+@dirrm lib/coq/contrib7/omega
+@dirrm lib/coq/contrib7/ring
+@dirrm lib/coq/contrib7/romega
+@dirrm lib/coq/contrib7
+@dirrm lib/coq/ide
+@dirrm lib/coq/states7
 @dirrm lib/coq
diff --git a/lang/coq/PLIST.opt b/lang/coq/PLIST.opt
index 97caf70f99f..984bc964297 100644
--- a/lang/coq/PLIST.opt
+++ b/lang/coq/PLIST.opt
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST.opt,v 1.1.1.1 2003/03/22 20:21:17 kristerw Exp $
+@comment $NetBSD: PLIST.opt,v 1.2 2005/02/05 11:19:02 adrianp Exp $
 bin/coq-interface.opt
 bin/coqtop.opt
-bin/parser
 man/man1/coqtop.opt.1
-man/man1/parser.1
diff --git a/lang/coq/distinfo b/lang/coq/distinfo
index a23e80062a0..015a9efacf6 100644
--- a/lang/coq/distinfo
+++ b/lang/coq/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/03/22 20:21:17 kristerw Exp $
+$NetBSD: distinfo,v 1.2 2005/02/05 11:19:02 adrianp Exp $
 
-SHA1 (coq-7.4.tar.gz) = 82fe0094cde8a766e3ba0a77c731b4ef2345a41b
-Size (coq-7.4.tar.gz) = 1537547 bytes
-SHA1 (patch-aa) = ce59dda44ac5f81834f9f60a7f87524c90f6cb6e
+SHA1 (coq-8.0pl2.tar.gz) = 58d0c054c9b50ef12b462f97df2424ee3baa25ab
+Size (coq-8.0pl2.tar.gz) = 2285855 bytes
+SHA1 (patch-aa) = e62e14729a2dacd7e6e9aa4418c911b34cc4aee5
diff --git a/lang/coq/patches/patch-aa b/lang/coq/patches/patch-aa
index 488bf96069b..2d9b9229fb0 100644
--- a/lang/coq/patches/patch-aa
+++ b/lang/coq/patches/patch-aa
@@ -1,31 +1,177 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/03/22 20:21:17 kristerw Exp $
+$NetBSD: patch-aa,v 1.2 2005/02/05 11:19:02 adrianp Exp $
 
---- Makefile.orig	Mon Feb  3 05:11:32 2003
-+++ Makefile
-@@ -368,7 +368,10 @@ COQTOPBYTE=bin/coqtop.byte$(EXE)
- COQTOPOPT=bin/coqtop.opt$(EXE)
- BESTCOQTOP=bin/coqtop.$(BEST)$(EXE)
- COQTOP=bin/coqtop$(EXE)
--COQINTERFACE=bin/coq-interface$(EXE) bin/coq-interface.opt$(EXE) bin/parser$(EXE)
-+COQINTERFACE=bin/coq-interface$(EXE)
-+ifeq ($(BEST),opt)
-+COQINTERFACE+=bin/coq-interface.opt$(EXE) bin/parser$(EXE)
-+endif
- 
- COQBINARIES= $(COQMKTOP) $(COQC) $(COQTOPBYTE) $(BESTCOQTOP) $(COQTOP) \
-              $(COQINTERFACE) 
-@@ -877,9 +880,12 @@ install-library-light:
- 	cp tools/coq.el tools/coq-inferior.el $(FULLEMACSLIB)
+--- Makefile.orig	2004-07-19 11:37:31.000000000 +0200
++++ Makefile	2005-01-20 12:15:39.000000000 +0100
+@@ -608,22 +608,22 @@
+ install-ide-no:
+ 
+ install-ide-byte: 
+-	$(MKDIR) $(FULLBINDIR)
+-	cp $(COQIDEBYTE) $(FULLBINDIR)
++	${BSD_INSTALL_PROGRAM_DIR} $(FULLBINDIR)
++	${BSD_INSTALL_SCRIPT} $(COQIDEBYTE) $(FULLBINDIR)
+ 	cd $(FULLBINDIR); ln -sf coqide.byte$(EXE) coqide$(EXE)
+ 
+ install-ide-opt:
+-	$(MKDIR) $(FULLBINDIR)
+-	cp $(COQIDEBYTE) $(COQIDEOPT) $(FULLBINDIR)
++	${BSD_INSTALL_PROGRAM_DIR} $(FULLBINDIR)
++	${BSD_INSTALL_SCRIPT} $(COQIDEBYTE) $(COQIDEOPT) $(FULLBINDIR)
+ 	cd $(FULLBINDIR); ln -sf coqide.opt$(EXE) coqide$(EXE)
+ 
+ install-ide-files:
+-	$(MKDIR) $(FULLIDELIB)
+-	cp $(IDEFILES) $(FULLIDELIB)
++	${BSD_INSTALL_PROGRAM_DIR} $(FULLIDELIB)
++	${BSD_INSTALL_DATA} $(IDEFILES) $(FULLIDELIB)
+ 
+ install-ide-info:
+-	$(MKDIR) $(FULLIDELIB)
+-	cp ide/FAQ $(FULLIDELIB)
++	${BSD_INSTALL_PROGRAM_DIR} $(FULLIDELIB)
++	${BSD_INSTALL_DATA} ide/FAQ $(FULLIDELIB)
+ 
+ ###########################################################################
+ # Pcoq: special binaries for debugging (coq-interface, parser)
+@@ -700,18 +700,18 @@
+ install-pcoq:: install-pcoq-binaries install-pcoq-files install-pcoq-manpages
+ 
+ install-pcoq-binaries::
+-	$(MKDIR) $(FULLBINDIR)
+-	cp $(COQINTERFACE) $(FULLBINDIR)
++	${BSD_INSTALL_PROGRAM_DIR} $(FULLBINDIR)
++	${BSD_INSTALL_PROGRAM} $(COQINTERFACE) $(FULLBINDIR)
+ 
+ install-pcoq-files::
+-	$(MKDIR) $(FULLCOQLIB)/contrib/interface
+-	cp $(INTERFACERC) $(FULLCOQLIB)/contrib/interface
++	${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/contrib/interface
++	${BSD_INSTALL_DATA} $(INTERFACERC) $(FULLCOQLIB)/contrib/interface
+ 
+ PCOQMANPAGES=man/coq-interface.1 man/parser.1
+ 
+ install-pcoq-manpages:
+-	$(MKDIR) $(FULLMANDIR)/man1
+-	cp $(PCOQMANPAGES) $(FULLMANDIR)/man1
++	${BSD_INSTALL_DATA_DIR} $(FULLMANDIR)/man1
++	${BSD_INSTALL_MAN} $(PCOQMANPAGES) $(FULLMANDIR)/man1
+ 
+ ###########################################################################
+ # tests
+@@ -1146,18 +1146,18 @@
+ install-binaries:: install-$(BEST) install-tools
+ 
+ install-byte::
+-	$(MKDIR) $(FULLBINDIR)
+-	cp $(COQMKTOP) $(COQC) $(COQTOPBYTE) $(FULLBINDIR)
++	${BSD_INSTALL_PROGRAM_DIR} $(FULLBINDIR)
++	${BSD_INSTALL_SCRIPT} $(COQMKTOP) $(COQC) $(COQTOPBYTE) $(FULLBINDIR)
+ 	cd $(FULLBINDIR); ln -sf coqtop.byte$(EXE) coqtop$(EXE)
+ 
+ install-opt::
+-	$(MKDIR) $(FULLBINDIR)
+-	cp $(COQMKTOP) $(COQC) $(COQTOPBYTE) $(COQTOPOPT) $(FULLBINDIR)
++	${BSD_INSTALL_PROGRAM_DIR} $(FULLBINDIR)
++	${BSD_INSTALL_SCRIPT} $(COQMKTOP) $(COQC) $(COQTOPBYTE) $(COQTOPOPT) $(FULLBINDIR)
+ 	cd $(FULLBINDIR); ln -sf coqtop.opt$(EXE) coqtop$(EXE)
+ 
+ install-tools::
+-	$(MKDIR) $(FULLBINDIR)
+-	cp $(TOOLS) $(FULLBINDIR)
++	${BSD_INSTALL_PROGRAM_DIR} $(FULLBINDIR)
++	${BSD_INSTALL_SCRIPT} $(TOOLS) $(FULLBINDIR)
+ 
+ LIBFILES=$(OLDTHEORIESVO) $(OLDCONTRIBVO)
+ LIBFILESLIGHT=$(OLDTHEORIESLIGHTVO)
+@@ -1168,61 +1168,65 @@
+ install-library: install-library7 install-library8
+ 
+ install-library8:
+-	$(MKDIR) $(FULLCOQLIB)
++	${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)
+ 	for f in $(NEWLIBFILES); do \
+-	  $(MKDIR) $(FULLCOQLIB)/`dirname $$f`; \
+-	  cp $$f $(FULLCOQLIB)/`dirname $$f`; \
++	  ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/`dirname $$f`; \
++	  ${BSD_INSTALL_DATA} $$f $(FULLCOQLIB)/`dirname $$f`; \
+         done
+-	$(MKDIR) $(FULLCOQLIB)/states
+-	cp states/*.coq $(FULLCOQLIB)/states
++	${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/states
++	${BSD_INSTALL_DATA} states/*.coq $(FULLCOQLIB)/states
+ 
+ install-library7:
+-	$(MKDIR) $(FULLCOQLIB)
++	${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)
+ 	for f in $(LIBFILES); do \
+-	  $(MKDIR) $(FULLCOQLIB)/`dirname $$f`; \
+-	  cp $$f $(FULLCOQLIB)/`dirname $$f`; \
++	  ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/`dirname $$f`; \
++	  ${BSD_INSTALL_DATA} $$f $(FULLCOQLIB)/`dirname $$f`; \
+         done
+-	$(MKDIR) $(FULLCOQLIB)/states7
+-	cp states7/*.coq $(FULLCOQLIB)/states7
++	${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/states7
++	${BSD_INSTALL_DATA} states7/*.coq $(FULLCOQLIB)/states7
+ 
+ install-library-light:
+-	$(MKDIR) $(FULLCOQLIB)
++	${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)
+ 	for f in $(LIBFILESLIGHT) $(NEWLIBFILESLIGHT); do \
+-	  $(MKDIR) $(FULLCOQLIB)/`dirname $$f`; \
+-	  cp $$f $(FULLCOQLIB)/`dirname $$f`; \
++	  ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/`dirname $$f`; \
++	  ${BSD_INSTALL_DATA} $$f $(FULLCOQLIB)/`dirname $$f`; \
+         done
+-	$(MKDIR) $(FULLCOQLIB)/states
+-	cp states/*.coq $(FULLCOQLIB)/states
+-	$(MKDIR) $(FULLCOQLIB)/states7
+-	cp states7/*.coq $(FULLCOQLIB)/states7
++	${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/states
++	${BSD_INSTALL_DATA} states/*.coq $(FULLCOQLIB)/states
++	${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/states7
++	${BSD_INSTALL_DATA} states7/*.coq $(FULLCOQLIB)/states7
+ 
+ install-allreals::
+ 	for f in $(ALLREALS); do \
+-	  $(MKDIR) $(FULLCOQLIB)/`dirname $$f`; \
+-	  cp $$f $(FULLCOQLIB)/`dirname $$f`; \
++	  ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/`dirname $$f`; \
++	  ${BSD_INSTALL_DATA} $$f $(FULLCOQLIB)/`dirname $$f`; \
+         done
+ 
+ install-coq-info: install-coq-manpages install-emacs install-latex
  
  MANPAGES=man/coq-tex.1 man/coqdep.1 man/gallina.1 \
 -	man/coqc.1 man/coqtop.1 man/coqtop.byte.1 man/coqtop.opt.1 \
 +	man/coqc.1 man/coqtop.1 man/coqtop.byte.1 \
- 	man/coq_makefile.1 man/coqmktop.1 \
--	man/coq-interface.1 man/parser.1 man/coq_vo2xml.1
-+	man/coq-interface.1 man/coq_vo2xml.1
-+ifeq ($(BEST),opt)
-+MANPAGES+=man/coqtop.opt.1 man/parser.1
-+endif
- 
- install-manpages:
- 	$(MKDIR) $(FULLMANDIR)/man1
+ 	man/coqwc.1 man/coqdoc.1 \
+ 	man/coq_makefile.1 man/coqmktop.1
++	ifeq ($(BEST),opt)
++	MANPAGES+=man/coqtop.opt.1
++	endif
++
+ 
+ install-coq-manpages:
+-	$(MKDIR) $(FULLMANDIR)/man1
+-	cp $(MANPAGES) $(FULLMANDIR)/man1
++	${BSD_INSTALL_DATA_DIR} $(FULLMANDIR)/man1
++	${BSD_INSTALL_MAN} $(MANPAGES) $(FULLMANDIR)/man1
+ 
+ install-emacs:
+-	$(MKDIR) $(FULLEMACSLIB)
+-	cp tools/coq.el tools/coq-inferior.el $(FULLEMACSLIB)
++	${BSD_INSTALL_DATA_DIR} $(FULLEMACSLIB)
++	${BSD_INSTALL_DATA} tools/coq.el tools/coq-inferior.el $(FULLEMACSLIB)
+ 
+ # command to update TeX' kpathsea database
+ #UPDATETEX = $(MKTEXLSR) /usr/share/texmf /var/spool/texmf $(BASETEXDIR) > /dev/null
+ 
+ install-latex:
+-	$(MKDIR) $(FULLCOQDOCDIR)
+-	cp tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)	
++	${BSD_INSTALL_DATA_DIR} $(FULLCOQDOCDIR)
++	${BSD_INSTALL_DATA} tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)	
+ #	-$(UPDATETEX)
+ 
+ ###########################################################################