From nobody Tue Dec 05 00:09:26 2023 X-Original-To: dev-commits-ports-all@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 4SkgrQ5H4fz530xn; Tue, 5 Dec 2023 00:09:26 +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 4SkgrQ4rS8z4ZYc; Tue, 5 Dec 2023 00:09:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701734966; 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=9pSv+Oie/GM2/8WhGP7VBiW693VQaVuxYSAPxgFNrTw=; b=jv1z9m19IuBXu4HuwAczCQZKKRIdFzg8qgqvZm0moZGiQeyHES0h7IyVvz0qyQ7Y/kz1KR bivk9HPJr/2DvLeDmmY+Kc9zhUa0HMK9OmDUErHrsyb2NNaHSeFhmKjk8lQAyX8ewlHc1k K+hKGYwTO6YmLcHhIYTgWQucnMywAoDCbU1L4lpo6wgI0eLGPGfPN2yGBuKUmLoRd6hONu WasO9epIxQP5HLVzqm7ruVeOrIUYBycWfGfJRiNLiT8OXvf8KHjXUxny6tTecJVrlEVT1P oPaelR9tz/d6TZrAISMUndzLWMRNwiptXd+cZNqqsgMTV+Uh1XuPUAEu+wmz5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701734966; 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=9pSv+Oie/GM2/8WhGP7VBiW693VQaVuxYSAPxgFNrTw=; b=HLpQnyriXILgHMoEt4v/6hK0/ITYiR4hwU94Iua7EyGZ1OYSAIBTGDUvY5xKB3FB4xlOxG joBwBG2y3hcEkPxreHcmXA+O6BF0nPFDMXOru+nhHpcFSZ+AJ97NwH5mNWP42CPVrkkhwR 7GswU/9Wi/jwQn9qbIVeDhQmqVPrdKR9FTSxalVu6KRMRsJ/XVAEDvb18KH4hLbUOA9BaN ffcpvluzbZ8IbGW3EC1nZw4q7qc61KoLU7sxwvu+etGdr/wNG5u/LrClOzlsGAQYYAps0B 8lF4bHetCEPrsgKCR8lj5wayHzhjCKmu2M6MRYvuDNLGE2BPwvIyd9fuSs9ZnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701734966; a=rsa-sha256; cv=none; b=K36+hN6bPxC5PHFlRmJ0GqqUdMtyxiwrBAcO6H5mVjwWTb13K2BjmeqEBIHUZpz+g69rEd 1C1GIB8czvWGuT1whyDz5PeNXUyy6AcEaI2+hb08tpnSZuPXZcUl/Z9HLQDb3VLu9ObHjD VcGO/QCsUrr6xJIN+bW4gLK6ff8qTyVmdJhY8mIPpqfM3IKAagwKodvx5+jThgBcyvQQnr uK1W8cusDt6maNprm5NzufTHLUFZBXQFDbeZ8Zp6OYRBnTyxZ30ntAYXMIQ1g4S8BroBGJ cP8z7iWOkF7Qh5mO8u1yZQh8lBkRUZn9v1dImCgNWv7zQDC5UfdrHQDoIMDGJg== 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 4SkgrQ3xnfzmmK; Tue, 5 Dec 2023 00:09:26 +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 3B509Qcf063824; Tue, 5 Dec 2023 00:09:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B509QuU063821; Tue, 5 Dec 2023 00:09:26 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:09:26 GMT Message-Id: <202312050009.3B509QuU063821@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: c1d2da5c0be7 - main - x11-toolkits/open-motif*: revise AM_FUNC_VOID_SPRINTF List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1d2da5c0be7b60cf8d4b39bb615bfab7399abce Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c1d2da5c0be7b60cf8d4b39bb615bfab7399abce commit c1d2da5c0be7b60cf8d4b39bb615bfab7399abce Author: Cy Schubert AuthorDate: 2023-12-04 23:49:53 +0000 Commit: Cy Schubert CommitDate: 2023-12-05 00:02:05 +0000 x11-toolkits/open-motif*: revise AM_FUNC_VOID_SPRINTF The check for whether sprintf() returns void would fail to detect sprintf() returning int under recent Clang. Presumably the check meant to see if an error like "passing 'void' to parameter of incompatible type 'int'" is generated, but Clang would always generate other errors having to do with calling sprintf() with too few arguments and attempting to redeclare sprintf() when it is a builtin macro. And even if the test program compiles, such as with GCC, it crashes during the sprintf(".") call. Revise the test program to not redeclare sprintf(), to call sprintf() with valid arguments, and to not implicitly declare exit() due to stdlib.h not being included (which Apple Xcode Clang 12 and later consider an error rather than a warning). If sprintf() returns void, then a compiler error similar to "initializing 'int' with an expression of incompatible type 'void'" or "void value not ignored as it ought to be" should be generated. Otherwise if sprintf() returns int, then the test program should compile and exit with code 0, and the check should properly report that sprintf() does not return void. Obtained from: https://sourceforge.net/p/motif/code/merge-requests/3/ --- x11-toolkits/open-motif-devel/Makefile | 2 +- x11-toolkits/open-motif-devel/files/patch-acinclude.m4 | 16 ++++++++++++++++ x11-toolkits/open-motif/Makefile | 2 +- x11-toolkits/open-motif/files/patch-acinclude.m4 | 16 ++++++++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/x11-toolkits/open-motif-devel/Makefile b/x11-toolkits/open-motif-devel/Makefile index 298f7c6f06f1..36f53474ca9d 100644 --- a/x11-toolkits/open-motif-devel/Makefile +++ b/x11-toolkits/open-motif-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= open-motif PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel diff --git a/x11-toolkits/open-motif-devel/files/patch-acinclude.m4 b/x11-toolkits/open-motif-devel/files/patch-acinclude.m4 new file mode 100644 index 000000000000..10b61badcffc --- /dev/null +++ b/x11-toolkits/open-motif-devel/files/patch-acinclude.m4 @@ -0,0 +1,16 @@ +--- acinclude.m4.orig 2023-02-15 16:42:34.000000000 -0800 ++++ acinclude.m4 2023-12-04 15:48:14.815249000 -0800 +@@ -50,7 +50,12 @@ + AC_DEFUN([AM_FUNC_VOID_SPRINTF], + [AC_CACHE_CHECK(whether sprintf returns void, ac_cv_func_void_sprintf, + [AC_TRY_RUN([#include +-int sprintf(); main() { exit(sprintf(".")); }], ++int main() { ++ char buf[1]; ++ int i = sprintf(buf, ""); ++ return 0; ++} ++], + ac_cv_func_void_sprintf=no, ac_cv_func_void_sprintf=yes, ac_cv_func_void_sprintf=yes)]) + if test $ac_cv_func_void_sprintf = no; then + AC_DEFINE(VOID_SPRINTF,1, diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index e90595a26679..99fa75185d19 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -1,6 +1,6 @@ PORTNAME= open-motif PORTVERSION= 2.3.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits # MASTER_SITES= SF/${PORTNAME}/Motif%202.3.4%20Source%20Code/ MASTER_SITES= SF/motif/Motif%20${PORTVERSION}%20Source%20Code/ diff --git a/x11-toolkits/open-motif/files/patch-acinclude.m4 b/x11-toolkits/open-motif/files/patch-acinclude.m4 new file mode 100644 index 000000000000..0b2e3c8d1a8f --- /dev/null +++ b/x11-toolkits/open-motif/files/patch-acinclude.m4 @@ -0,0 +1,16 @@ +--- acinclude.m4.orig 2017-08-27 19:29:50.000000000 -0700 ++++ acinclude.m4 2023-12-04 15:48:12.951361000 -0800 +@@ -50,7 +50,12 @@ + AC_DEFUN([AM_FUNC_VOID_SPRINTF], + [AC_CACHE_CHECK(whether sprintf returns void, ac_cv_func_void_sprintf, + [AC_TRY_RUN([#include +-int sprintf(); main() { exit(sprintf(".")); }], ++int main() { ++ char buf[1]; ++ int i = sprintf(buf, ""); ++ return 0; ++} ++], + ac_cv_func_void_sprintf=no, ac_cv_func_void_sprintf=yes, ac_cv_func_void_sprintf=yes)]) + if test $ac_cv_func_void_sprintf = no; then + AC_DEFINE(VOID_SPRINTF,1,