pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/argp
Module Name: pkgsrc
Committed By: wiz
Date: Tue Jun 23 09:52:25 UTC 2026
Modified Files:
pkgsrc/devel/argp: Makefile PLIST buildlink3.mk distinfo
pkgsrc/devel/argp/patches: patch-argp-fmtstream.c patch-argp-help.c
Removed Files:
pkgsrc/devel/argp/patches: patch-aa patch-ab patch-argp-fmtstream.h
patch-argp-parse.c patch-argp.h patch-config.h.in patch-configure
patch-configure.ac
Log Message:
argp: update to 1.5.0.
2022-05-03 Wolf Vollprecht <w.vollprecht%gmail.com@localhost>
* add meson build system
* add support for Windows / MSVC
* Bump version to 1.5.0
2021-02-16 Érico Nogueira <ericonr%disroot.org@localhost>
* configure.ac: Check for <libintl.h> header.
* argp-help.c: Add dgettext_safe wrapper.
* configure.ac: Bumped version to 1.4.1.
2021-02-10 Érico Nogueira <ericonr%disroot.org@localhost>
* configure.ac: Bumped version to 1.4.0.
2021-02-10 Érico Nogueira <ericonr%disroot.org@localhost>
* Updated argp to glibc 2.33.
* README.md: create file.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/argp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/argp/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/argp/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/argp/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/argp/patches/patch-aa \
pkgsrc/devel/argp/patches/patch-argp-fmtstream.h
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/argp/patches/patch-ab \
pkgsrc/devel/argp/patches/patch-argp-parse.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/argp/patches/patch-argp-fmtstream.c \
pkgsrc/devel/argp/patches/patch-argp-help.c
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/argp/patches/patch-argp.h \
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.11 pkgsrc/devel/argp/Makefile:1.12
--- pkgsrc/devel/argp/Makefile:1.11 Tue Oct 15 01:13:00 2024
+++ pkgsrc/devel/argp/Makefile Tue Jun 23 09:52:25 2026
@@ -1,24 +1,17 @@
-# $NetBSD: Makefile,v 1.11 2024/10/15 01:13:00 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2026/06/23 09:52:25 wiz Exp $
-DISTNAME= argp-standalone-1.3
-PKGNAME= argp-1.3
-PKGREVISION= 3
+DISTNAME= argp-standalone-1.5.0
+PKGNAME= ${DISTNAME:S/-standalone//}
CATEGORIES= devel
-MASTER_SITES= http://www.lysator.liu.se/~nisse/misc/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=argp-standalone/}
+GITHUB_PROJECT= argp-standalone
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.gnu.org/software/libc/manual/html_node/Argp.html
+HOMEPAGE= https://github.com/argp-standalone/argp-standalone
COMMENT= Argument parsing function from glibc
-LICENSE= gnu-lgpl-v2
+LICENSE= gnu-lgpl-v2.1
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
FORCE_C_STD= gnu99
-INSTALLATION_DIRS= include lib
-
-do-install:
- libtool --mode=install ${INSTALL_LIB} ${WRKSRC}/libargp.la ${DESTDIR}${PREFIX}/lib/
- ${INSTALL_DATA} ${WRKSRC}/argp.h ${DESTDIR}${PREFIX}/include/
-
+.include "../../devel/meson/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/argp/PLIST
diff -u pkgsrc/devel/argp/PLIST:1.2 pkgsrc/devel/argp/PLIST:1.3
--- pkgsrc/devel/argp/PLIST:1.2 Sat Dec 22 01:40:21 2007
+++ pkgsrc/devel/argp/PLIST Tue Jun 23 09:52:25 2026
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2007/12/22 01:40:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/06/23 09:52:25 wiz Exp $
include/argp.h
-lib/libargp.la
+lib/libargp.a
Index: pkgsrc/devel/argp/buildlink3.mk
diff -u pkgsrc/devel/argp/buildlink3.mk:1.3 pkgsrc/devel/argp/buildlink3.mk:1.4
--- pkgsrc/devel/argp/buildlink3.mk:1.3 Fri Nov 27 17:43:38 2015
+++ pkgsrc/devel/argp/buildlink3.mk Tue Jun 23 09:52:25 2026
@@ -1,12 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/11/27 17:43:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2026/06/23 09:52:25 wiz Exp $
BUILDLINK_TREE+= argp
.if !defined(ARGP_BUILDLINK3_MK)
ARGP_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.argp+= argp>=1.3
+BUILDLINK_DEPMETHOD.argp?= build
+
+BUILDLINK_API_DEPENDS.argp+= argp>=1.5.0
BUILDLINK_PKGSRCDIR.argp?= ../../devel/argp
-.endif # ARGP_BUILDLINK3_MK
+.endif # ARGP_BUILDLINK3_MK
BUILDLINK_TREE+= -argp
Index: pkgsrc/devel/argp/distinfo
diff -u pkgsrc/devel/argp/distinfo:1.14 pkgsrc/devel/argp/distinfo:1.15
--- pkgsrc/devel/argp/distinfo:1.14 Wed Sep 4 11:52:38 2024
+++ pkgsrc/devel/argp/distinfo Tue Jun 23 09:52:25 2026
@@ -1,15 +1,7 @@
-$NetBSD: distinfo,v 1.14 2024/09/04 11:52:38 jperkin Exp $
+$NetBSD: distinfo,v 1.15 2026/06/23 09:52:25 wiz Exp $
-BLAKE2s (argp-standalone-1.3.tar.gz) = aadc55df51b443d36f081b06a48d864aba802b8239e132f5d88b18cc1fedcca2
-SHA512 (argp-standalone-1.3.tar.gz) = 58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9
-Size (argp-standalone-1.3.tar.gz) = 130255 bytes
-SHA1 (patch-aa) = f6053a22f3267392d6dbd312faf3b6b140d27e7a
-SHA1 (patch-ab) = dfec66b81dfb21e019652fcbffeefa3ee88c4109
-SHA1 (patch-argp-fmtstream.c) = c89a906b168aec0145b3a7e5a4a9282a92b95a7e
-SHA1 (patch-argp-fmtstream.h) = 40eccbdd0ffefff97627c3fdae8a2350dc7e0b7a
-SHA1 (patch-argp-help.c) = 685ced4c7d8d241e2188ed5d25b9447a51a84adb
-SHA1 (patch-argp-parse.c) = da5dee860fa5170dccf708ed433dabab31bf6e98
-SHA1 (patch-argp.h) = 82e8035a12779c392f291838fd956101433f2ff9
-SHA1 (patch-config.h.in) = ef232aaa336af237e233ef31df6742ee8ad4e2dd
-SHA1 (patch-configure) = d4ecf3825b661c94681f66e3b6a4bb268d157bee
-SHA1 (patch-configure.ac) = 8c09ba0268278cd455fe3c7fbcf2df4699957d29
+BLAKE2s (argp-standalone-1.5.0.tar.gz) = fa9a4f7195c8669d84bf754b6ee73c299c70b2d90c77fffc24380606f4da0bd1
+SHA512 (argp-standalone-1.5.0.tar.gz) = fa2eb61ea00f7a13385e5c1e579dd88471d6ba3a13b6353e924fe71914b90b40688b42a9f1789bc246e03417fee1788b1990753cda8c8d4a544e85f26b63f9e2
+Size (argp-standalone-1.5.0.tar.gz) = 65889 bytes
+SHA1 (patch-argp-fmtstream.c) = 9d4d213bdc733c708c13d5c4446a7c15ed668fdd
+SHA1 (patch-argp-help.c) = 16054c949616dbae1a06b64c53b0778c51433f81
Index: pkgsrc/devel/argp/patches/patch-argp-fmtstream.c
diff -u pkgsrc/devel/argp/patches/patch-argp-fmtstream.c:1.2 pkgsrc/devel/argp/patches/patch-argp-fmtstream.c:1.3
--- pkgsrc/devel/argp/patches/patch-argp-fmtstream.c:1.2 Tue Aug 6 18:49:16 2024
+++ pkgsrc/devel/argp/patches/patch-argp-fmtstream.c Tue Jun 23 09:52:25 2026
@@ -1,57 +1,42 @@
-$NetBSD: patch-argp-fmtstream.c,v 1.2 2024/08/06 18:49:16 riastradh Exp $
+$NetBSD: patch-argp-fmtstream.c,v 1.3 2026/06/23 09:52:25 wiz Exp $
-Avoid ctype(3) abuse.
+Fix ctype(3) usage.
---- argp-fmtstream.c.orig 2003-12-11 08:37:05.000000000 +0000
+--- argp-fmtstream.c.orig 2022-05-03 07:41:05.000000000 +0000
+++ argp-fmtstream.c
-@@ -206,7 +206,7 @@ __argp_fmtstream_update (argp_fmtstream_
- int i;
+@@ -225,7 +225,7 @@ __argp_fmtstream_update(argp_fmtstream_t fs)
+ int i;
- p = buf + (r + 1 - fs->point_col);
-- while (p >= buf && !isblank (*p))
-+ while (p >= buf && !isblank ((unsigned char) *p))
- --p;
- nextline = p + 1; /* This will begin the next line. */
+ p = buf + (r + 1 - fs->point_col);
+- while (p >= buf && !isblank(*p))
++ while (p >= buf && !isblank((unsigned char)*p))
+ --p;
+ nextline = p + 1; /* This will begin the next line. */
-@@ -216,7 +216,7 @@ __argp_fmtstream_update (argp_fmtstream_
- if (p >= buf)
- do
- --p;
-- while (p >= buf && isblank (*p));
-+ while (p >= buf && isblank ((unsigned char) *p));
- nl = p + 1; /* The newline will replace the first blank. */
- }
- else
-@@ -227,7 +227,7 @@ __argp_fmtstream_update (argp_fmtstream_
- /* Find the end of the long word. */
- do
- ++p;
-- while (p < nl && !isblank (*p));
-+ while (p < nl && !isblank ((unsigned char) *p));
- if (p == nl)
- {
- /* It already ends a line. No fussing required. */
-@@ -240,7 +240,7 @@ __argp_fmtstream_update (argp_fmtstream_
- /* Swallow separating blanks. */
- do
- ++p;
-- while (isblank (*p));
-+ while (isblank ((unsigned char) *p));
- /* The next line will start here. */
- nextline = p;
- }
-@@ -389,6 +389,7 @@ __argp_fmtstream_printf (struct argp_fmt
- weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf)
- #endif
-
-+#if __STDC_VERSION__ - 199900L < 1
- /* Duplicate the inline definitions in argp-fmtstream.h, for compilers
- * that don't do inlining. */
- size_t
-@@ -471,5 +472,6 @@ __argp_fmtstream_point (argp_fmtstream_t
- __argp_fmtstream_update (__fs);
- return __fs->point_col >= 0 ? __fs->point_col : 0;
- }
-+#endif
-
- #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */
+@@ -235,7 +235,7 @@ __argp_fmtstream_update(argp_fmtstream_t fs)
+ if (p >= buf)
+ do
+ --p;
+- while (p >= buf && isblank(*p));
++ while (p >= buf && isblank((unsigned char)*p));
+ nl = p + 1; /* The newline will replace the first blank. */
+ }
+ else
+@@ -246,7 +246,7 @@ __argp_fmtstream_update(argp_fmtstream_t fs)
+ /* Find the end of the long word. */
+ do
+ ++p;
+- while (p < nl && !isblank(*p));
++ while (p < nl && !isblank((unsigned char)*p));
+ if (p == nl)
+ {
+ /* It already ends a line. No fussing required. */
+@@ -259,7 +259,7 @@ __argp_fmtstream_update(argp_fmtstream_t fs)
+ /* Swallow separating blanks. */
+ do
+ ++p;
+- while (isblank(*p));
++ while (isblank((unsigned char)*p));
+ /* The next line will start here. */
+ nextline = p;
+ }
Index: pkgsrc/devel/argp/patches/patch-argp-help.c
diff -u pkgsrc/devel/argp/patches/patch-argp-help.c:1.2 pkgsrc/devel/argp/patches/patch-argp-help.c:1.3
--- pkgsrc/devel/argp/patches/patch-argp-help.c:1.2 Wed Sep 4 11:52:38 2024
+++ pkgsrc/devel/argp/patches/patch-argp-help.c Tue Jun 23 09:52:25 2026
@@ -1,27 +1,60 @@
-$NetBSD: patch-argp-help.c,v 1.2 2024/09/04 11:52:38 jperkin Exp $
+$NetBSD: patch-argp-help.c,v 1.3 2026/06/23 09:52:25 wiz Exp $
-Use getprogname() as short program name if available.
-SunOS needs alloca.h.
+Fix ctype(3) usage.
---- argp-help.c.orig 2003-12-11 08:37:05.000000000 +0000
+--- argp-help.c.orig 2026-06-23 09:46:08.262497366 +0000
+++ argp-help.c
-@@ -26,6 +26,10 @@
- #include <config.h>
- #endif
+@@ -176,7 +176,7 @@ fill_in_uparams(const struct argp_state* state)
+ #define SKIPWS(p) \
+ do \
+ { \
+- while (isspace(*p)) \
++ while (isspace((unsigned char)*p)) \
+ p++; \
+ } while (0);
-+#ifdef __sun
-+#include <alloca.h>
-+#endif
-+
- /* AIX requires this to be the first thing in the file. */
- #ifndef __GNUC__
- # if HAVE_ALLOCA_H
-@@ -1725,6 +1729,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,
+@@ -186,14 +186,14 @@ fill_in_uparams(const struct argp_state* state)
+ {
+ SKIPWS(var);
+
+- if (isalpha(*var))
++ if (isalpha((unsigned char)*var))
+ {
+ size_t var_len;
+ const struct uparam_name* un;
+ int unspec = 0, val = 0;
+ const char* arg = var;
+
+- while (isalnum(*arg) || *arg == '-' || *arg == '_')
++ while (isalnum((unsigned char)*arg) || *arg == '-' || *arg == '_')
+ arg++;
+ var_len = arg - var;
+
+@@ -218,10 +218,10 @@ fill_in_uparams(const struct argp_state* state)
+ else
+ val = 1;
+ }
+- else if (isdigit(*arg))
++ else if (isdigit((unsigned char)*arg))
+ {
+ val = atoi(arg);
+- while (isdigit(*arg))
++ while (isdigit((unsigned char)*arg))
+ arg++;
+ SKIPWS(arg);
+ }
+@@ -732,12 +732,12 @@ canon_doc_option(const char** name)
+ {
+ int non_opt;
+ /* Skip initial whitespace. */
+- while (isspace(**name))
++ while (isspace((unsigned char)**name))
+ (*name)++;
+ /* Decide whether this looks like an option (leading `-') or not. */
+ non_opt = (**name != '-');
+ /* Skip until part of name used for sorting. */
+- while (**name && !isalnum(**name))
++ while (**name && !isalnum((unsigned char)**name))
+ (*name)++;
+ return non_opt;
+ }
Home |
Main Index |
Thread Index |
Old Index