svn commit: r464491 - head/misc/mbuffer

[Tobias Kortkamp]

Author: tobik
Date: Wed Mar 14 13:42:25 2018
New Revision: 464491
URL: https://svnweb.freebsd.org/changeset/ports/464491

Log:
  misc/mbuffer: Update to 2017.10.11
  
  - While here switch to options helpers
  
  PR:		222329
  Submitted by:	asomers
  Approved by:	mm (maintainer timeout, 6 months)

Added:
  head/misc/mbuffer/pkg-plist   (contents, props changed)
Modified:
  head/misc/mbuffer/Makefile
  head/misc/mbuffer/distinfo

Modified: head/misc/mbuffer/Makefile
==============================================================================
--- head/misc/mbuffer/Makefile	Wed Mar 14 13:00:56 2018	(r464490)
+++ head/misc/mbuffer/Makefile	Wed Mar 14 13:42:25 2018	(r464491)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mbuffer
-PORTVERSION=	2016.06.13
+PORTVERSION=	2017.10.11
 CATEGORIES=	misc
 MASTER_SITES=	http://www.maier-komor.de/software/mbuffer/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
@@ -13,37 +13,29 @@ COMMENT=	Tool for buffering data streams
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake tar:tgz
+USES=		gmake localbase ssl tar:tgz
 GNU_CONFIGURE=	yes
-MAKE_ARGS=	SHELL=${SH}
+# 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
+MAKE_ARGS=	SHELL=/bin/sh
 
-PLIST_FILES=	bin/mbuffer man/man1/mbuffer.1.gz
-
 OPTIONS_DEFINE=	MHASH
-MHASH_DESC=	Use mhash for hash generation
-
 OPTIONS_DEFAULT=	MHASH
 
-.include <bsd.port.options.mk>
+MHASH_DESC=	Use mhash for hash generation
 
-.if ${PORT_OPTIONS:MMHASH}
-LIB_DEPENDS+=	libmhash.so:security/mhash
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=ac_cv_search_mhash_init=no
-USES+=		ssl
-.endif
+MHASH_LIB_DEPENDS=	libmhash.so:security/mhash
+MHASH_CONFIGURE_OFF=	ac_cv_search_mhash_init=no
 
-# 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
-
-.include <bsd.port.pre.mk>
-
 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}/mbuffer.c
+		${WRKSRC}/config.h ${WRKSRC}/settings.c
 
-.include <bsd.port.post.mk>
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mbuffer
+	${MV} ${STAGEDIR}${PREFIX}/etc/mbuffer.rc \
+		${STAGEDIR}${PREFIX}/etc/mbuffer.rc.sample
+
+.include <bsd.port.mk>

Modified: head/misc/mbuffer/distinfo
==============================================================================
--- head/misc/mbuffer/distinfo	Wed Mar 14 13:00:56 2018	(r464490)
+++ head/misc/mbuffer/distinfo	Wed Mar 14 13:42:25 2018	(r464491)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466720344
-SHA256 (mbuffer-20160613.tgz) = 67a92869c0a7e8da1bd96b70cc7de7233286a7ccba55ffc9b55d0d611df649fd
-SIZE (mbuffer-20160613.tgz) = 123253
+TIMESTAMP = 1512145808
+SHA256 (mbuffer-20171011.tgz) = eb2f979708bb5ba42a6c1f12c7502dff3b05df8e49b5686c308eda96cad0d1fc
+SIZE (mbuffer-20171011.tgz) = 136630

Added: head/misc/mbuffer/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/mbuffer/pkg-plist	Wed Mar 14 13:42:25 2018	(r464491)
@@ -0,0 +1,3 @@
+bin/mbuffer
+ at sample etc/mbuffer.rc.sample
+man/man1/mbuffer.1.gz