misc/mbuffer: Update to 20190725

4 files changed, 39 insertions, 15 deletions

diff --git a/misc/mbuffer/Makefile b/misc/mbuffer/Makefile
index 80a3a389c1d4..1f0fa063cdf4 100644
--- a/misc/mbuffer/Makefile
+++ b/misc/mbuffer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mbuffer
-PORTVERSION=	20190127
+PORTVERSION=	20190725
 CATEGORIES=	misc
 MASTER_SITES=	http://www.maier-komor.de/software/mbuffer/
 
@@ -14,12 +14,15 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	gtar:archivers/gtar
 
-USES=		gmake localbase ssl tar:tgz
+USES=		localbase ssl tar:tgz
+
 GNU_CONFIGURE=	yes
-TEST_ARGS=	TAR=gtar # for --ignore-failed-read
+
+# for --ignore-failed-read
+TEST_ARGS=	TAR=gtar
 TEST_TARGET=	check
 
-OPTIONS_DEFINE=	GCRYPT MHASH RHASH
+OPTIONS_DEFINE=		GCRYPT MHASH RHASH
 OPTIONS_DEFAULT=	MHASH
 
 GCRYPT_DESC=	Use gcrypt for hash generation
diff --git a/misc/mbuffer/distinfo b/misc/mbuffer/distinfo
index ba6b7ebbcd53..1a69e98fbf87 100644
--- a/misc/mbuffer/distinfo
+++ b/misc/mbuffer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548767036
-SHA256 (mbuffer-20190127.tgz) = c5cb6f94f8083f2e87f88e25f6a379134b48a989925148022e8f611f954ceddc
-SIZE (mbuffer-20190127.tgz) = 142141
+TIMESTAMP = 1564143074
+SHA256 (mbuffer-20190725.tgz) = 21557270cca14776b2e1f73ac47bc259063f592d930b3df06742608007f450c2
+SIZE (mbuffer-20190725.tgz) = 145246
diff --git a/misc/mbuffer/files/patch-Makefile.in b/misc/mbuffer/files/patch-Makefile.in
new file mode 100644
index 000000000000..87500a07920e
--- /dev/null
+++ b/misc/mbuffer/files/patch-Makefile.in
@@ -0,0 +1,21 @@
+--- Makefile.in.orig	2019-07-25 21:31:45 UTC
++++ Makefile.in
+@@ -42,7 +42,7 @@ TAR		= @TAR@
+ 
+ TARGET		= mbuffer$(EXE)
+ SOURCES		= log.c network.c mbuffer.c hashing.c input.c common.c settings.c globals.c
+-OBJECTS		= $(SOURCES:%.c=build/%.o)
++OBJECTS		= $(SOURCES:.c=.o)
+ 
+ TESTTREE	= /bin /usr/bin
+ 
+@@ -54,9 +54,6 @@ $(OBJECTS): build config.h Makefile
+ 
+ build:
+ 	mkdir build
+-
+-build/%.o: %.c
+-	$(CC) $(CFLAGS) -c $< -o $@
+ 
+ $(TARGET): $(OBJECTS)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
diff --git a/misc/mbuffer/files/patch-configure b/misc/mbuffer/files/patch-configure
index abd4e3b27d14..eff878ac597b 100644
--- a/misc/mbuffer/files/patch-configure
+++ b/misc/mbuffer/files/patch-configure
@@ -2,7 +2,7 @@ Remove objdump and open/read/write/fstat symbol names check.  objdump
 is not available on all architectures and the symbol names are
 unlikely to ever change from their visible names on FreeBSD.
 
---- configure.orig	2018-05-05 15:01:58 UTC
+--- configure.orig	2019-07-25 21:31:45 UTC
 +++ configure
 @@ -628,7 +628,6 @@ ALLOCA
  EGREP
@@ -12,7 +12,7 @@ unlikely to ever change from their visible names on FreeBSD.
  AWK
  TAR
  MT
-@@ -4242,51 +4241,7 @@ $as_echo "no" >&6; }
+@@ -4283,51 +4282,6 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -44,7 +44,7 @@ unlikely to ever change from their visible names on FreeBSD.
 -done
 -  done
 -IFS=$as_save_IFS
- 
+-
 -  ;;
 -esac
 -fi
@@ -61,10 +61,10 @@ unlikely to ever change from their visible names on FreeBSD.
 -  test -n "$OBJDUMP" && break
 -done
 -
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
- $as_echo_n "checking return type of signal handlers... " >&6; }
- if ${ac_cv_type_signal+:} false; then :
-@@ -4931,11 +4886,7 @@ fi
+ # Check whether --enable-largefile was given.
+ if test "${enable_largefile+set}" = set; then :
+   enableval=$enable_largefile;
+@@ -4939,11 +4893,7 @@ fi
  
  
  
@@ -76,7 +76,7 @@ unlikely to ever change from their visible names on FreeBSD.
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable assertions" >&5
  $as_echo_n "checking whether to enable assertions... " >&6; }
    # Check whether --enable-assert was given.
-@@ -6129,86 +6080,12 @@ fi
+@@ -5948,86 +5898,12 @@ fi
  fi