CVS commit: pkgsrc/devel/argp

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Aug  6 18:50:08 UTC 2024

Modified Files:
        pkgsrc/devel/argp: Makefile distinfo
Added Files:
        pkgsrc/devel/argp/patches: patch-argp-help.c patch-config.h.in
            patch-configure patch-configure.ac

Log Message:
devel/argp: Teach this about getprogname().


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/argp/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/argp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/argp/patches/patch-argp-help.c \
    pkgsrc/devel/argp/patches/patch-config.h.in \
    pkgsrc/devel/argp/patches/patch-configure \
    pkgsrc/devel/argp/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/devel/argp/Makefile
diff -u pkgsrc/devel/argp/Makefile:1.8 pkgsrc/devel/argp/Makefile:1.9
--- pkgsrc/devel/argp/Makefile:1.8      Tue Aug  6 18:49:16 2024
+++ pkgsrc/devel/argp/Makefile  Tue Aug  6 18:50:08 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2024/08/06 18:49:16 riastradh Exp $
+# $NetBSD: Makefile,v 1.9 2024/08/06 18:50:08 riastradh Exp $
 
 DISTNAME=      argp-standalone-1.3
 PKGNAME=       argp-1.3
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  http://www.lysator.liu.se/~nisse/misc/
 

Index: pkgsrc/devel/argp/distinfo
diff -u pkgsrc/devel/argp/distinfo:1.11 pkgsrc/devel/argp/distinfo:1.12
--- pkgsrc/devel/argp/distinfo:1.11     Tue Aug  6 18:49:16 2024
+++ pkgsrc/devel/argp/distinfo  Tue Aug  6 18:50:08 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2024/08/06 18:49:16 riastradh Exp $
+$NetBSD: distinfo,v 1.12 2024/08/06 18:50:08 riastradh Exp $
 
 BLAKE2s (argp-standalone-1.3.tar.gz) = aadc55df51b443d36f081b06a48d864aba802b8239e132f5d88b18cc1fedcca2
 SHA512 (argp-standalone-1.3.tar.gz) = 58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9
@@ -7,5 +7,9 @@ SHA1 (patch-aa) = f6053a22f3267392d6dbd3
 SHA1 (patch-ab) = dfec66b81dfb21e019652fcbffeefa3ee88c4109
 SHA1 (patch-argp-fmtstream.c) = c89a906b168aec0145b3a7e5a4a9282a92b95a7e
 SHA1 (patch-argp-fmtstream.h) = c0b740fc31d51d0295d6bd01a9ed1a84ff2b5205
+SHA1 (patch-argp-help.c) = ff149f870c7ff228609f0efbea52fa5f1c708227
 SHA1 (patch-argp-parse.c) = 0e6e61ec639dc9afb6863709038ec27bd6cda527
 SHA1 (patch-argp.h) = 82e8035a12779c392f291838fd956101433f2ff9
+SHA1 (patch-config.h.in) = ef232aaa336af237e233ef31df6742ee8ad4e2dd
+SHA1 (patch-configure) = d4ecf3825b661c94681f66e3b6a4bb268d157bee
+SHA1 (patch-configure.ac) = 8c09ba0268278cd455fe3c7fbcf2df4699957d29

Added files:

Index: pkgsrc/devel/argp/patches/patch-argp-help.c
diff -u /dev/null pkgsrc/devel/argp/patches/patch-argp-help.c:1.1
--- /dev/null   Tue Aug  6 18:50:08 2024
+++ pkgsrc/devel/argp/patches/patch-argp-help.c Tue Aug  6 18:50:08 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-argp-help.c,v 1.1 2024/08/06 18:50:08 riastradh Exp $
+
+Use getprogname() as short program name if available.
+
+--- argp-help.c.orig   2003-12-11 08:37:05.000000000 +0000
++++ argp-help.c
+@@ -1725,6 +1725,8 @@ __argp_short_program_name(const struct a
+   return program_invocation_short_name;
+ #elif HAVE_DECL_PROGRAM_INVOCATION_NAME
+   return __argp_basename(program_invocation_name);
++#elif HAVE_GETPROGNAME
++  return (char *)(uintptr_t)/*UNCONST*/getprogname();
+ #else /* !HAVE_DECL_PROGRAM_INVOCATION_NAME */
+   /* FIXME: What now? Miles suggests that it is better to use NULL,
+      but currently the value is passed on directly to fputs_unlocked,
Index: pkgsrc/devel/argp/patches/patch-config.h.in
diff -u /dev/null pkgsrc/devel/argp/patches/patch-config.h.in:1.1
--- /dev/null   Tue Aug  6 18:50:08 2024
+++ pkgsrc/devel/argp/patches/patch-config.h.in Tue Aug  6 18:50:08 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-config.h.in,v 1.1 2024/08/06 18:50:08 riastradh Exp $
+
+Use getprogname() as short program name if available.
+
+--- config.h.in.orig   2004-02-23 17:59:01.000000000 +0000
++++ config.h.in
+@@ -38,6 +38,9 @@
+ /* Define to 1 if you have the `fwrite_unlocked' function. */
+ #undef HAVE_FWRITE_UNLOCKED
+ 
++/* Define to 1 if you have the `getprogname' function. */
++#undef HAVE_GETPROGNAME
++
+ /* Define if the compiler understands __attribute__ */
+ #undef HAVE_GCC_ATTRIBUTE
+ 
Index: pkgsrc/devel/argp/patches/patch-configure
diff -u /dev/null pkgsrc/devel/argp/patches/patch-configure:1.1
--- /dev/null   Tue Aug  6 18:50:08 2024
+++ pkgsrc/devel/argp/patches/patch-configure   Tue Aug  6 18:50:08 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2024/08/06 18:50:08 riastradh Exp $
+
+Use getprogname() as short program name if available.
+
+--- configure.orig     2004-02-23 17:58:57.000000000 +0000
++++ configure
+@@ -5706,7 +5706,7 @@ done
+ 
+ 
+ 
+-for ac_func in fputs_unlocked fwrite_unlocked
++for ac_func in fputs_unlocked fwrite_unlocked getprogname
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
Index: pkgsrc/devel/argp/patches/patch-configure.ac
diff -u /dev/null pkgsrc/devel/argp/patches/patch-configure.ac:1.1
--- /dev/null   Tue Aug  6 18:50:08 2024
+++ pkgsrc/devel/argp/patches/patch-configure.ac        Tue Aug  6 18:50:08 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2024/08/06 18:50:08 riastradh Exp $
+
+Use getprogname() as short program name if available.
+
+--- configure.ac.orig  2004-02-23 17:57:29.000000000 +0000
++++ configure.ac
+@@ -69,7 +69,7 @@ AC_DEFUN([ARGP_CHECK_FUNC],
+ ARGP_CHECK_FUNC([#include <stdio.h>], [putc_unlocked('x', stdout)])
+ 
+ AC_CHECK_FUNCS(flockfile)
+-AC_CHECK_FUNCS(fputs_unlocked fwrite_unlocked)
++AC_CHECK_FUNCS(fputs_unlocked fwrite_unlocked getprogname)
+ 
+ # Used only by argp-test.c, so don't use AC_REPLACE_FUNCS.
+ AC_CHECK_FUNCS(strdup asprintf)