CVS commit: pkgsrc/misc/mbuffer

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Jun 12 10:59:31 UTC 2025

Modified Files:
        pkgsrc/misc/mbuffer: Makefile distinfo
        pkgsrc/misc/mbuffer/patches: patch-configure
Added Files:
        pkgsrc/misc/mbuffer/patches: patch-mkversion.sh

Log Message:
Remove bashisms and needless bash dependency

Remove needless gsed dependency

Declare gnutar dependency, used in test scripts

Should fix bulk builds


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/misc/mbuffer/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/mbuffer/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/mbuffer/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/mbuffer/patches/patch-mkversion.sh

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.11 pkgsrc/misc/mbuffer/Makefile:1.12
--- pkgsrc/misc/mbuffer/Makefile:1.11   Wed Apr 30 13:10:04 2025
+++ pkgsrc/misc/mbuffer/Makefile        Thu Jun 12 10:59:31 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2025/04/30 13:10:04 hauke Exp $
+# $NetBSD: Makefile,v 1.12 2025/06/12 10:59:31 hauke Exp $
 
 DISTNAME=      mbuffer-20250429
+PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  http://www.maier-komor.de/software/mbuffer/
 EXTRACT_SUFX=  .tgz
@@ -11,12 +12,15 @@ COMMENT=    Tool for buffering data streams
 LICENSE=       gnu-gpl-v3
 
 USE_LANGUAGES=         c
-USE_CC_FEATURES=       c99
-USE_TOOLS+=            gmake
+USE_CC_FEATURES=       c11
+USE_TOOLS+=            gmake gtar
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
+REPLACE_SH+=           mkversion.sh
+REPLACE_SH+=           tests/test?.sh
+
 SUBST_CLASSES+=                etc
 SUBST_STAGE.etc=       pre-configure
 SUBST_FILES.etc=       mbuffer.rc

Index: pkgsrc/misc/mbuffer/distinfo
diff -u pkgsrc/misc/mbuffer/distinfo:1.10 pkgsrc/misc/mbuffer/distinfo:1.11
--- pkgsrc/misc/mbuffer/distinfo:1.10   Wed Apr 30 13:10:04 2025
+++ pkgsrc/misc/mbuffer/distinfo        Thu Jun 12 10:59:31 2025
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2025/04/30 13:10:04 hauke Exp $
+$NetBSD: distinfo,v 1.11 2025/06/12 10:59:31 hauke Exp $
 
 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-configure) = 5f6a261fa49d7b2ebff9adfdc6e088fe3d75a3f6
 SHA1 (patch-idev.c) = dbc5f3764933b42cb194d6d0c148f27682bcfba3
 SHA1 (patch-mbuffer.rc) = f6639110e0a30f62a8a61e725a5403c88703d671
+SHA1 (patch-mkversion.sh) = 9be57b7bff3cf27dc533bbf0f0b2f6beb14b2ed8

Index: pkgsrc/misc/mbuffer/patches/patch-configure
diff -u pkgsrc/misc/mbuffer/patches/patch-configure:1.2 pkgsrc/misc/mbuffer/patches/patch-configure:1.3
--- pkgsrc/misc/mbuffer/patches/patch-configure:1.2     Fri Jun  5 11:36:40 2015
+++ pkgsrc/misc/mbuffer/patches/patch-configure Thu Jun 12 10:59:31 2025
@@ -1,10 +1,23 @@
-$NetBSD: patch-configure,v 1.2 2015/06/05 11:36:40 wiedi Exp $
+$NetBSD: patch-configure,v 1.3 2025/06/12 10:59:31 hauke Exp $
 
 Portability fix.
 
---- configure.orig     2015-04-12 20:03:59.000000000 +0000
+Choose plain sh over bash.
+
+--- configure.orig     2025-04-29 23:11:07.000000000 +0000
 +++ configure
-@@ -3839,7 +3839,7 @@ fi
+@@ -3893,8 +3893,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-# Extract the first word of "gtar tar", so it can be a program name with args.
+-set dummy gtar tar; ac_word=$2
++# Extract the first word of "tar gtar", so it can be a program name with args.
++set dummy tar gtar; ac_word=$2
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ printf %s "checking for $ac_word... " >&6; }
+ if test ${ac_cv_path_TAR+y}
+@@ -4065,7 +4065,7 @@ rm -f core conftest.err conftest.$ac_obj
        else
                SUNCCVERSION=`${CC} -V 2>&1 | grep Sun`
                SUNCC=$?
@@ -13,3 +26,14 @@ Portability fix.
                        CFLAGS="${CFLAGS} -O"
                        cflags_tmp="$CFLAGS"
                        HAS_M64=`${CC} -flags | grep m64`
+@@ -4258,8 +4258,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-# Extract the first word of "bash sh", so it can be a program name with args.
+-set dummy bash sh; ac_word=$2
++# Extract the first word of "sh bash", so it can be a program name with args.
++set dummy sh bash; ac_word=$2
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ printf %s "checking for $ac_word... " >&6; }
+ if test ${ac_cv_path_SH+y}

Added files:

Index: pkgsrc/misc/mbuffer/patches/patch-mkversion.sh
diff -u /dev/null pkgsrc/misc/mbuffer/patches/patch-mkversion.sh:1.1
--- /dev/null   Thu Jun 12 10:59:31 2025
+++ pkgsrc/misc/mbuffer/patches/patch-mkversion.sh      Thu Jun 12 10:59:31 2025
@@ -0,0 +1,38 @@
+$NetBSD: patch-mkversion.sh,v 1.1 2025/06/12 10:59:31 hauke Exp $
+
+Portability fix.
+
+Choose plain sed over gsed.
+
+--- mkversion.sh.orig  2025-04-29 23:11:07.000000000 +0000
++++ mkversion.sh
+@@ -21,10 +21,7 @@
+ 
+ VERSION_H=${1:-version.h}
+ NEWFILE=`mktemp -t version.h.XXXXXXXXXX`
+-SED=`command -v gsed 2> /dev/null`
+-if [ $? != 0 ]; then
+-      SED=`command -v sed`
+-fi
++SED=`command -v sed 2> /dev/null`
+ 
+ vinfo=0
+ if [ -f .hg_archival.txt ]; then
+@@ -52,7 +49,7 @@ if [ -f .hg_archival.txt ]; then
+       fi
+ elif [ -d .hg ]; then
+       HG=${HG:-`command -v hg`}
+-      if [ "$?" == "0" ]; then
++      if [ "$?" = "0" ]; then
+               # Check if we have modified, removed, added or deleted files.
+               if [ `$HG st -mard | wc -l` != "0" ]; then
+                       # add delta indicator
+@@ -62,7 +59,7 @@ elif [ -d .hg ]; then
+               fi
+               # Gather version information from repository and sandbox.
+               VER=`$HG id -T"{latesttag}{if(latesttagdistance,'.{latesttagdistance}')}" 2>/dev/null`
+-              if [ $? == 0 ]; then
++              if [ $? = 0 ]; then
+                       $HG log -r. -T"`cat version.t`" | $SED "s/\$DELTA/$DELTA/" > $NEWFILE
+               else
+                       echo "warning: your mercurial version is too old"