From nobody Mon May 23 11:40:16 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AD44A1B4A3DE; Mon, 23 May 2022 11:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L6FkS4Sf2z3kXk; Mon, 23 May 2022 11:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653306016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MHwT8/YPlr9eEKA3AGqJx5ZcGN/tR14agElYsQBycu0=; b=RU40UZpn8WLseWPY9Wk/Aq/1i2n0psoKCct1nFzjPC3GxtsAkijHYfnG1mnX7lCMPoLQlm LkVFkL1YwB8mDPne1C5VaLZkd7+bD+EUUEFoQCenekORTYdbyVl5zXmhgcAS8w01qqXppw YC+cRqdZU61/o2XA4FVP5KJeOlvRewao6/2unn+yuXw7ryXGBPmz2oqNn5nfP/zXv+KDL0 9XE6RvpAAV9iWJq3YIo2BCwPGtrfvtt/cy3VPf++Iw+sBWfROPXOrxa7KuRETwbv/nDOmY J+z05hr0QdBQYRe5wzYXcIbFoE5UwyipZO4A2gAIS0UWA+GdEhLOTFK/VVYGkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7992B7381; Mon, 23 May 2022 11:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24NBeGta038647; Mon, 23 May 2022 11:40:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NBeGL9038640; Mon, 23 May 2022 11:40:16 GMT (envelope-from git) Date: Mon, 23 May 2022 11:40:16 GMT Message-Id: <202205231140.24NBeGL9038640@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 408e5f1945c9 - main - devel/argp-standalone: Update to 1.5.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 408e5f1945c97df224e6245564a950ec93990a47 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653306016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MHwT8/YPlr9eEKA3AGqJx5ZcGN/tR14agElYsQBycu0=; b=GdW3dvOkl12MdWy8OyYmYcu3UrHPYMAAn3uns/bA7wbRhw0nIELgS9wnPgQIGC67OBt6CQ CpubCEkOAOdcYlC3cJ/dbLuF/fIW7kK/nl/TXy+KfoF8ZXrriGhULuD+cVKj454Qmk8jFc RroCPEtW8HOE8NpkV5H5xxRYtSqQsYj1zWDMky3ZUj1TY+3oEUSq3trYwoxrqqcgG+y3di illrT82umkLfp9jje+J6C1oDP/Da6AVbmJpij9J4XEZWXbOTJSaRKd7y5FSlnu/X9LSdjo N3jxCVzD5xw8isINr0EnVJfxkAvLANLHGuBy45jlE6+sGuy6q+iujjlHeZ1vGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653306016; a=rsa-sha256; cv=none; b=XCdGgdVNuWhbnfHgMSVksvoGgtz4KjJOXVowp/s3MqYb3KHMXJJ+3KQDku5RTQ2vPcmGVo iCEpCRnAGKpgi3B4kvzrpvNTszCRJRtCImgJZHQnX7WNwZT26EK/V6QGZRldIxLqKGCxQf 1S0XNR9fMF+b4QWnTp4uKbI2JA+InkSvm3z4xTeWWkX/hOKcOk3zL4Hz+OxKCbWYwD7trA sUt68/awbDgLwhlaFq10TaMEN+QL9fHLKv3t2mpobRRHaVT8+PqzfMo6THTeL5VR08BNNp BCbbkL1qbXSAoTlMokY8fWzS+WBqXAJ1iC+wsh2CPfQ7FGN+IUMMV6pMVNzaFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=408e5f1945c97df224e6245564a950ec93990a47 commit 408e5f1945c97df224e6245564a950ec93990a47 Author: Daniel Engberg AuthorDate: 2022-05-23 11:21:26 +0000 Commit: Daniel Engberg CommitDate: 2022-05-23 11:37:45 +0000 devel/argp-standalone: Update to 1.5.0 Switch to active fork of argp-standalone which brings it up to date with glibc 2.33, some compatibility fixes on top and switches to using Meson PR: 263784 --- devel/argp-standalone/Makefile | 18 +++++++------- devel/argp-standalone/distinfo | 7 ++++-- devel/argp-standalone/files/patch-Makefile.am | 28 ---------------------- devel/argp-standalone/files/patch-acinclude.m4 | 20 ---------------- devel/argp-standalone/files/patch-argp-help.c | 14 ----------- devel/argp-standalone/files/patch-configure.ac | 10 -------- .../files/patch-testsuite_Makefile.am | 11 --------- 7 files changed, 13 insertions(+), 95 deletions(-) diff --git a/devel/argp-standalone/Makefile b/devel/argp-standalone/Makefile index dbb1134ed72f..60756ab91601 100644 --- a/devel/argp-standalone/Makefile +++ b/devel/argp-standalone/Makefile @@ -1,11 +1,11 @@ # Created by: Sergey Matveychuk PORTNAME= argp-standalone -PORTVERSION= 1.3 -PORTREVISION= 4 +DISTVERSION= 1.5.0 CATEGORIES= devel -MASTER_SITES= http://www.lysator.liu.se/~nisse/misc/ \ - LOCAL/sem + +PATCH_SITES= https://github.com/argp-standalone/argp-standalone/commit/ +PATCHFILES= e4b42480f6fd63a117e1d8a3d90fb69434133c28.patch:-p1 MAINTAINER= ports@FreeBSD.org COMMENT= Standalone version of arguments parsing functions from GLIBC @@ -13,17 +13,15 @@ COMMENT= Standalone version of arguments parsing functions from GLIBC LICENSE= LGPL20+ PD LICENSE_COMB= multi -USES= autoreconf libtool +USES= gettext-runtime localbase:ldflags meson USE_CSTD= gnu89 -GNU_CONFIGURE= yes +USE_GITHUB= yes USE_LDCONFIG= yes -INSTALL_TARGET= install-strip + +MESON_ARGS= -Ddefault_library=both PLIST_FILES= lib/libargp.a \ lib/libargp.so lib/libargp.so.0 lib/libargp.so.0.0.0 \ include/argp.h -post-install: - ${INSTALL_DATA} ${WRKSRC}/argp.h ${STAGEDIR}${PREFIX}/include - .include diff --git a/devel/argp-standalone/distinfo b/devel/argp-standalone/distinfo index 617e61fbd8dd..6080e59a54d1 100644 --- a/devel/argp-standalone/distinfo +++ b/devel/argp-standalone/distinfo @@ -1,2 +1,5 @@ -SHA256 (argp-standalone-1.3.tar.gz) = dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be -SIZE (argp-standalone-1.3.tar.gz) = 130255 +TIMESTAMP = 1652259717 +SHA256 (argp-standalone-argp-standalone-1.5.0_GH0.tar.gz) = c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6 +SIZE (argp-standalone-argp-standalone-1.5.0_GH0.tar.gz) = 65889 +SHA256 (e4b42480f6fd63a117e1d8a3d90fb69434133c28.patch) = 3538a55072f87ff1efe6215569f32b59bdc65b2c149ad4da30ab2dfd625c33c8 +SIZE (e4b42480f6fd63a117e1d8a3d90fb69434133c28.patch) = 1568 diff --git a/devel/argp-standalone/files/patch-Makefile.am b/devel/argp-standalone/files/patch-Makefile.am deleted file mode 100644 index 08a6c6c10fea..000000000000 --- a/devel/argp-standalone/files/patch-Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile.am.orig 2004-02-23 17:57:28 UTC -+++ Makefile.am -@@ -21,20 +21,20 @@ - AUTOMAKE_OPTIONS = foreign - SUBDIRS = . testsuite - --LIBOBJS = @LIBOBJS@ -+LTLIBOBJS = @LTLIBOBJS@ - --noinst_LIBRARIES = libargp.a -+lib_LTLIBRARIES = libargp.la - noinst_PROGRAMS = argp-test - noinst_HEADERS = argp.h argp-fmtstream.h argp-namefrob.h # argp-comp.h - - EXTRA_DIST = mempcpy.c strchrnul.c strndup.c Versions - - # Leaves out argp-fs-xinl.c and argp-xinl.c --libargp_a_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \ -+libargp_la_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \ - argp-help.c argp-parse.c argp-pv.c \ - argp-pvh.c - --libargp_a_LIBADD = $(LIBOBJS) -+libargp_la_LIBADD = $(LTLIBOBJS) - --argp_test_LDADD = libargp.a -+argp_test_LDADD = libargp.la - diff --git a/devel/argp-standalone/files/patch-acinclude.m4 b/devel/argp-standalone/files/patch-acinclude.m4 deleted file mode 100644 index bee3da7d2ae5..000000000000 --- a/devel/argp-standalone/files/patch-acinclude.m4 +++ /dev/null @@ -1,20 +0,0 @@ ---- acinclude.m4.orig 2004-02-07 17:15:46 UTC -+++ acinclude.m4 -@@ -284,8 +284,6 @@ AC_DEFUN([LSH_GCC_ATTRIBUTES], - lsh_cv_c_attribute, - [ AC_TRY_COMPILE([ - #include --], --[ - static void foo(void) __attribute__ ((noreturn)); - - static void __attribute__ ((noreturn)) -@@ -293,6 +291,8 @@ foo(void) - { - exit(1); - } -+], -+[ - ], - lsh_cv_c_attribute=yes, - lsh_cv_c_attribute=no)]) diff --git a/devel/argp-standalone/files/patch-argp-help.c b/devel/argp-standalone/files/patch-argp-help.c deleted file mode 100644 index 4074bef9f85b..000000000000 --- a/devel/argp-standalone/files/patch-argp-help.c +++ /dev/null @@ -1,14 +0,0 @@ ---- argp-help.c.orig 2020-04-09 17:39:48 UTC -+++ argp-help.c -@@ -1704,7 +1704,10 @@ Try `%s --help' or `%s --usage' for more information.\ - void __argp_help (const struct argp *argp, FILE *stream, - unsigned flags, char *name) - { -- _help (argp, 0, stream, flags, name); -+ struct argp_state state = { -+ .root_argp = argp, -+ }; -+ _help (argp, &state, stream, flags, name); - } - #ifdef weak_alias - weak_alias (__argp_help, argp_help) diff --git a/devel/argp-standalone/files/patch-configure.ac b/devel/argp-standalone/files/patch-configure.ac deleted file mode 100644 index 7ddac4df6773..000000000000 --- a/devel/argp-standalone/files/patch-configure.ac +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2004-02-23 17:57:29 UTC -+++ configure.ac -@@ -17,6 +17,7 @@ AC_PROG_CC - AC_PROG_MAKE_SET - AC_PROG_RANLIB - AM_PROG_CC_STDC -+AC_PROG_LIBTOOL - - if test "x$am_cv_prog_cc_stdc" = xno ; then - AC_ERROR([the C compiler doesn't handle ANSI-C]) diff --git a/devel/argp-standalone/files/patch-testsuite_Makefile.am b/devel/argp-standalone/files/patch-testsuite_Makefile.am deleted file mode 100644 index c927bd57792d..000000000000 --- a/devel/argp-standalone/files/patch-testsuite_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- testsuite/Makefile.am.orig 2003-02-04 19:38:52 UTC -+++ testsuite/Makefile.am -@@ -5,7 +5,7 @@ TS_ALL = $(TS_PROGS) $(TS_SH) - - noinst_PROGRAMS = $(TS_PROGS) ex1 ex3 ex4 - --LDADD = ../libargp.a -+LDADD = ../.libs/libargp.a - - EXTRA_DIST = $(TS_SH) run-tests - CLEANFILES = test.out