Index: head/misc/mbuffer/Makefile
===================================================================
--- head/misc/mbuffer/Makefile	(revision 469857)
+++ head/misc/mbuffer/Makefile	(revision 469858)
@@ -1,45 +1,42 @@
 # Created by: Rong-En Fan <rafan@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mbuffer
-PORTVERSION=	2018.03.18
-PORTREVISION=	1
+PORTVERSION=	20180505
 CATEGORIES=	misc
 MASTER_SITES=	http://www.maier-komor.de/software/mbuffer/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Tool for buffering data streams
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+TEST_DEPENDS=	gtar:archivers/gtar
+
 USES=		gmake localbase ssl tar:tgz
 GNU_CONFIGURE=	yes
-# Prevent sendfile() from being detected by configure and rejected
-# by mbuffer.c due to being "unable to send from buffers".
-CONFIGURE_ARGS=	ac_cv_search_sendfile=no \
-		ac_cv_header_gcrypt_h=no \
+CONFIGURE_ARGS=	ac_cv_header_gcrypt_h=no \
 		ac_cv_search_gcry_cipher_algo_name=no
-MAKE_ARGS=	SHELL=/bin/sh
+TEST_ARGS=	TAR=gtar # for --ignore-failed-read
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	MHASH
 OPTIONS_DEFAULT=	MHASH
 
 MHASH_DESC=	Use mhash for hash generation
 
 MHASH_LIB_DEPENDS=	libmhash.so:security/mhash
 MHASH_CONFIGURE_OFF=	ac_cv_search_mhash_init=no
 
 post-configure:
 	# Rename variables to make sure they aren't redefined through mhash.h
 	@${REINPLACE_CMD} -E -e 's@(PACKAGE|VERSION)@MBUFFER_\1@' \
 		${WRKSRC}/config.h ${WRKSRC}/settings.c
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mbuffer
 	${MV} ${STAGEDIR}${PREFIX}/etc/mbuffer.rc \
 		${STAGEDIR}${PREFIX}/etc/mbuffer.rc.sample
 
 .include <bsd.port.mk>
Index: head/misc/mbuffer/distinfo
===================================================================
--- head/misc/mbuffer/distinfo	(revision 469857)
+++ head/misc/mbuffer/distinfo	(revision 469858)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521439655
-SHA256 (mbuffer-20180318.tgz) = d3c1e20bf7e731602d7801f403f4f3ff8445256b89be76c20c5ba973dc8d00ea
-SIZE (mbuffer-20180318.tgz) = 137259
+TIMESTAMP = 1526284647
+SHA256 (mbuffer-20180505.tgz) = 33eb3f6969be995007fe8d3b0b5e301c8d324efeab37553a492bd23d2f330b72
+SIZE (mbuffer-20180505.tgz) = 140183