Index: head/mail/notmuch/Makefile
===================================================================
--- head/mail/notmuch/Makefile	(revision 429381)
+++ head/mail/notmuch/Makefile	(revision 429382)
@@ -1,85 +1,89 @@
 # Created by: DarwinSurvivor <darwinsurvivor@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	notmuch
-PORTVERSION=	0.23.3
+PORTVERSION=	0.23.4
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
 MAINTAINER=	mp39590@gmail.com
 COMMENT=	Thread-based email index, search, and tagging application
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING-GPL-3
 
 BUILD_DEPENDS=	c++filt:devel/binutils
 LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
 		libxapian.so:databases/xapian-core \
 		libtalloc.so:devel/talloc
 TEST_DEPENDS=	bash:shells/bash \
 		emacs:editors/emacs-nox11 \
 		dtach:misc/dtach \
-		base64:converters/base64
+		gdate:sysutils/coreutils \
+		gbase64:sysutils/coreutils \
+		gwc:sysutils/coreutils \
+		gsed:sysutils/coreutils \
+		gsha256sum:sysutils/coreutils \
+		gpg:security/gnupg \
+		${PREFIX}/bin/gdb:devel/gdb
 
 BROKEN_powerpc64=	Does not build
 
 HAS_CONFIGURE=	yes
 USES=		gmake pkgconfig python:build
 USE_GNOME=	glib20
 CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
 USE_LDCONFIG=	yes
 
 MAKE_ENV+=	PYTHONCMD=${PYTHON_CMD}
 
-## a lot of tests are failing because they're Linux oriented and need
-## some tweaking to run on FreeBSD
-TEST_ENV+=	NOTMUCH_SKIP_TESTS="basic new count insert tagging json sexp \
-		emacs emacs-large-search-buffer crypto smime atomicity ruby \
-		parse-time-string upgrade thread-search thread-breakage \
-		message-property lock" V=1 \
-		TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+TEST_ENV+=	NOTMUCH_SKIP_TESTS="basic count insert smime atomicity \
+		message-property" \
+		V=1 \
+		TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
+		BSD_GDB=${PREFIX}/bin/gdb
 
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=	BASH DOXYGEN EMACS MANPAGES MUTT RUBY ZSH
 EMACS_DESC=	Install EMACS lisp files (requires emacs)
 MUTT_DESC=	Install notmuch-mutt script
 OPTIONS_SUB=	yes
 
 BASH_BUILD_DEPENDS=	bash-completion>=1.90:shells/bash-completion
 BASH_RUN_DEPENDS=	${BASH_BUILD_DEPENDS}
 BASH_CONFIGURE_WITH=	bash-completion
 DOXYGEN_CONFIGURE_WITH=	api-docs
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 EMACS_CONFIGURE_WITH=	emacs
 EMACS_CONFIGURE_ON=	--emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
 			--emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR}
 EMACS_USE=	EMACS=yes
 MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 MUTT_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu \
 			p5-Mail-Tools>0:mail/p5-Mail-Tools \
 			p5-Mail-Box>0:mail/p5-Mail-Box \
 			p5-String-ShellQuote>0:textproc/p5-String-ShellQuote
 MUTT_USE=	PERL=yes
 RUBY_USE=	RUBY=yes
 ZSH_CONFIGURE_WITH=	zsh-completion
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000000
 CONFIGURE_ENV=	zlib_cflags="" zlib_ldflags="-lz" PKG_CONFIG_PATH=""
 .endif
 
 do-build-MUTT-on:
 	${MAKE_CMD} -C ${WRKSRC}/contrib/notmuch-mutt all
 	${GZIP_CMD} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt.1
 
 do-install-MUTT-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt.1.gz ${STAGEDIR}${MANPREFIX}/man/man1
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.4.0
 
 .include <bsd.port.post.mk>
Index: head/mail/notmuch/distinfo
===================================================================
--- head/mail/notmuch/distinfo	(revision 429381)
+++ head/mail/notmuch/distinfo	(revision 429382)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481130627
-SHA256 (notmuch-0.23.3.tar.gz) = 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882
-SIZE (notmuch-0.23.3.tar.gz) = 691361
+TIMESTAMP = 1482605015
+SHA256 (notmuch-0.23.4.tar.gz) = 106dd6e39c4955871a49a84488d06394c1cecf66c1542b11834f8e8d5c66453b
+SIZE (notmuch-0.23.4.tar.gz) = 691851
Index: head/mail/notmuch/files/patch-test_test-lib-common.sh
===================================================================
--- head/mail/notmuch/files/patch-test_test-lib-common.sh	(nonexistent)
+++ head/mail/notmuch/files/patch-test_test-lib-common.sh	(revision 429382)
@@ -0,0 +1,19 @@
+--- test/test-lib-common.sh.orig	2016-12-24 18:44:17 UTC
++++ test/test-lib-common.sh
+@@ -24,6 +24,16 @@
+ #
+ type die >/dev/null 2>&1 || die () { echo "$@" >&2; exit 1; }
+ 
++# allow using aliases in scripts
++shopt -s expand_aliases
++
++alias date=gdate
++alias base64=gbase64
++alias gdb=$BSD_GDB
++alias wc=gwc
++alias sed=gsed
++alias sha256sum=gsha256sum
++
+ find_notmuch_path ()
+ {
+     dir="$1"

Property changes on: head/mail/notmuch/files/patch-test_test-lib-common.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property