Update lang/coq to 8.0pl3

Changelog:
- Coq sources made compatible with ocaml 3.09.0 and lablgtk 2.6.0.
- The search depth argument of auto can be parameterised in the Ltac language
- Added entry constr_may_eval for tactic extensions (new syntax)
- A couple of lemmas of ZArith were renamed: O -> 0
- many bugfixes, for extraction, Ltac, tactics...

5 files changed, 99 insertions, 113 deletions

diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index ff8335f6837..24b23ac5a9b 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2006/01/16 14:34:34 tonio Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/27 19:22:58 tonio Exp $
 #
 
-DISTNAME=	coq-8.0pl2
-PKGREVISION=	1
+DISTNAME=	coq-8.0pl3
 CATEGORIES=	lang math
-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/coq/V8.0pl2/
+MASTER_SITES=	ftp://ftp.inria.fr/INRIA/coq/V8.0pl3/
 
 MAINTAINER=	richards+netbsd@CS.Princeton.EDU
 HOMEPAGE=	http://coq.inria.fr/
diff --git a/lang/coq/PLIST b/lang/coq/PLIST
index d0b47f9a398..13ecf260cc5 100644
--- a/lang/coq/PLIST
+++ b/lang/coq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/05 11:19:02 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/01/27 19:22:58 tonio Exp $
 bin/coq-interface
 bin/coq-tex
 bin/coq_makefile
@@ -9,18 +9,20 @@ bin/coqmktop
 bin/coqtop
 bin/coqtop.byte
 bin/coqwc
-bin/parser
 bin/gallina
+bin/parser
+lib/coq/contrib/cc/CCSolve.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/omega/Omega.vo
-lib/coq/contrib/cc/CCSolve.vo
 lib/coq/contrib/interface/vernacrc
+lib/coq/contrib/omega/Omega.vo
+lib/coq/contrib/omega/OmegaLemmas.vo
 lib/coq/contrib/ring/ArithRing.vo
+lib/coq/contrib/ring/NArithRing.vo
 lib/coq/contrib/ring/Quote.vo
 lib/coq/contrib/ring/Ring.vo
 lib/coq/contrib/ring/Ring_abstract.vo
@@ -30,11 +32,39 @@ 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/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.ico
+lib/coq/ide/coq2.ico
+lib/coq/ide/utf8.v
+lib/coq/ide/utf8.vo
 lib/coq/states/initial.coq
+lib/coq/states7/barestate.coq
+lib/coq/states7/initial.coq
 lib/coq/theories/Arith/Arith.vo
 lib/coq/theories/Arith/Between.vo
 lib/coq/theories/Arith/Bool_nat.vo
@@ -65,9 +95,9 @@ lib/coq/theories/Bool/Zerob.vo
 lib/coq/theories/Init/Datatypes.vo
 lib/coq/theories/Init/Logic.vo
 lib/coq/theories/Init/Logic_Type.vo
+lib/coq/theories/Init/Notations.vo
 lib/coq/theories/Init/Peano.vo
 lib/coq/theories/Init/Prelude.vo
-lib/coq/theories/Init/Notations.vo
 lib/coq/theories/Init/Specif.vo
 lib/coq/theories/Init/Wf.vo
 lib/coq/theories/IntMap/Adalloc.vo
@@ -88,27 +118,31 @@ 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/MonoList.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/ChoiceFacts.vo
 lib/coq/theories/Logic/Classical.vo
+lib/coq/theories/Logic/ClassicalChoice.vo
+lib/coq/theories/Logic/ClassicalDescription.vo
 lib/coq/theories/Logic/ClassicalFacts.vo
 lib/coq/theories/Logic/Classical_Pred_Set.vo
 lib/coq/theories/Logic/Classical_Pred_Type.vo
 lib/coq/theories/Logic/Classical_Prop.vo
 lib/coq/theories/Logic/Classical_Type.vo
 lib/coq/theories/Logic/Decidable.vo
+lib/coq/theories/Logic/Diaconescu.vo
 lib/coq/theories/Logic/Eqdep.vo
 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/NArith/BinNat.vo
+lib/coq/theories/NArith/BinPos.vo
+lib/coq/theories/NArith/NArith.vo
+lib/coq/theories/NArith/Pnat.vo
 lib/coq/theories/Reals/Alembert.vo
 lib/coq/theories/Reals/AltSeries.vo
 lib/coq/theories/Reals/ArithProp.vo
@@ -203,62 +237,29 @@ 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/BinInt.vo
 lib/coq/theories/ZArith/Wf_Z.vo
 lib/coq/theories/ZArith/ZArith.vo
 lib/coq/theories/ZArith/ZArith_base.vo
 lib/coq/theories/ZArith/ZArith_dec.vo
+lib/coq/theories/ZArith/Zabs.vo
 lib/coq/theories/ZArith/Zbinary.vo
 lib/coq/theories/ZArith/Zbool.vo
+lib/coq/theories/ZArith/Zcompare.vo
 lib/coq/theories/ZArith/Zcomplements.vo
 lib/coq/theories/ZArith/Zdiv.vo
+lib/coq/theories/ZArith/Zeven.vo
 lib/coq/theories/ZArith/Zhints.vo
 lib/coq/theories/ZArith/Zlogarithm.vo
+lib/coq/theories/ZArith/Zmin.vo
 lib/coq/theories/ZArith/Zmisc.vo
+lib/coq/theories/ZArith/Znat.vo
+lib/coq/theories/ZArith/Znumtheory.vo
+lib/coq/theories/ZArith/Zorder.vo
 lib/coq/theories/ZArith/Zpower.vo
 lib/coq/theories/ZArith/Zsqrt.vo
 lib/coq/theories/ZArith/Zwf.vo
 lib/coq/theories/ZArith/auxiliary.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
@@ -469,27 +470,12 @@ 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
+man/man1/gallina.1
+man/man1/parser.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
-@dirrm lib/coq/theories/Sets
-@dirrm lib/coq/theories/Setoids
-@dirrm lib/coq/theories/Relations
-@dirrm lib/coq/theories/Reals
-@dirrm lib/coq/theories/Logic
-@dirrm lib/coq/theories/Lists
-@dirrm lib/coq/theories/IntMap
-@dirrm lib/coq/theories/Init
-@dirrm lib/coq/theories/Bool
-@dirrm lib/coq/theories/Arith
-@dirrm lib/coq/theories/NArith
-@dirrm lib/coq/theories
+share/emacs/site-lisp/coqdoc.sty
 @dirrm lib/coq/theories7/ZArith
 @dirrm lib/coq/theories7/Wellfounded
 @dirrm lib/coq/theories7/Sorting
@@ -497,15 +483,39 @@ share/texmf/tex/latex/misc/coqdoc.sty
 @dirrm lib/coq/theories7/Setoids
 @dirrm lib/coq/theories7/Relations
 @dirrm lib/coq/theories7/Reals
+@dirrm lib/coq/theories7/NArith
 @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/theories/ZArith
+@dirrm lib/coq/theories/Wellfounded
+@dirrm lib/coq/theories/Sorting
+@dirrm lib/coq/theories/Sets
+@dirrm lib/coq/theories/Setoids
+@dirrm lib/coq/theories/Relations
+@dirrm lib/coq/theories/Reals
+@dirrm lib/coq/theories/NArith
+@dirrm lib/coq/theories/Logic
+@dirrm lib/coq/theories/Lists
+@dirrm lib/coq/theories/IntMap
+@dirrm lib/coq/theories/Init
+@dirrm lib/coq/theories/Bool
+@dirrm lib/coq/theories/Arith
+@dirrm lib/coq/theories
+@dirrm lib/coq/states7
 @dirrm lib/coq/states
+@dirrm lib/coq/ide
+@dirrm lib/coq/contrib7/romega
+@dirrm lib/coq/contrib7/ring
+@dirrm lib/coq/contrib7/omega
+@dirrm lib/coq/contrib7/fourier
+@dirrm lib/coq/contrib7/field
+@dirrm lib/coq/contrib7/cc
+@dirrm lib/coq/contrib7
 @dirrm lib/coq/contrib/romega
 @dirrm lib/coq/contrib/ring
 @dirrm lib/coq/contrib/omega
@@ -514,13 +524,4 @@ share/texmf/tex/latex/misc/coqdoc.sty
 @dirrm lib/coq/contrib/field
 @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 984bc964297..ac958aed9a4 100644
--- a/lang/coq/PLIST.opt
+++ b/lang/coq/PLIST.opt
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST.opt,v 1.2 2005/02/05 11:19:02 adrianp Exp $
+@comment $NetBSD: PLIST.opt,v 1.3 2006/01/27 19:22:58 tonio Exp $
 bin/coq-interface.opt
 bin/coqtop.opt
+bin/parser.opt
 man/man1/coqtop.opt.1
diff --git a/lang/coq/distinfo b/lang/coq/distinfo
index 16f0de12fae..f0c8add20b4 100644
--- a/lang/coq/distinfo
+++ b/lang/coq/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/01/16 14:34:34 tonio Exp $
+$NetBSD: distinfo,v 1.5 2006/01/27 19:22:58 tonio Exp $
 
-SHA1 (coq-8.0pl2.tar.gz) = 58d0c054c9b50ef12b462f97df2424ee3baa25ab
-RMD160 (coq-8.0pl2.tar.gz) = ead90ff5957ccc9cbcd0f3769b75a7fb440b383b
-Size (coq-8.0pl2.tar.gz) = 2285855 bytes
-SHA1 (patch-aa) = 1e2592d494be250de76debfb79687611d4b7b870
+SHA1 (coq-8.0pl3.tar.gz) = b182f25b8e6591139281f7078d049aaa7f0408d8
+RMD160 (coq-8.0pl3.tar.gz) = 925a65fdd0c96f4fe6082bc7bfb8483c83b5fea7
+Size (coq-8.0pl3.tar.gz) = 2309002 bytes
+SHA1 (patch-aa) = 2ef8be34bd9c77229ef9a2a6e5d04891d7e159da
diff --git a/lang/coq/patches/patch-aa b/lang/coq/patches/patch-aa
index c612b8de3a7..a5439a89bd3 100644
--- a/lang/coq/patches/patch-aa
+++ b/lang/coq/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2006/01/16 14:34:34 tonio Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/27 19:22:58 tonio Exp $
 
---- Makefile.orig	2006-01-16 15:09:17.000000000 +0100
+--- Makefile.orig	2006-01-12 00:18:05.000000000 +0100
 +++ Makefile
-@@ -608,22 +608,22 @@ install-coqide:: install-ide-$(HASCOQIDE
+@@ -609,22 +609,22 @@ install-coqide:: install-ide-$(HASCOQIDE
  install-ide-no:
  
  install-ide-byte: 
@@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.3 2006/01/16 14:34:34 tonio Exp $
  
  ###########################################################################
  # Pcoq: special binaries for debugging (coq-interface, parser)
-@@ -700,18 +700,18 @@ clean::
+@@ -699,18 +699,18 @@ contrib7/interface/AddDad.vo: contrib7/i
  install-pcoq:: install-pcoq-binaries install-pcoq-files install-pcoq-manpages
  
  install-pcoq-binaries::
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.3 2006/01/16 14:34:34 tonio Exp $
  
  ###########################################################################
  # tests
-@@ -1146,18 +1146,18 @@ install-coqlight: install-binaries insta
+@@ -1139,18 +1139,18 @@ install-coqlight: install-binaries insta
  install-binaries:: install-$(BEST) install-tools
  
  install-byte::
@@ -83,7 +83,7 @@ $NetBSD: patch-aa,v 1.3 2006/01/16 14:34:34 tonio Exp $
  
  LIBFILES=$(OLDTHEORIESVO) $(OLDCONTRIBVO)
  LIBFILESLIGHT=$(OLDTHEORIESLIGHTVO)
-@@ -1168,61 +1168,65 @@ NEWLIBFILESLIGHT=$(NEWTHEORIESLIGHTVO)
+@@ -1161,61 +1161,64 @@ NEWLIBFILESLIGHT=$(NEWTHEORIESLIGHTVO)
  install-library: install-library7 install-library8
  
  install-library8:
@@ -150,7 +150,6 @@ $NetBSD: patch-aa,v 1.3 2006/01/16 14:34:34 tonio Exp $
 +	ifeq ($(BEST),opt)
 +	MANPAGES+=man/coqtop.opt.1
 +	endif
-+
  
  install-coq-manpages:
 -	$(MKDIR) $(FULLMANDIR)/man1
@@ -169,23 +168,9 @@ $NetBSD: patch-aa,v 1.3 2006/01/16 14:34:34 tonio Exp $
  
  install-latex:
 -	$(MKDIR) $(FULLCOQDOCDIR)
--	cp tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)	
+-	cp tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)
 +	${BSD_INSTALL_DATA_DIR} $(FULLCOQDOCDIR)
 +	${BSD_INSTALL_DATA} tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)	
  #	-$(UPDATETEX)
  
  ###########################################################################
-@@ -1453,11 +1457,11 @@ ML4FILES += lib/pp.ml4 			\
- 
- .ml4.cmx:
- 	$(SHOW)'OCAMLOPT4 $<'
--	$(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -impl" -c -impl $<
-+	$(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -loc loc -impl" -c -impl $<
- 
- .ml4.cmo:
- 	$(SHOW)'OCAMLC4   $<'
--	$(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -impl" -c -impl $<
-+	$(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -loc loc -impl" -c -impl $<
- 
- #.v.vo:
- #	$(BOOTCOQTOP) -compile $*