4 files changed, 28 insertions, 13 deletions
diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index d5e8d374f4a..0b8a63e08e1 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2016/05/05 11:45:40 jaapb Exp $
+# $NetBSD: Makefile,v 1.90 2016/07/02 10:17:18 jaapb Exp $
 #
 
-DISTNAME=	coq-8.5
-PKGREVISION=	4
+DISTNAME=	coq-8.5pl1
 CATEGORIES=	lang math
 MASTER_SITES=	http://coq.inria.fr/distrib/V${PKGVERSION_NOREV}/files/
 
@@ -52,6 +51,12 @@ PLIST_VARS+=		coqide natdynlink doc
 EGDIR=		${PREFIX}/share/coq/examples
 #CONF_FILES=	{EGDIR}/coqide-gtk2rc ${PKG_SYSCONFDIR}/xdg/coq/coqide-gtk2rc
 
+SUBST_CLASSES+=	fix-paths
+SUBST_STAGE.fix-paths=	post-configure
+SUBST_MESSAGE.fix-paths=	Remove buildlink references from Coq_config module
+SUBST_FILES.fix-paths=	config/coq_config.ml
+SUBST_SED.fix-paths=	-e "s,${BUILDLINK_DIR},${PREFIX},g"
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../lang/camlp5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/coq/PLIST b/lang/coq/PLIST
index 2b9a4f3a94e..d9bf11cc798 100644
--- a/lang/coq/PLIST
+++ b/lang/coq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2016/02/06 16:08:36 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.19 2016/07/02 10:17:18 jaapb Exp $
 bin/coq-tex
 bin/coq_makefile
 bin/coqc
@@ -142,6 +142,7 @@ lib/coq/lib/aux_file.cmi
 lib/coq/lib/backtrace.cmi
 lib/coq/lib/bigint.cmi
 lib/coq/lib/cArray.cmi
+lib/coq/lib/cEphemeron.cmi
 lib/coq/lib/cList.cmi
 lib/coq/lib/cMap.cmi
 lib/coq/lib/cObj.cmi
@@ -159,7 +160,6 @@ lib/coq/lib/control.cmi
 lib/coq/lib/deque.cmi
 lib/coq/lib/dyn.cmi
 lib/coq/lib/envars.cmi
-lib/coq/lib/ephemeron.cmi
 lib/coq/lib/errors.cmi
 lib/coq/lib/exninfo.cmi
 lib/coq/lib/explore.cmi
diff --git a/lang/coq/distinfo b/lang/coq/distinfo
index 15da4310035..b2e9ac07091 100644
--- a/lang/coq/distinfo
+++ b/lang/coq/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2016/02/06 16:08:36 jaapb Exp $
+$NetBSD: distinfo,v 1.25 2016/07/02 10:17:18 jaapb Exp $
 
-SHA1 (coq-8.5.tar.gz) = 0a0d124b1869d7e20cfcf3f71f086488c146f883
-RMD160 (coq-8.5.tar.gz) = 551d35ac96436d98112fa1a17bcc075ee307c627
-SHA512 (coq-8.5.tar.gz) = 28835a9dc4c926f97b14d23fe746e45e17942003e29807ec59f301eb0b697d704f05afc4cccd31b83bc27e9877d079d00e94a2101ba16ae32f4134e90ad011fb
-Size (coq-8.5.tar.gz) = 5346653 bytes
+SHA1 (coq-8.5pl1.tar.gz) = 92722ffc2be6948e0074b211bb556ad4b911ebd6
+RMD160 (coq-8.5pl1.tar.gz) = 04c540ab1033fd6b0e4c121b73ed56557708e7a5
+SHA512 (coq-8.5pl1.tar.gz) = c9a5bba1abc3b2216cb43595230387751277412988b44af1555ffccdc109a9eef69422867e0062d92dfc73ffcbbe24f53ff583224c28cae3f9bda1ae21dd547b
+Size (coq-8.5pl1.tar.gz) = 5366774 bytes
 SHA1 (patch-Makefile.build) = 1b711ef9490a07c9d02b5a8ca9a38c252e322b4f
-SHA1 (patch-Makefile.common) = 67131e197d25a087d845dfa6fa93729f0b2eaa00
+SHA1 (patch-Makefile.common) = f53dd334d3e14a0e0c3ef91bac9a6c1745cbb591
 SHA1 (patch-configure.ml) = 6e2f44091216348a12131592bf29f0f7fd93a4fe
diff --git a/lang/coq/patches/patch-Makefile.common b/lang/coq/patches/patch-Makefile.common
index ed1aac76310..19806bbbaec 100644
--- a/lang/coq/patches/patch-Makefile.common
+++ b/lang/coq/patches/patch-Makefile.common
@@ -1,7 +1,8 @@
-$NetBSD: patch-Makefile.common,v 1.1 2016/02/06 16:08:36 jaapb Exp $
+$NetBSD: patch-Makefile.common,v 1.2 2016/07/02 10:17:18 jaapb Exp $
 
 Use BSD_INSTALL_*
---- Makefile.common.orig	2015-12-16 23:44:44.000000000 +0000
+Compile with OCaml 4.03
+--- Makefile.common.orig	2016-04-11 13:12:51.000000000 +0000
 +++ Makefile.common
 @@ -35,7 +35,7 @@ else
  endif
@@ -12,3 +13,12 @@ Use BSD_INSTALL_*
  INSTALLSH:=./install.sh
  MKDIR:=install -d
  
+@@ -231,7 +231,7 @@ endif
+ LINKCMO:=$(CORECMA) $(STATICPLUGINS)
+ LINKCMX:=$(CORECMA:.cma=.cmxa) $(STATICPLUGINS:.cma=.cmxa)
+ 
+-IDEDEPS:=lib/clib.cma lib/xml_lexer.cmo lib/xml_parser.cmo lib/xml_printer.cmo lib/errors.cmo lib/spawn.cmo
++IDEDEPS:=lib/clib.cma lib/errors.cmo lib/spawn.cmo
+ IDECMA:=ide/ide.cma
+ IDETOPLOOPCMA=ide/coqidetop.cma
+