Sat Jan 12 11:48:40 2008 UTC ()
Update lang/coq to 8.1pl3

hanges from V8.1pl2 to V8.1pl3
===============================
Bug fixes
- A critical bug and a few other bugs have been fixed.


(tonio)
diff -r1.18 -r1.19 pkgsrc/lang/coq/Makefile
diff -r1.7 -r1.8 pkgsrc/lang/coq/distinfo
diff -r1.6 -r1.7 pkgsrc/lang/coq/patches/patch-aa
cvs diff -r1.18 -r1.19 pkgsrc/lang/coq/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/coq/Makefile 2007/12/01 13:05:36 1.18
+++ pkgsrc/lang/coq/Makefile 2008/01/12 11:48:39 1.19
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.18 2007/12/01 13:05:36 tonio Exp $ 1# $NetBSD: Makefile,v 1.19 2008/01/12 11:48:39 tonio Exp $
2# 2#
3 3
4DISTNAME= coq-8.1pl2 4DISTNAME= coq-8.1pl3
5CATEGORIES= lang math 5CATEGORIES= lang math
6MASTER_SITES= ftp://ftp.inria.fr/INRIA/coq/V8.1pl2/ 6MASTER_SITES= ftp://ftp.inria.fr/INRIA/coq/V8.1pl3/
7 7
8MAINTAINER= richards+netbsd@CS.Princeton.EDU 8MAINTAINER= richards+netbsd@CS.Princeton.EDU
9HOMEPAGE= http://coq.inria.fr/ 9HOMEPAGE= http://coq.inria.fr/
10COMMENT= Theorem prover which extracts programs from proofs 10COMMENT= Theorem prover which extracts programs from proofs
11 11
12USE_TOOLS+= gmake 12USE_TOOLS+= gmake
13HAS_CONFIGURE= YES 13HAS_CONFIGURE= YES
14CONFIGURE_ARGS+= -prefix ${PREFIX} 14CONFIGURE_ARGS+= -prefix ${PREFIX}
15CONFIGURE_ARGS+= -emacslib ${PREFIX}/share/emacs/site-lisp 15CONFIGURE_ARGS+= -emacslib ${PREFIX}/share/emacs/site-lisp
16CONFIGURE_ARGS+= -reals all 16CONFIGURE_ARGS+= -reals all
17BUILD_TARGET= world 17BUILD_TARGET= world
18 18
19BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.09 19BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.09
cvs diff -r1.7 -r1.8 pkgsrc/lang/coq/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/coq/distinfo 2007/12/01 13:05:36 1.7
+++ pkgsrc/lang/coq/distinfo 2008/01/12 11:48:40 1.8
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.7 2007/12/01 13:05:36 tonio Exp $ 1$NetBSD: distinfo,v 1.8 2008/01/12 11:48:40 tonio Exp $
2 2
3SHA1 (coq-8.1pl2.tar.gz) = 33ab31abffe42559a5c8341b66a0520805337526 3SHA1 (coq-8.1pl3.tar.gz) = c06141891c2a793ff6b4bc1f106d9477b3a9a52e
4RMD160 (coq-8.1pl2.tar.gz) = e45451fdd41b1f979febcfb2c0dbd19a39d09256 4RMD160 (coq-8.1pl3.tar.gz) = f8f4749e1014cb47a83915550713cf9ce1992e34
5Size (coq-8.1pl2.tar.gz) = 2997185 bytes 5Size (coq-8.1pl3.tar.gz) = 3003593 bytes
6SHA1 (patch-aa) = 4a518e52aea4a2e239754b6a8123b9a2fdaefa00 6SHA1 (patch-aa) = bdfe2986da84b13c7df383caf969858707be83f3
7SHA1 (patch-ab) = b252096b0bef5fee0a2f719ddc17021fd013ed64 7SHA1 (patch-ab) = b252096b0bef5fee0a2f719ddc17021fd013ed64
cvs diff -r1.6 -r1.7 pkgsrc/lang/coq/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/coq/patches/Attic/patch-aa 2007/12/01 13:05:37 1.6
+++ pkgsrc/lang/coq/patches/Attic/patch-aa 2008/01/12 11:48:40 1.7
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-aa,v 1.6 2007/12/01 13:05:37 tonio Exp $ 1$NetBSD: patch-aa,v 1.7 2008/01/12 11:48:40 tonio Exp $
2 2
3--- Makefile.orig Thu Oct 11 15:44:00 2007 3--- Makefile.orig Mon Nov 12 16:10:25 2007
4+++ Makefile 4+++ Makefile
5@@ -690,22 +690,22 @@ install-coqide:: install-ide-$(HASCOQIDE 5@@ -690,22 +690,22 @@ install-coqide:: install-ide-$(HASCOQIDE
6 install-ide-no: 6 install-ide-no:
7  7
8 install-ide-byte:  8 install-ide-byte:
9- $(MKDIR) $(FULLBINDIR) 9- $(MKDIR) $(FULLBINDIR)
10- cp $(COQIDEBYTE) $(FULLBINDIR) 10- cp $(COQIDEBYTE) $(FULLBINDIR)
11+ ${BSD_INSTALL_PROGRAM_DIR} $(FULLBINDIR) 11+ ${BSD_INSTALL_PROGRAM_DIR} $(FULLBINDIR)
12+ ${BSD_INSTALL_SCRIPT} $(COQIDEBYTE) $(FULLBINDIR) 12+ ${BSD_INSTALL_SCRIPT} $(COQIDEBYTE) $(FULLBINDIR)
13 cd $(FULLBINDIR); ln -sf coqide.byte$(EXE) coqide$(EXE) 13 cd $(FULLBINDIR); ln -sf coqide.byte$(EXE) coqide$(EXE)
14  14
15 install-ide-opt: 15 install-ide-opt:
16- $(MKDIR) $(FULLBINDIR) 16- $(MKDIR) $(FULLBINDIR)
@@ -79,42 +79,42 @@ $NetBSD: patch-aa,v 1.6 2007/12/01 13:05 @@ -79,42 +79,42 @@ $NetBSD: patch-aa,v 1.6 2007/12/01 13:05
79- $(MKDIR) $(FULLBINDIR) 79- $(MKDIR) $(FULLBINDIR)
80 # recopie des fichiers de style pour coqide 80 # recopie des fichiers de style pour coqide
81- $(MKDIR) $(FULLCOQLIB)/tools/coqdoc 81- $(MKDIR) $(FULLCOQLIB)/tools/coqdoc
82- touch $(FULLCOQLIB)/tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc/coqdoc.css # to have the mode according to umask (bug #1715) 82- touch $(FULLCOQLIB)/tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc/coqdoc.css # to have the mode according to umask (bug #1715)
83- cp tools/coqdoc/coqdoc.css tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc 83- cp tools/coqdoc/coqdoc.css tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc
84- cp $(TOOLS) $(FULLBINDIR) 84- cp $(TOOLS) $(FULLBINDIR)
85+ ${BSD_INSTALL_PROGRAM_DIR} $(FULLBINDIR) 85+ ${BSD_INSTALL_PROGRAM_DIR} $(FULLBINDIR)
86+ ${BSD_INSTALL_SCRIPT} $(TOOLS) $(FULLBINDIR) 86+ ${BSD_INSTALL_SCRIPT} $(TOOLS) $(FULLBINDIR)
87+ ${BSD_INSTALL_PROGRAM_DIR} $(FULLCOQLIB)/tools/coqdoc 87+ ${BSD_INSTALL_PROGRAM_DIR} $(FULLCOQLIB)/tools/coqdoc
88+ ${BSD_INSTALL_DATA} tools/coqdoc/coqdoc.css tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc 88+ ${BSD_INSTALL_DATA} tools/coqdoc/coqdoc.css tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc
89  89
90 LIBFILES=$(THEORIESVO) $(CONTRIBVO) 90 LIBFILES=$(THEORIESVO) $(CONTRIBVO)
91 LIBFILESLIGHT=$(THEORIESLIGHTVO) 91 LIBFILESLIGHT=$(THEORIESLIGHTVO)
92@@ -1272,52 +1271,55 @@ OBJECTCMA=lib/lib.cma kernel/kernel.cma  92@@ -1274,52 +1273,55 @@ OBJECTCMA=lib/lib.cma kernel/kernel.cma
93 OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa) 93 OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa)
94  94
95 install-library: 95 install-library:
96- $(MKDIR) $(FULLCOQLIB) 96- $(MKDIR) $(FULLCOQLIB)
97+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB) 97+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)
98 for f in $(LIBFILES); do \ 98 for f in $(LIBFILES); do \
99- $(MKDIR) $(FULLCOQLIB)/`dirname $$f`; \ 99- $(MKDIR) $(FULLCOQLIB)/`dirname $$f`; \
100- cp $$f $(FULLCOQLIB)/`dirname $$f`; \ 100- cp $$f $(FULLCOQLIB)/`dirname $$f`; \
101+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/`dirname $$f`; \ 101+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/`dirname $$f`; \
102+ ${BSD_INSTALL_DATA} $$f $(FULLCOQLIB)/`dirname $$f`; \ 102+ ${BSD_INSTALL_DATA} $$f $(FULLCOQLIB)/`dirname $$f`; \
103 done 103 done
104- $(MKDIR) $(FULLCOQLIB)/states 104- $(MKDIR) $(FULLCOQLIB)/states
105- cp states/*.coq $(FULLCOQLIB)/states 105- cp states/*.coq $(FULLCOQLIB)/states
106- $(MKDIR) $(FULLCOQLIB)/user-contrib 106- $(MKDIR) $(FULLCOQLIB)/user-contrib
107- cp $(OBJECTCMA) $(OBJECTCMXA) $(FULLCOQLIB) 107- cp $(OBJECTCMA) $(OBJECTCMXA) $(GRAMMARCMA) $(FULLCOQLIB)
108+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/states 108+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/states
109+ ${BSD_INSTALL_DATA} states/*.coq $(FULLCOQLIB)/states 109+ ${BSD_INSTALL_DATA} states/*.coq $(FULLCOQLIB)/states
110+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/user-contrib 110+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/user-contrib
111+ ${BSD_INSTALL_DATA} $(OBJECTCMA) $(OBJECTCMXA) $(FULLCOQLIB)/states 111+ ${BSD_INSTALL_DATA} $(OBJECTCMA) $(OBJECTCMXA) $(FULLCOQLIB)/states
112  112
113 install-library-light: 113 install-library-light:
114- $(MKDIR) $(FULLCOQLIB) 114- $(MKDIR) $(FULLCOQLIB)
115+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB) 115+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)
116 for f in $(LIBFILESLIGHT); do \ 116 for f in $(LIBFILESLIGHT); do \
117- $(MKDIR) $(FULLCOQLIB)/`dirname $$f`; \ 117- $(MKDIR) $(FULLCOQLIB)/`dirname $$f`; \
118- cp $$f $(FULLCOQLIB)/`dirname $$f`; \ 118- cp $$f $(FULLCOQLIB)/`dirname $$f`; \
119+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/`dirname $$f`; \ 119+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/`dirname $$f`; \
120+ ${BSD_INSTALL_DATA} $$f $(FULLCOQLIB)/`dirname $$f`; \ 120+ ${BSD_INSTALL_DATA} $$f $(FULLCOQLIB)/`dirname $$f`; \
@@ -156,22 +156,13 @@ $NetBSD: patch-aa,v 1.6 2007/12/01 13:05 @@ -156,22 +156,13 @@ $NetBSD: patch-aa,v 1.6 2007/12/01 13:05
156+ ${BSD_INSTALL_DATA} tools/coq.el tools/coq-inferior.el $(FULLEMACSLIB) 156+ ${BSD_INSTALL_DATA} tools/coq.el tools/coq-inferior.el $(FULLEMACSLIB)
157  157
158 # command to update TeX' kpathsea database 158 # command to update TeX' kpathsea database
159 #UPDATETEX = $(MKTEXLSR) /usr/share/texmf /var/spool/texmf $(BASETEXDIR) > /dev/null 159 #UPDATETEX = $(MKTEXLSR) /usr/share/texmf /var/spool/texmf $(BASETEXDIR) > /dev/null
160  160
161 install-latex: 161 install-latex:
162- $(MKDIR) $(FULLCOQDOCDIR) 162- $(MKDIR) $(FULLCOQDOCDIR)
163- cp tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)  163- cp tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)
164+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQDOCDIR) 164+ ${BSD_INSTALL_DATA_DIR} $(FULLCOQDOCDIR)
165+ ${BSD_INSTALL_DATA} tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)  165+ ${BSD_INSTALL_DATA} tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)
166 # -$(UPDATETEX) 166 # -$(UPDATETEX)
167  167
168 ########################################################################### 168 ###########################################################################
169@@ -1758,7 +1760,7 @@ depend: dependp4 ml4filesml $(BEFOREDEPE 
170 for f in $(ML4FILES); do \ 
171 bn=`dirname $$f`/`basename $$f .ml4`; \ 
172 deps=`$(CAMLP4DEPS) $$f`; \ 
173- if [[ $${deps} != "" ]]; then \ 
174+ if [ "$${deps}" != "" ]; then \ 
175 /bin/mv -f .depend .depend.tmp; \ 
176 sed -e "\|^$${bn}.cmo|s|^$${bn}.cmo: \(.*\)$$|$${bn}.cmo: $${deps} \1|" \ 
177 -e "\|^$${bn}.cmx|s|^$${bn}.cmx: \(.*\)$$|$${bn}.cmx: $${deps} \1|" \