CVS commit: pkgsrc/devel/argp

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Aug  6 18:55:26 UTC 2024

Modified Files:
        pkgsrc/devel/argp: Makefile builtin.mk distinfo
        pkgsrc/devel/argp/patches: patch-argp-fmtstream.h

Log Message:
devel/argp: Pacify pkglint.

Patch comment taken from joerg's 2012 commit message.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/argp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/argp/builtin.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/argp/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/argp/patches/patch-argp-fmtstream.h

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.9 pkgsrc/devel/argp/Makefile:1.10
--- pkgsrc/devel/argp/Makefile:1.9      Tue Aug  6 18:50:08 2024
+++ pkgsrc/devel/argp/Makefile  Tue Aug  6 18:55:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/08/06 18:50:08 riastradh Exp $
+# $NetBSD: Makefile,v 1.10 2024/08/06 18:55:26 riastradh Exp $
 
 DISTNAME=      argp-standalone-1.3
 PKGNAME=       argp-1.3
@@ -13,7 +13,7 @@ LICENSE=      gnu-lgpl-v2
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
-USE_LANGUAGES= c99
+FORCE_C_STD=   c99
 
 INSTALLATION_DIRS=     include lib
 

Index: pkgsrc/devel/argp/builtin.mk
diff -u pkgsrc/devel/argp/builtin.mk:1.3 pkgsrc/devel/argp/builtin.mk:1.4
--- pkgsrc/devel/argp/builtin.mk:1.3    Sun Nov  3 10:39:05 2019
+++ pkgsrc/devel/argp/builtin.mk        Tue Aug  6 18:55:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2019/11/03 10:39:05 rillig Exp $
+# $NetBSD: builtin.mk,v 1.4 2024/08/06 18:55:26 riastradh Exp $
 
 BUILTIN_PKG:=  argp
 
@@ -24,7 +24,7 @@ MAKEVARS+=            IS_BUILTIN.argp
 ### a package name to represent the built-in package.
 ###
 .if !defined(BUILTIN_PKG.argp) && \
-    !empty(IS_BUILTIN.argp:M[yY][eE][sS]) && \
+    ${IS_BUILTIN.argp:tl} == "yes" && \
     empty(H_ARGP:M__nonexistent__)
 
 ###
@@ -36,8 +36,7 @@ MAKEVARS+=            IS_BUILTIN.argp
 USE_BUILTIN.argp=      no
 .    else
 USE_BUILTIN.argp=      ${IS_BUILTIN.argp}
-.      if defined(BUILTIN_PKG.argp) && \
-        !empty(IS_BUILTIN.argp:M[yY][eE][sS])
+.      if defined(BUILTIN_PKG.argp) && ${IS_BUILTIN.argp:tl} == "yes"
 USE_BUILTIN.argp=      yes
 .      endif
 .    endif  # PREFER.argp

Index: pkgsrc/devel/argp/distinfo
diff -u pkgsrc/devel/argp/distinfo:1.12 pkgsrc/devel/argp/distinfo:1.13
--- pkgsrc/devel/argp/distinfo:1.12     Tue Aug  6 18:50:08 2024
+++ pkgsrc/devel/argp/distinfo  Tue Aug  6 18:55:26 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2024/08/06 18:50:08 riastradh Exp $
+$NetBSD: distinfo,v 1.13 2024/08/06 18:55:26 riastradh Exp $
 
 BLAKE2s (argp-standalone-1.3.tar.gz) = aadc55df51b443d36f081b06a48d864aba802b8239e132f5d88b18cc1fedcca2
 SHA512 (argp-standalone-1.3.tar.gz) = 58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9
@@ -6,7 +6,7 @@ Size (argp-standalone-1.3.tar.gz) = 1302
 SHA1 (patch-aa) = f6053a22f3267392d6dbd312faf3b6b140d27e7a
 SHA1 (patch-ab) = dfec66b81dfb21e019652fcbffeefa3ee88c4109
 SHA1 (patch-argp-fmtstream.c) = c89a906b168aec0145b3a7e5a4a9282a92b95a7e
-SHA1 (patch-argp-fmtstream.h) = c0b740fc31d51d0295d6bd01a9ed1a84ff2b5205
+SHA1 (patch-argp-fmtstream.h) = 40eccbdd0ffefff97627c3fdae8a2350dc7e0b7a
 SHA1 (patch-argp-help.c) = ff149f870c7ff228609f0efbea52fa5f1c708227
 SHA1 (patch-argp-parse.c) = 0e6e61ec639dc9afb6863709038ec27bd6cda527
 SHA1 (patch-argp.h) = 82e8035a12779c392f291838fd956101433f2ff9

Index: pkgsrc/devel/argp/patches/patch-argp-fmtstream.h
diff -u pkgsrc/devel/argp/patches/patch-argp-fmtstream.h:1.2 pkgsrc/devel/argp/patches/patch-argp-fmtstream.h:1.3
--- pkgsrc/devel/argp/patches/patch-argp-fmtstream.h:1.2        Wed Aug 29 18:08:08 2018
+++ pkgsrc/devel/argp/patches/patch-argp-fmtstream.h    Tue Aug  6 18:55:26 2024
@@ -1,4 +1,6 @@
-$NetBSD: patch-argp-fmtstream.h,v 1.2 2018/08/29 18:08:08 kamil Exp $
+$NetBSD: patch-argp-fmtstream.h,v 1.3 2024/08/06 18:55:26 riastradh Exp $
+
+Fix build with c99 compilers
 
 --- argp-fmtstream.h.orig      2003-12-11 08:37:05.000000000 +0000
 +++ argp-fmtstream.h