diff --git a/doc/CHANGES-2008 b/doc/CHANGES-2008 index 4ceba00b360f..8ccd0e4c36ab 100644 --- a/doc/CHANGES-2008 +++ b/doc/CHANGES-2008 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2008,v 1.100 2008/01/12 06:21:40 taca Exp $ +$NetBSD: CHANGES-2008,v 1.101 2008/01/12 11:49:18 tonio Exp $ Changes to the packages collection and infrastructure in 2008: @@ -157,3 +157,4 @@ Changes to the packages collection and infrastructure in 2008: Added chat/smirk version 20080111 [bjs 2008-01-12] Removed net/ja-samba [taca 2008-01-12] Updated www/squid to 2.6.18 [taca 2008-01-12] + Updated lang/coq to 8.1pl3 [tonio 2008-01-12] diff --git a/lang/coq/Makefile b/lang/coq/Makefile index f6f8b3ed7d1c..068d8e69ab15 100644 --- a/lang/coq/Makefile +++ b/lang/coq/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2007/12/01 13:05:36 tonio Exp $ +# $NetBSD: Makefile,v 1.19 2008/01/12 11:48:39 tonio Exp $ # -DISTNAME= coq-8.1pl2 +DISTNAME= coq-8.1pl3 CATEGORIES= lang math -MASTER_SITES= ftp://ftp.inria.fr/INRIA/coq/V8.1pl2/ +MASTER_SITES= ftp://ftp.inria.fr/INRIA/coq/V8.1pl3/ MAINTAINER= richards+netbsd@CS.Princeton.EDU HOMEPAGE= http://coq.inria.fr/ diff --git a/lang/coq/distinfo b/lang/coq/distinfo index b7ef051cad8c..7ed6e1723e1b 100644 --- a/lang/coq/distinfo +++ b/lang/coq/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2007/12/01 13:05:36 tonio Exp $ +$NetBSD: distinfo,v 1.8 2008/01/12 11:48:40 tonio Exp $ -SHA1 (coq-8.1pl2.tar.gz) = 33ab31abffe42559a5c8341b66a0520805337526 -RMD160 (coq-8.1pl2.tar.gz) = e45451fdd41b1f979febcfb2c0dbd19a39d09256 -Size (coq-8.1pl2.tar.gz) = 2997185 bytes -SHA1 (patch-aa) = 4a518e52aea4a2e239754b6a8123b9a2fdaefa00 +SHA1 (coq-8.1pl3.tar.gz) = c06141891c2a793ff6b4bc1f106d9477b3a9a52e +RMD160 (coq-8.1pl3.tar.gz) = f8f4749e1014cb47a83915550713cf9ce1992e34 +Size (coq-8.1pl3.tar.gz) = 3003593 bytes +SHA1 (patch-aa) = bdfe2986da84b13c7df383caf969858707be83f3 SHA1 (patch-ab) = b252096b0bef5fee0a2f719ddc17021fd013ed64 diff --git a/lang/coq/patches/patch-aa b/lang/coq/patches/patch-aa index f74c4f97d2b5..5f3afb50e2f2 100644 --- a/lang/coq/patches/patch-aa +++ b/lang/coq/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.6 2007/12/01 13:05:37 tonio Exp $ +$NetBSD: patch-aa,v 1.7 2008/01/12 11:48:40 tonio Exp $ ---- Makefile.orig Thu Oct 11 15:44:00 2007 +--- Makefile.orig Mon Nov 12 16:10:25 2007 +++ Makefile @@ -690,22 +690,22 @@ install-coqide:: install-ide-$(HASCOQIDE install-ide-no: @@ -89,7 +89,7 @@ $NetBSD: patch-aa,v 1.6 2007/12/01 13:05:37 tonio Exp $ LIBFILES=$(THEORIESVO) $(CONTRIBVO) LIBFILESLIGHT=$(THEORIESLIGHTVO) -@@ -1272,52 +1271,55 @@ OBJECTCMA=lib/lib.cma kernel/kernel.cma +@@ -1274,52 +1273,55 @@ OBJECTCMA=lib/lib.cma kernel/kernel.cma OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa) install-library: @@ -104,7 +104,7 @@ $NetBSD: patch-aa,v 1.6 2007/12/01 13:05:37 tonio Exp $ - $(MKDIR) $(FULLCOQLIB)/states - cp states/*.coq $(FULLCOQLIB)/states - $(MKDIR) $(FULLCOQLIB)/user-contrib -- cp $(OBJECTCMA) $(OBJECTCMXA) $(FULLCOQLIB) +- cp $(OBJECTCMA) $(OBJECTCMXA) $(GRAMMARCMA) $(FULLCOQLIB) + ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/states + ${BSD_INSTALL_DATA} states/*.coq $(FULLCOQLIB)/states + ${BSD_INSTALL_DATA_DIR} $(FULLCOQLIB)/user-contrib @@ -166,12 +166,3 @@ $NetBSD: patch-aa,v 1.6 2007/12/01 13:05:37 tonio Exp $ # -$(UPDATETEX) ########################################################################### -@@ -1758,7 +1760,7 @@ depend: dependp4 ml4filesml $(BEFOREDEPE - for f in $(ML4FILES); do \ - bn=`dirname $$f`/`basename $$f .ml4`; \ - deps=`$(CAMLP4DEPS) $$f`; \ -- if [[ $${deps} != "" ]]; then \ -+ if [ "$${deps}" != "" ]; then \ - /bin/mv -f .depend .depend.tmp; \ - sed -e "\|^$${bn}.cmo|s|^$${bn}.cmo: \(.*\)$$|$${bn}.cmo: $${deps} \1|" \ - -e "\|^$${bn}.cmx|s|^$${bn}.cmx: \(.*\)$$|$${bn}.cmx: $${deps} \1|" \