From nobody Tue Oct 17 12:44:24 2023 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 4S8tw91bV6z4xTjd; Tue, 17 Oct 2023 12:44:25 +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 4S8tw912tKz4sTl; Tue, 17 Oct 2023 12:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697546665; 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=5/TJULoSZFTrh5IczPdeML9IgllCm7ab9vnOyhzZWV0=; b=i3RAuglMlbItiuR6YtKyQW6qgdzmMvehMJAlgLdMa716xrNplvrBzjdvtEdOMNElqeTFfC 7/Rq8qHv6JVGm39g9Jxu7jAeCeu1exRyg/HxisHf4vi0AJlnX4Zp7n/b9bdnCshRwpe7EJ V6LeJKk0eyxbh7OBGAXY01vqZjsfQpThe/4vPZSgWhMgJCPQCc1LbFOltByTwgg6CvoaYp 6i8PJ3ekRb9j7sFWuhZPXcvESV5/8RgAURBA7t5je+2wfH2LKskczSLriPhRnZTGVEm3Fi fHfbiIchKNCBDymw3EO/kkBWNyZHALvnTWVHOYOFtNPH8uyvCQIbvoGyJ2AwlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697546665; a=rsa-sha256; cv=none; b=H/GKK/unueD/rAZYll6i9N6/pzJi+8Dv/dlzgLOO/OL4fLP5EVBJZabOkKrcZ63RxnHgqZ Gt8Ll30SWci8MZvuoAcbOexK6uVLuouaFDmjxGaXxqrs1fxOVLTlr3s+bSgqXZ/IzmMW4u vBcljnyWTnKszr55VLI3hjAQ/UXMWviDCd5blsQhBJHh8F7BVGd56dHHz6cl3iYD55HJfg W2mKM1cv5toQ+zd6QG5oii9vPjKU8iqihn6uD8yJKuL1c9erHBDEiQKw9e4mL4HIPLt5YD RPj1kWQVeRNbW1d8OJ6aLa/ngopfuNFx5/f10Jhf103NSDAuJgyJtMJdyQMwHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697546665; 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=5/TJULoSZFTrh5IczPdeML9IgllCm7ab9vnOyhzZWV0=; b=k++DI7vP2mznQ9YYn5mhl+tCYxI14JjRw3jwzAJc7GTi+cG9wsUV+lZNh4L88UW38YJ+Re oGOxamxmU1sWGES+poJsux+pF5OejOPZb8/O0EjauyziOxAmR566TmmT/yWr0GaJsXZohW liesGsO4CqkNbW3VXVCDNvlW56V2MQxTQn9Dx866iiWZnSZpmp9sdQoSXC2tfllLXTGfvF DLhnQUFzi1wqAyv4Sya1h4/GYTNN7xA3NjjpjIUXp32zEfZ53weJgDjA04SE+yYPcFMdDF hqMnBfHyfVERDKkRqZqezhGSMLV6ULvxXwxKgbWNnKsXiaMi57jVDmPNiK7SeA== 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 4S8tw872mPz8x0; Tue, 17 Oct 2023 12:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HCiOYD012323; Tue, 17 Oct 2023 12:44:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HCiOEF012320; Tue, 17 Oct 2023 12:44:24 GMT (envelope-from git) Date: Tue, 17 Oct 2023 12:44:24 GMT Message-Id: <202310171244.39HCiOEF012320@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 1209a850bcea - main - devel/gettext: Update to 0.22.3 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: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1209a850bcea356b4bb5bb1ada3d4749cf177763 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=1209a850bcea356b4bb5bb1ada3d4749cf177763 commit 1209a850bcea356b4bb5bb1ada3d4749cf177763 Author: Tijl Coosemans AuthorDate: 2023-10-06 15:11:04 +0000 Commit: Tijl Coosemans CommitDate: 2023-10-17 12:35:14 +0000 devel/gettext: Update to 0.22.3 PR: 274309 Exp-run by: antoine --- devel/gettext-runtime/Makefile | 2 +- devel/gettext-runtime/files/patch-configure | 11 ------ devel/gettext-runtime/files/patch-intl_Makefile.in | 11 ------ .../patch-intl_gnulib-lib_glthread_threadlib.c | 39 ---------------------- devel/gettext-runtime/pkg-plist | 2 +- devel/gettext-tools/files/patch-configure | 9 ----- .../files/patch-gnulib-lib_glthread_threadlib.c | 39 ---------------------- .../files/patch-libgettextpo_glthread_threadlib.c | 39 ---------------------- devel/gettext-tools/pkg-plist | 2 +- devel/gettext/Makefile.common | 2 +- devel/gettext/distinfo | 6 ++-- devel/libtextstyle/pkg-plist | 2 +- 12 files changed, 8 insertions(+), 156 deletions(-) diff --git a/devel/gettext-runtime/Makefile b/devel/gettext-runtime/Makefile index 1e57b4fb24d7..618340e867f9 100644 --- a/devel/gettext-runtime/Makefile +++ b/devel/gettext-runtime/Makefile @@ -3,7 +3,7 @@ # discretion. PORTNAME= gettext-runtime -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= GNU gettext runtime libraries and programs WWW= https://www.gnu.org/software/gettext/ diff --git a/devel/gettext-runtime/files/patch-configure b/devel/gettext-runtime/files/patch-configure deleted file mode 100644 index e70ae06e4969..000000000000 --- a/devel/gettext-runtime/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2023-06-17 11:53:59 UTC -+++ configure -@@ -27079,7 +27079,7 @@ then : - # On Solaris 10 or newer, this test is no longer needed, because - # libc contains the fully functional pthread functions. - case "$host_os" in -- solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) -+ solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux* | freebsd*) - - printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h - diff --git a/devel/gettext-runtime/files/patch-intl_Makefile.in b/devel/gettext-runtime/files/patch-intl_Makefile.in deleted file mode 100644 index 40647158d4fb..000000000000 --- a/devel/gettext-runtime/files/patch-intl_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- intl/Makefile.in.orig 2023-06-17 11:53:53 UTC -+++ intl/Makefile.in -@@ -1692,7 +1692,7 @@ AM_CPPFLAGS = -Ignulib-lib -I$(srcdir)/gnulib-lib \ - AM_CPPFLAGS = -Ignulib-lib -I$(srcdir)/gnulib-lib \ - -DLOCALEDIR=$(localedir_c_make) \ - -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DLIBDIR=\"$(libdir)\" \ -- -DBUILDING_LIBINTL $(am__append_1) -+ -DBUILDING_LIBINTL -DBUILDING_DLL $(am__append_1) - - # Enable more warning options in this directory. - diff --git a/devel/gettext-runtime/files/patch-intl_gnulib-lib_glthread_threadlib.c b/devel/gettext-runtime/files/patch-intl_gnulib-lib_glthread_threadlib.c deleted file mode 100644 index 45b8beaf8f98..000000000000 --- a/devel/gettext-runtime/files/patch-intl_gnulib-lib_glthread_threadlib.c +++ /dev/null @@ -1,39 +0,0 @@ ---- intl/gnulib-lib/glthread/threadlib.c.orig 2023-02-03 13:19:38 UTC -+++ intl/gnulib-lib/glthread/threadlib.c -@@ -62,11 +62,10 @@ glthread_in_use (void) - - /* Test using pthread_create. */ - --/* The function to be executed by a dummy thread. */ --static void * --dummy_thread_func (void *arg) -+static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT; -+static void -+dummy_once_func (void) - { -- return arg; - } - - int -@@ -77,19 +76,10 @@ glthread_in_use (void) - - if (!tested) - { -- pthread_t thread; -- -- if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0) -- /* Thread creation failed. */ -+ if (pthread_once (&dummy_once_control, dummy_once_func) != 0) - result = 0; - else -- { -- /* Thread creation works. */ -- void *retval; -- if (pthread_join (thread, &retval) != 0) -- abort (); -- result = 1; -- } -+ result = 1; - tested = 1; - } - return result; diff --git a/devel/gettext-runtime/pkg-plist b/devel/gettext-runtime/pkg-plist index 454c0413eaf8..61dd79ee986a 100644 --- a/devel/gettext-runtime/pkg-plist +++ b/devel/gettext-runtime/pkg-plist @@ -11,7 +11,7 @@ lib/libasprintf.so.0.0.0 lib/libintl.a lib/libintl.so lib/libintl.so.8 -lib/libintl.so.8.3.0 +lib/libintl.so.8.4.0 man/man1/envsubst.1.gz man/man1/gettext.1.gz man/man1/ngettext.1.gz diff --git a/devel/gettext-tools/files/patch-configure b/devel/gettext-tools/files/patch-configure index aa7ea1955a41..5ce0fd335b60 100644 --- a/devel/gettext-tools/files/patch-configure +++ b/devel/gettext-tools/files/patch-configure @@ -8,12 +8,3 @@ && test "$PACKAGE" != libintl; }; then gt_use_preinstalled_gnugettext=yes else -@@ -35320,7 +35319,7 @@ then : - # On Solaris 10 or newer, this test is no longer needed, because - # libc contains the fully functional pthread functions. - case "$host_os" in -- solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) -+ solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux* | freebsd*) - - printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h - diff --git a/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c b/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c deleted file mode 100644 index c8a29d7ab5ac..000000000000 --- a/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c +++ /dev/null @@ -1,39 +0,0 @@ ---- gnulib-lib/glthread/threadlib.c.orig 2014-07-14 07:28:34 UTC -+++ gnulib-lib/glthread/threadlib.c -@@ -29,11 +29,10 @@ - - # if PTHREAD_IN_USE_DETECTION_HARD - --/* The function to be executed by a dummy thread. */ --static void * --dummy_thread_func (void *arg) -+static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT; -+static void -+dummy_once_func (void) - { -- return arg; - } - - int -@@ -44,19 +43,10 @@ glthread_in_use (void) - - if (!tested) - { -- pthread_t thread; -- -- if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0) -- /* Thread creation failed. */ -+ if (pthread_once (&dummy_once_control, dummy_once_func) != 0) - result = 0; - else -- { -- /* Thread creation works. */ -- void *retval; -- if (pthread_join (thread, &retval) != 0) -- abort (); -- result = 1; -- } -+ result = 1; - tested = 1; - } - return result; diff --git a/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c b/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c deleted file mode 100644 index ac8184e478c3..000000000000 --- a/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c +++ /dev/null @@ -1,39 +0,0 @@ ---- libgettextpo/glthread/threadlib.c.orig 2014-07-14 07:29:10 UTC -+++ libgettextpo/glthread/threadlib.c -@@ -29,11 +29,10 @@ - - # if PTHREAD_IN_USE_DETECTION_HARD - --/* The function to be executed by a dummy thread. */ --static void * --dummy_thread_func (void *arg) -+static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT; -+static void -+dummy_once_func (void) - { -- return arg; - } - - int -@@ -44,19 +43,10 @@ glthread_in_use (void) - - if (!tested) - { -- pthread_t thread; -- -- if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0) -- /* Thread creation failed. */ -+ if (pthread_once (&dummy_once_control, dummy_once_func) != 0) - result = 0; - else -- { -- /* Thread creation works. */ -- void *retval; -- if (pthread_join (thread, &retval) != 0) -- abort (); -- result = 1; -- } -+ result = 1; - tested = 1; - } - return result; diff --git a/devel/gettext-tools/pkg-plist b/devel/gettext-tools/pkg-plist index c0dd1f341684..9fab9ab0d739 100644 --- a/devel/gettext-tools/pkg-plist +++ b/devel/gettext-tools/pkg-plist @@ -27,7 +27,7 @@ lib/libgettextlib.so lib/libgettextpo.a lib/libgettextpo.so lib/libgettextpo.so.0 -lib/libgettextpo.so.0.5.9 +lib/libgettextpo.so.0.5.10 lib/libgettextsrc-%%PORTVERSION%%.so lib/libgettextsrc.so man/man1/autopoint.1.gz diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common index 08cfb9debd9e..332659479429 100644 --- a/devel/gettext/Makefile.common +++ b/devel/gettext/Makefile.common @@ -2,7 +2,7 @@ # experimental ports run. Untested commits may be backed out at portmgr's # discretion. -DISTVERSION= 0.22 +DISTVERSION= 0.22.3 PORTREVISION?= 0 # Leave this zero. Set in Makefile instead. CATEGORIES= devel MASTER_SITES= GNU/gettext diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo index 0f8a14092eeb..d355026be1c1 100644 --- a/devel/gettext/distinfo +++ b/devel/gettext/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687532203 -SHA256 (gettext-0.22.tar.xz) = 0e60393a47061567b46875b249b7d2788b092d6457d656145bb0e7e6a3e26d93 -SIZE (gettext-0.22.tar.xz) = 10008808 +TIMESTAMP = 1696592259 +SHA256 (gettext-0.22.3.tar.xz) = b838228b3f8823a6c1eddf07297197c4db13f7e1b173b9ef93f3f945a63080b6 +SIZE (gettext-0.22.3.tar.xz) = 10236340 diff --git a/devel/libtextstyle/pkg-plist b/devel/libtextstyle/pkg-plist index 1a64a38215c6..86d20b048a3c 100644 --- a/devel/libtextstyle/pkg-plist +++ b/devel/libtextstyle/pkg-plist @@ -5,7 +5,7 @@ include/textstyle/woe32dll.h lib/libtextstyle.a lib/libtextstyle.so lib/libtextstyle.so.0 -lib/libtextstyle.so.0.2.0 +lib/libtextstyle.so.0.2.1 %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_1.html %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_2.html %%PORTDOCS%%%%DOCSDIR%%/libtextstyle_3.html