Rename version to version.txt for compatibility with C++1z STL

implementations.

5 files changed, 47 insertions, 2 deletions

diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index f72123a880a..bfb7c648f12 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2018/12/01 11:38:12 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2018/12/27 15:07:05 joerg Exp $
 
 DISTNAME=	notmuch-0.28
 CATEGORIES=	mail
@@ -38,6 +38,9 @@ SUBST_MESSAGE.sphinx=	Fix sphinx command names.
 
 LDFLAGS.SunOS+=	-lnsl
 
+post-extract:
+	${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
+
 .include "../../lang/python/application.mk"
 BUILDLINK_API_DEPENDS.gmime3+=	gmime3>=3.0.3
 .include "../../mail/gmime3/buildlink3.mk"
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index 7275f5affe6..dfa9c9fb77e 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.33 2018/12/01 11:38:12 wiz Exp $
+$NetBSD: distinfo,v 1.34 2018/12/27 15:07:05 joerg Exp $
 
 SHA1 (notmuch-0.28.tar.gz) = f87c68a6cf81895b80c7c1e864ebdb9d54206bfb
 RMD160 (notmuch-0.28.tar.gz) = 9a413645c3f9cf7e16007d7937a7220492ef2672
 SHA512 (notmuch-0.28.tar.gz) = 56c8e6b742990b5b1d5b8d12146cc9eb710c6b216c876fd3824cc88b9051fef8251f53809ba39cd2f0fbd5e4ccee9ddedc7a602e3584d8a158abe4f2a094242f
 Size (notmuch-0.28.tar.gz) = 921069 bytes
+SHA1 (patch-Makefile.global) = f436bdb163e3110a8d097f3c88198aefb126eafc
+SHA1 (patch-Makefile.local) = d0a83ff130de36164f1667236860aa31d481d025
+SHA1 (patch-doc_conf.py) = 7492c878c96da68df16827aa0d6407c2e9808701
diff --git a/mail/notmuch/patches/patch-Makefile.global b/mail/notmuch/patches/patch-Makefile.global
new file mode 100644
index 00000000000..6505cbbb8df
--- /dev/null
+++ b/mail/notmuch/patches/patch-Makefile.global
@@ -0,0 +1,13 @@
+$NetBSD: patch-Makefile.global,v 1.3 2018/12/27 15:07:05 joerg Exp $
+
+--- Makefile.global.orig	2018-12-25 23:07:48.081408526 +0000
++++ Makefile.global
+@@ -16,7 +16,7 @@ else
+ DATE:=$(shell date +%F)
+ endif
+ 
+-VERSION:=$(shell cat ${srcdir}/version)
++VERSION:=$(shell cat ${srcdir}/version.txt)
+ ELPA_VERSION:=$(subst ~,_,$(VERSION))
+ ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
+ ifeq ($(IS_GIT),yes)
diff --git a/mail/notmuch/patches/patch-Makefile.local b/mail/notmuch/patches/patch-Makefile.local
new file mode 100644
index 00000000000..decfac5ee34
--- /dev/null
+++ b/mail/notmuch/patches/patch-Makefile.local
@@ -0,0 +1,13 @@
+$NetBSD: patch-Makefile.local,v 1.6 2018/12/27 15:07:05 joerg Exp $
+
+--- Makefile.local.orig	2018-12-25 23:06:56.845922522 +0000
++++ Makefile.local
+@@ -19,7 +19,7 @@ endif
+ 
+ # Depend (also) on the file 'version'. In case of ifeq ($(IS_GIT),yes)
+ # this file may already have been updated.
+-version.stamp: $(srcdir)/version
++version.stamp: $(srcdir)/version.txt
+ 	echo $(VERSION) > $@
+ 
+ $(TAR_FILE):
diff --git a/mail/notmuch/patches/patch-doc_conf.py b/mail/notmuch/patches/patch-doc_conf.py
new file mode 100644
index 00000000000..527065076d9
--- /dev/null
+++ b/mail/notmuch/patches/patch-doc_conf.py
@@ -0,0 +1,13 @@
+$NetBSD: patch-doc_conf.py,v 1.1 2018/12/27 15:07:05 joerg Exp $
+
+--- doc/conf.py.orig	2018-12-25 23:11:46.371067128 +0000
++++ doc/conf.py
+@@ -17,7 +17,7 @@ copyright = u'2009-2018, Carl Worth and 
+ location = os.path.dirname(__file__)
+ 
+ for pathdir in ['.', '..']:
+-    version_file = os.path.join(location,pathdir,'version')
++    version_file = os.path.join(location,pathdir,'version.txt')
+     if os.path.exists(version_file):
+         with open(version_file,'r') as infile:
+             version=infile.read().replace('\n','')