Import of pkgsrc-2016Q3

mail/notmuch/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2015/08/26 13:33:36 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2016/09/12 07:42:41 wiz Exp $
 
-DISTNAME=	notmuch-0.20.2
+DISTNAME=	notmuch-0.22.2
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
@@ -14,19 +14,19 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config
-MAKE_FLAGS+=	PYTHONBIN=${PYTHONBIN}
+MAKE_FLAGS+=	PYTHON=${PYTHONBIN}
+#TEST_TARGET=	check
 
 .include "options.mk"
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--without-ruby
 
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES+=		gnuld
+SUBST_CLASSES.SunOS+=	gnuld
 SUBST_STAGE.gnuld=	pre-configure
 SUBST_FILES.gnuld=	lib/Makefile.local
 SUBST_SED.gnuld=	-e 's/-Wl,--[^ ]*//g'
-.endif
 
 SUBST_CLASSES+=		sphinx
 SUBST_SED.sphinx+=	-e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},"
@@ -36,9 +36,8 @@ SUBST_MESSAGE.sphinx=	Fix sphinx command names.
 
 LDFLAGS.SunOS+=	-lnsl
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # as of 0.19
 .include "../../lang/python/application.mk"
-.include "../../mail/gmime24/buildlink3.mk"
+.include "../../mail/gmime/buildlink3.mk"
 .include "../../textproc/xapian/buildlink3.mk"
 .include "../../devel/talloc/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

mail/notmuch/PLIST

@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2015/08/26 13:33:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/11/22 23:55:33 wiz Exp $
 bin/notmuch
 include/notmuch.h
 lib/libnotmuch.so
 lib/libnotmuch.so.4
-lib/libnotmuch.so.4.2.0
+lib/libnotmuch.so.4.3.0
 man/man1/notmuch-address.1
 man/man1/notmuch-compact.1
 man/man1/notmuch-config.1

mail/notmuch/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/11/19 13:06:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2015/11/22 23:56:52 wiz Exp $
 
 BUILDLINK_TREE+=	notmuch
 
@@ -6,10 +6,10 @@ BUILDLINK_TREE+=	notmuch
 NOTMUCH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.notmuch+=	notmuch>=0.16
-BUILDLINK_ABI_DEPENDS.notmuch+=	notmuch>=0.16
+BUILDLINK_ABI_DEPENDS.notmuch+=	notmuch>=0.21
 BUILDLINK_PKGSRCDIR.notmuch?=	../../mail/notmuch
 
-.include "../../mail/gmime24/buildlink3.mk"
+.include "../../mail/gmime/buildlink3.mk"
 .include "../../textproc/xapian/buildlink3.mk"
 .endif	# NOTMUCH_BUILDLINK3_MK
 

mail/notmuch/distinfo

@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2015/08/26 13:33:36 wiz Exp $
+$NetBSD: distinfo,v 1.12 2016/09/12 07:42:41 wiz Exp $
 
-SHA1 (notmuch-0.20.2.tar.gz) = 1aba10c86af29cc5b372b81f1780290bebff7f26
-RMD160 (notmuch-0.20.2.tar.gz) = 8224050c08c5968cfe5c6818285337a49a6a0769
-Size (notmuch-0.20.2.tar.gz) = 652945 bytes
+SHA1 (notmuch-0.22.2.tar.gz) = f60825656b0d00a6a60f82a01ab687f5bb46e839
+RMD160 (notmuch-0.22.2.tar.gz) = d8f497c53359e9b00f3c1fd9ebfeac4be616b408
+SHA512 (notmuch-0.22.2.tar.gz) = cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee
+Size (notmuch-0.22.2.tar.gz) = 683796 bytes
 SHA1 (patch-Makefile.local) = fad3bf11d139a9e0207965803bf854670f8f4853
-SHA1 (patch-aa) = a02bb9f8b1adff7c2d29b5919f32dab24adaaa65
-SHA1 (patch-doc_Makefile.local) = 7ebf6f335e22d0a7ffe2a57f3d39ab26a8181c99
+SHA1 (patch-aa) = a4c815c0663fa6e5e8692ff14f50ecf9537dda9a
 SHA1 (patch-lib_Makefile.local) = c81920e239d1e26d4502e57c4e7fdbd3209b6325
 SHA1 (patch-notmuch-dump.c) = d85095239da2c7247113143d2668d6ca47bc324f
 SHA1 (patch-notmuch-restore.c) = 5f908d2ee146e29bd025eee36adb5997d897e9ea

mail/notmuch/patches/patch-aa

@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2015/08/26 13:33:36 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2015/11/22 23:55:33 wiz Exp $
 
 Install completion files into example directory.
 Accept zlib 1.2.3.
 
---- configure.orig	2015-06-27 13:05:31.000000000 +0000
+--- configure.orig	2015-10-30 10:14:41.000000000 +0000
 +++ configure
-@@ -349,9 +349,9 @@ if ! pkg-config --exists zlib; then
+@@ -411,9 +411,9 @@ if ! pkg-config --exists zlib; then
    rm -f compat/gen_zlib_pc
  fi
  
@@ -17,16 +17,7 @@ Accept zlib 1.2.3.
      printf "Yes.\n"
      have_zlib=1
      zlib_cflags=$(pkg-config --cflags zlib)
-@@ -377,7 +377,7 @@ fi
- printf "Checking for python... "
- have_python=0
- 
--for name in python python2 python3; do
-+for name in python python2 python2.7 python3 python3.3 python3.4 ; do
-     if command -v $name > /dev/null; then
- 	have_python=1
- 	python=$name
-@@ -537,7 +537,7 @@ EOF
+@@ -614,7 +614,7 @@ EOF
  	echo "	http://xapian.org/"
      fi
      if [ $have_zlib -eq 0 ]; then
@@ -35,7 +26,7 @@ Accept zlib 1.2.3.
  	echo "	http://zlib.net/"
  	echo
      fi
-@@ -845,10 +845,10 @@ HAVE_DOXYGEN=${have_doxygen}
+@@ -952,10 +952,10 @@ HAVE_DOXYGEN=${have_doxygen}
  desktop_dir = \$(prefix)/share/applications
  
  # The directory to which bash completions files should be installed

mail/notmuch/patches/patch-doc_Makefile.local

@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_Makefile.local,v 1.3 2015/08/26 13:33:36 wiz Exp $
-
-Use proper python binary.
-
---- doc/Makefile.local.orig	2015-06-27 13:05:31.000000000 +0000
-+++ doc/Makefile.local
-@@ -7,7 +7,7 @@ SPHINXOPTS    := -q
- SPHINXBUILD   = sphinx-build
- DOCBUILDDIR      := $(dir)/_build
- 
--mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py
-+mkdocdeps := ${PYTHONBIN} $(srcdir)/$(dir)/mkdocdeps.py
- 
- # Internal variables.
- ALLSPHINXOPTS   := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(srcdir)/$(dir)