[pkgsrc/trunk]: pkgsrc/lang/coq Make lang/coq compile with ocaml 3.09

[tonio <tonio%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/952c29db2a37
branches:  trunk
changeset: 506462:952c29db2a37
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Mon Jan 16 14:34:34 2006 +0000

description:
Make lang/coq compile with ocaml 3.09
by applying the patch distributed by the coq team
Bump PKGREVISION, and require ocaml >= 3.09

diffstat:

 lang/coq/Makefile         |   5 +++--
 lang/coq/distinfo         |   4 ++--
 lang/coq/patches/patch-aa |  28 +++++++++++++++++++++-------
 3 files changed, 26 insertions(+), 11 deletions(-)

diffs (95 lines):

diff -r aab3aae733d8 -r 952c29db2a37 lang/coq/Makefile
--- a/lang/coq/Makefile Mon Jan 16 14:26:24 2006 +0000
+++ b/lang/coq/Makefile Mon Jan 16 14:34:34 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:09 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/16 14:34:34 tonio Exp $
 #
 
 DISTNAME=      coq-8.0pl2
+PKGREVISION=   1
 CATEGORIES=    lang math
 MASTER_SITES=  ftp://ftp.inria.fr/INRIA/coq/V8.0pl2/
 
@@ -16,7 +17,7 @@
 CONFIGURE_ARGS+=       -reals all
 BUILD_TARGET=          world
 
-BUILDLINK_DEPENDS.ocaml+=       ocaml>=3.06
+BUILDLINK_DEPENDS.ocaml+=       ocaml>=3.09
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r aab3aae733d8 -r 952c29db2a37 lang/coq/distinfo
--- a/lang/coq/distinfo Mon Jan 16 14:26:24 2006 +0000
+++ b/lang/coq/distinfo Mon Jan 16 14:34:34 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:03:06 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/01/16 14:34:34 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) = e62e14729a2dacd7e6e9aa4418c911b34cc4aee5
+SHA1 (patch-aa) = 1e2592d494be250de76debfb79687611d4b7b870
diff -r aab3aae733d8 -r 952c29db2a37 lang/coq/patches/patch-aa
--- a/lang/coq/patches/patch-aa Mon Jan 16 14:26:24 2006 +0000
+++ b/lang/coq/patches/patch-aa Mon Jan 16 14:34:34 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/02/05 11:19:02 adrianp Exp $
+$NetBSD: patch-aa,v 1.3 2006/01/16 14:34:34 tonio Exp $
 
---- Makefile.orig      2004-07-19 11:37:31.000000000 +0200
-+++ Makefile   2005-01-20 12:15:39.000000000 +0100
-@@ -608,22 +608,22 @@
+--- Makefile.orig      2006-01-16 15:09:17.000000000 +0100
++++ Makefile
+@@ -608,22 +608,22 @@ install-coqide:: install-ide-$(HASCOQIDE
  install-ide-no:
  
  install-ide-byte: 
@@ -33,7 +33,7 @@
  
  ###########################################################################
  # Pcoq: special binaries for debugging (coq-interface, parser)
-@@ -700,18 +700,18 @@
+@@ -700,18 +700,18 @@ clean::
  install-pcoq:: install-pcoq-binaries install-pcoq-files install-pcoq-manpages
  
  install-pcoq-binaries::
@@ -58,7 +58,7 @@
  
  ###########################################################################
  # tests
-@@ -1146,18 +1146,18 @@
+@@ -1146,18 +1146,18 @@ install-coqlight: install-binaries insta
  install-binaries:: install-$(BEST) install-tools
  
  install-byte::
@@ -83,7 +83,7 @@
  
  LIBFILES=$(OLDTHEORIESVO) $(OLDCONTRIBVO)
  LIBFILESLIGHT=$(OLDTHEORIESLIGHTVO)
-@@ -1168,61 +1168,65 @@
+@@ -1168,61 +1168,65 @@ NEWLIBFILESLIGHT=$(NEWTHEORIESLIGHTVO)
  install-library: install-library7 install-library8
  
  install-library8:
@@ -175,3 +175,17 @@
  #     -$(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 $*