CVS commit: pkgsrc/misc/mbuffer

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Wed Apr 30 13:10:04 UTC 2025

Modified Files:
        pkgsrc/misc/mbuffer: Makefile distinfo
        pkgsrc/misc/mbuffer/patches: patch-Makefile.in
Removed Files:
        pkgsrc/misc/mbuffer/patches: patch-mbuffer.c

Log Message:
Upstream took some of our patches -- thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/mbuffer/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/misc/mbuffer/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/mbuffer/patches/patch-Makefile.in
cvs rdiff -u -r1.2 -r0 pkgsrc/misc/mbuffer/patches/patch-mbuffer.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/mbuffer/Makefile
diff -u pkgsrc/misc/mbuffer/Makefile:1.10 pkgsrc/misc/mbuffer/Makefile:1.11
--- pkgsrc/misc/mbuffer/Makefile:1.10   Mon Apr 28 11:38:37 2025
+++ pkgsrc/misc/mbuffer/Makefile        Wed Apr 30 13:10:04 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2025/04/28 11:38:37 hauke Exp $
+# $NetBSD: Makefile,v 1.11 2025/04/30 13:10:04 hauke Exp $
 
-DISTNAME=      mbuffer-20241007
+DISTNAME=      mbuffer-20250429
 CATEGORIES=    misc
 MASTER_SITES=  http://www.maier-komor.de/software/mbuffer/
 EXTRACT_SUFX=  .tgz

Index: pkgsrc/misc/mbuffer/distinfo
diff -u pkgsrc/misc/mbuffer/distinfo:1.9 pkgsrc/misc/mbuffer/distinfo:1.10
--- pkgsrc/misc/mbuffer/distinfo:1.9    Mon Apr 28 11:38:37 2025
+++ pkgsrc/misc/mbuffer/distinfo        Wed Apr 30 13:10:04 2025
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.9 2025/04/28 11:38:37 hauke Exp $
+$NetBSD: distinfo,v 1.10 2025/04/30 13:10:04 hauke Exp $
 
-BLAKE2s (mbuffer-20241007.tgz) = 776f4f0b32d8e4cc7069c5e67a968a49afdc371d0062657dab24851bb09bf488
-SHA512 (mbuffer-20241007.tgz) = cb8f9e962510030f8e1500dcd21a556b73144c445bc12ece3915df201fa5e8849c183546c7ce700e06d1c734c0fdf36e31046ac984e232b64f9b019b54e1ddd2
-Size (mbuffer-20241007.tgz) = 152029 bytes
-SHA1 (patch-Makefile.in) = 0aea9d6e1bc836f671846bf29d006c56f14d3514
+BLAKE2s (mbuffer-20250429.tgz) = 83738390c5f7339269c631f0ae557197b145bea1e28d54666f7967743d9fd3a8
+SHA512 (mbuffer-20250429.tgz) = 9cbf233335b8f7fe4d607f93afdb1797293377f580def420a3b2285b1e777ef33fff7fd7ebbe67fd35dca48127e887de9f833c2d019075f51fcef2e479a8ff00
+Size (mbuffer-20250429.tgz) = 152402 bytes
+SHA1 (patch-Makefile.in) = d1da7397021ba38a6a71202b1083ef6e6957978f
 SHA1 (patch-configure) = e3f9fe62c308369f89511dc31f781a92fd7b4405
 SHA1 (patch-idev.c) = dbc5f3764933b42cb194d6d0c148f27682bcfba3
-SHA1 (patch-mbuffer.c) = a614b756ff7e7ed88a20335d8f36f7f16afae5c4
 SHA1 (patch-mbuffer.rc) = f6639110e0a30f62a8a61e725a5403c88703d671

Index: pkgsrc/misc/mbuffer/patches/patch-Makefile.in
diff -u pkgsrc/misc/mbuffer/patches/patch-Makefile.in:1.3 pkgsrc/misc/mbuffer/patches/patch-Makefile.in:1.4
--- pkgsrc/misc/mbuffer/patches/patch-Makefile.in:1.3   Mon Oct  1 09:29:00 2018
+++ pkgsrc/misc/mbuffer/patches/patch-Makefile.in       Wed Apr 30 13:10:04 2025
@@ -1,18 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.3 2018/10/01 09:29:00 jperkin Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2025/04/30 13:10:04 hauke Exp $
 
 Fix install permissions.
-Pass sysconfdir.
 
---- Makefile.in.orig   2018-06-25 20:37:20.000000000 +0000
+--- Makefile.in.orig   2025-04-29 23:11:07.000000000 +0000
 +++ Makefile.in
-@@ -1,5 +1,5 @@
- CC            = @CC@
--DEFS          = @DEFS@ -DPREFIX=\"${prefix}\"
-+DEFS          = @DEFS@ -DSYSCONFDIR=\"${etcdir}\"
- CFLAGS                = @CFLAGS@ $(DEFS) -I@srcdir@ -I.
- LDFLAGS               = @LDFLAGS@
- LIBS          = @LIBS@
-@@ -47,14 +47,14 @@ distclean: clean
+@@ -81,14 +81,14 @@ distclean: clean
        config.status Makefile mbuffer.1 core
  
  $(DESTDIR)$(etcdir)/mbuffer.rc:
@@ -33,7 +25,7 @@ Pass sysconfdir.
  
  lint:
        lint $(DEFS) $(SOURCES)
-@@ -157,7 +157,7 @@ test7: mbuffer
+@@ -191,10 +191,10 @@ test7: mbuffer
        ./mbuffer -P90 --md5 -i INSTALL -o /dev/null
  
  tapetest.so: tapetest.c config.h
@@ -43,3 +35,6 @@ Pass sysconfdir.
  idev.so: idev.c config.h
 -      $(CC) $(CFLAGS) -shared -g -fPIC idev.c -o $@ $(LIBS)
 +      $(CC) $(LDFLAGS) $(CFLAGS) -shared -g -fPIC idev.c -o $@ $(LIBS)
+ 
+ $(DEPS): | build
+