Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c633294b7648be89178e748bdbb65af6aefd2194
commit c633294b7648be89178e748bdbb65af6aefd2194 Author: Elentir <elen...@frugalware.org> Date: Sun Feb 13 21:49:06 2011 +0100 coq-8.3pl1-1-i686 * version bump diff --git a/source/xapps-extra/coq/FrugalBuild b/source/xapps-extra/coq/FrugalBuild index a50dc6c..7b375c6 100644 --- a/source/xapps-extra/coq/FrugalBuild +++ b/source/xapps-extra/coq/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Elentir <elen...@frugalware.org> pkgname=coq -pkgver=8.3 +pkgver=8.3pl1 pkgrel=1 pkgdesc="Coq is a formal proof management system" url="http://coq.inria.fr/"; -source=("$url/distrib/V$pkgver/files/$pkgname-$pkgver.tar.gz" coq-make-3.82.patch) +source=("$url/distrib/V$pkgver/files/$pkgname-$pkgver.tar.gz") depends=('gtk+2-libs' 'gdk-pixbuf2') makedepends=('ocaml>=3.11.1' 'lablgtk2' 'camlp5') options=('scriptlet' 'nostrip') @@ -18,8 +18,7 @@ _F_desktop_name="Coqide" _F_desktop_exec="coqide" _F_desktop_categories="Science;Math;" _F_desktop_icon="$pkgname.png" -sha1sums=('6c6472b6a41429e78d979eacd8ff58bd6f6c9da4' \ - '731f8de646ffb38f390b31ff2b5ba558e3b02f90') +sha1sums=('3fae9fa2fd6f39c9fb3c0b67fcd5e71f1e7a5f9f') build() { unset MAKEFLAGS diff --git a/source/xapps-extra/coq/coq-make-3.82.patch b/source/xapps-extra/coq/coq-make-3.82.patch deleted file mode 100644 index 1edac20..0000000 --- a/source/xapps-extra/coq/coq-make-3.82.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -Naur coq-8.3/Makefile coq-8.3/Makefile ---- coq-8.3/Makefile 2010-10-13 21:53:28.000000000 +0200 -+++ coq-8.3/Makefile 2010-10-18 13:29:41.384000036 +0200 -@@ -160,9 +160,15 @@ - stage1 $(STAGE1_TARGETS) : always - $(call stage-template,1) - -+$(STAGE1_TARGETS_IMPLICIT) : always -+ $(call stage-template,1) -+ - stage2 $(STAGE2_TARGETS) : stage1 - $(call stage-template,2) - -+$(STAGE2_TARGETS_IMPLICIT) : stage1 -+ $(call stage-template,2) -+ - # Nota: - # - world is one of the targets in $(STAGE2_TARGETS), hence launching - # "make" or "make world" leads to recursion into stage1 then stage2 -diff -Naur coq-8.3/Makefile.common coq-8.3/Makefile.common ---- coq-8.3/Makefile.common 2010-06-23 15:17:17.000000000 +0200 -+++ coq-8.3/Makefile.common 2010-10-18 13:31:29.767000038 +0200 -@@ -374,10 +374,12 @@ - STAGE1_TARGETS:= $(STAGE1) $(COQDEPBOOT) \ - $(GENFILES) \ - source-doc revision toplevel/mltop.byteml toplevel/mltop.optml \ -- $(STAGE1_ML4:.ml4=.ml4-preprocessed) %.o -+ $(STAGE1_ML4:.ml4=.ml4-preprocessed) -+ -+STAGE1_TARGETS_IMPLICIT:=%.o - - ifdef CM_STAGE1 -- STAGE1_TARGETS+=$(CAML_OBJECT_PATTERNS) -+ STAGE1_TARGETS_IMPLICIT+=$(CAML_OBJECT_PATTERNS) - endif - - ## Enumeration of targets that require being done at stage2 -@@ -402,12 +404,13 @@ - printers debug initplugins plugins \ - world install coqide coqide-files coq coqlib \ - coqlight states check init theories theories-light \ -- $(DOC_TARGETS) $(VO_TARGETS) validate \ -- %.vo %.glob states/% install-% %.ml4-preprocessed \ -+ $(DOC_TARGETS) $(VO_TARGETS) validate -+ -+STAGE2_TARGETS_IMPLICIT:=%.vo %.glob states/% install-% %.ml4-preprocessed \ - $(DOC_TARGET_PATTERNS) - - ifndef CM_STAGE1 -- STAGE2_TARGETS+=$(CAML_OBJECT_PATTERNS) -+ STAGE2_TARGETS_IMPLICIT+=$(CAML_OBJECT_PATTERNS) - endif - - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
