Index: head/misc/mbuffer/Makefile
===================================================================
--- head/misc/mbuffer/Makefile	(revision 490309)
+++ head/misc/mbuffer/Makefile	(revision 490310)
@@ -1,42 +1,38 @@
 # Created by: Rong-En Fan <rafan@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mbuffer
-PORTVERSION=	20180505
+PORTVERSION=	20190113
 CATEGORIES=	misc
 MASTER_SITES=	http://www.maier-komor.de/software/mbuffer/
 
 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
-CONFIGURE_ARGS=	ac_cv_header_gcrypt_h=no \
-		ac_cv_search_gcry_cipher_algo_name=no
 TEST_ARGS=	TAR=gtar # for --ignore-failed-read
 TEST_TARGET=	check
 
-OPTIONS_DEFINE=	MHASH
+OPTIONS_DEFINE=	GCRYPT MHASH RHASH
 OPTIONS_DEFAULT=	MHASH
 
+GCRYPT_DESC=	Use gcrypt for hash generation
 MHASH_DESC=	Use mhash for hash generation
+RHASH_DESC=	Use rhash 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
+GCRYPT_RUN_DEPENDS=	libgcrypt>=1.8.4_1:security/libgcrypt
+MHASH_RUN_DEPENDS=	mhash>=0.9.9.9_5:security/mhash
+RHASH_RUN_DEPENDS=	rhash>=1.3.5:security/rhash
 
 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 490309)
+++ head/misc/mbuffer/distinfo	(revision 490310)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526284647
-SHA256 (mbuffer-20180505.tgz) = 33eb3f6969be995007fe8d3b0b5e301c8d324efeab37553a492bd23d2f330b72
-SIZE (mbuffer-20180505.tgz) = 140183
+TIMESTAMP = 1547487174
+SHA256 (mbuffer-20190113.tgz) = 031de4afe6ec9984bf5392044953f829050cf3cbb2ef5806066d0ded51da2f1f
+SIZE (mbuffer-20190113.tgz) = 141753