Update to 8.6. Fix PORTEPOCH accidentally removed in the previous commit.

3 files changed, 17 insertions, 35 deletions

diff --git a/math/coq/files/patch-Makefile.build b/math/coq/files/patch-Makefile.build
index c8767447f442..b66ed54c2c10 100644
--- a/math/coq/files/patch-Makefile.build
+++ b/math/coq/files/patch-Makefile.build
@@ -1,29 +1,11 @@
---- Makefile.build.orig	2016-01-20 16:52:18 UTC
+--- Makefile.build.orig	2016-12-08 15:13:52 UTC
 +++ Makefile.build
-@@ -56,7 +56,7 @@ CURDEPS:=$(addsuffix .d, $(CURFILES))
+@@ -101,7 +101,7 @@ TIMER=$(if $(TIMED), $(STDTIME), $(TIMEC
+ #   TIME="%C (%U user, %S sys, %e total, %M maxres)"
  
- # Variables meant to be modifiable via the command-line of make
- 
--VERBOSE=
-+VERBOSE=1
- NO_RECOMPILE_ML4=
- NO_RECALC_DEPS=
- READABLE_ML4=	# non-empty means .ml of .ml4 will be ascii instead of binary
-@@ -82,7 +82,7 @@ STDTIME=/usr/bin/time -f "$* (user: %U m
- TIMER=$(if $(TIMED), $(STDTIME), $(TIMECMD))
- 
- COQOPTS=$(COQ_XML) $(VM) $(NATIVECOMPUTE)
+ COQOPTS=$(COQ_XML) $(NATIVECOMPUTE)
 -BOOTCOQC=$(TIMER) $(COQTOPEXE) -boot $(COQOPTS) -compile
 +BOOTCOQC=$(TIMER) env CAML_LD_LIBRARY_PATH=$${PWD}/kernel/byterun $(COQTOPEXE) -boot $(COQOPTS) -compile
  
- # The SHOW and HIDE variables control whether make will echo complete commands 
- # or only abbreviated versions. 
-@@ -704,7 +704,7 @@ install-doc-no:
- .PHONY: install install-doc-all install-doc-no
- 
- #These variables are intended to be set by the caller to make
--#COQINSTALLPREFIX=
-+COQINSTALLPREFIX=${DESTDIR}
- #OLDROOT=
- 
-   # Can be changed for a local installation (to make packages).
+ LOCALINCLUDES=$(addprefix -I , $(SRCDIRS) )
+ MLINCLUDES=$(LOCALINCLUDES) -I $(MYCAMLP4LIB)
diff --git a/math/coq/files/patch-Makefile.install b/math/coq/files/patch-Makefile.install
new file mode 100644
index 000000000000..6597b7133aa0
--- /dev/null
+++ b/math/coq/files/patch-Makefile.install
@@ -0,0 +1,11 @@
+--- Makefile.install.orig	2016-12-08 15:13:52 UTC
++++ Makefile.install
+@@ -29,7 +29,7 @@ install-doc-no:
+ .PHONY: install install-doc-all install-doc-no
+ 
+ #These variables are intended to be set by the caller to make
+-#COQINSTALLPREFIX=
++COQINSTALLPREFIX=${DESTDIR}
+ #OLDROOT=
+ 
+   # Can be changed for a local installation (to make packages).
diff --git a/math/coq/files/patch-configure.ml b/math/coq/files/patch-configure.ml
deleted file mode 100644
index e31ec3317f4f..000000000000
--- a/math/coq/files/patch-configure.ml
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ml.orig	2016-01-20 16:52:18 UTC
-+++ configure.ml
-@@ -843,7 +843,7 @@ let strip =
- (** * md5sum command *)
- 
- let md5sum =
--  if arch = "Darwin" then "md5 -q" else "md5sum"
-+  if arch = "FreeBSD" then "md5 -q" else "md5sum"
- 
- 
- (** * Documentation : do we have latex, hevea, ... *)