From nobody Wed Jan 24 03:28:02 2024 X-Original-To: dev-commits-ports-branches@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 4TKTtV6ZJ9z57JGF; Wed, 24 Jan 2024 03:28:02 +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 4TKTtV62Txz4Qh9; Wed, 24 Jan 2024 03:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706066882; 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=ka2UIntBeiOEeKIluqergxsI860NJkEmRMuPXtoecbs=; b=cfwJYdChL0IlQapbOtBeDaJjPnlHAtLMpSpKpCrw8BdlVt3eS6V6mTL1ZqgaFVzIBc4CwQ P6P+Iv4X9yuS7yrWDclKoSW3GvAGYo8G4h5D/fRgeBZm7caCpVqRVDumAmIPT4K2XkrlyP dIkQyZ1qZLd5RrlLuHdUE5D3dF0xKnWAlCaEOj2LVBFAoi3CLkWlcjKDhxyFeeIHYxvWx8 qscmEAAHQ0Ek57og5Tjz12GyG2CxFh3G7CFPsjkEfFzSPoE2ZbVXWPaeSLYcQnVlngoTsS quS11xdKcbOf1biaTIA61htKlnGS2IFAyHz5HkhsH8TQXbn++NHRgLFixqO6VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706066882; 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=ka2UIntBeiOEeKIluqergxsI860NJkEmRMuPXtoecbs=; b=t/d8yBVpq/z80cvc25mTLkh13rBXAZ8f3oU02+y7MTegcjFDvp3THKqg5JCkhYF3OkLUQt cDsuCwFN84SqOc0V/NHsIjmTZ0uJXhuDvqPvhkwpxPM93F4Ctd7TH1gB/Twe5S4rdMdo7n x9msIyTa082K8gJklCe6H/VAU/Q3dLaspz6L8w0U764dDw0Y+FRUzCADdgW1/MKoZPxxcd gOKvcxUJcy88FXulzHpE7C6h7xojlcOUKUpIuv8Sjg8a27239ufd5yGqIu6ndR7Md7Z/Bu q8grCVoh0kNRFVeDMQLVHquENDLL6qYj5Lvz2GgX7vCPVINCosR9S1+efPurrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706066882; a=rsa-sha256; cv=none; b=mCOnBoRpP7Qedb7EPRQmQl+1ulKleKvQoXWuiA2DVX3wdtCvVNH5GECqHN7DDnMbjMocfM qvXua8aH7ah31gtMuMwo+i5oqjiSs0JttdP+4WzZikCEpXd/ZNvNRmMzuBU/z1wvRzV6Zl Q1R5mfDGVk42huMmMchJWcIxxtG7xD6shGQXLm2nNTNzUIuekrZTFrsc8qek+BTl/tBG4m 0T4fYAb2LLP4IvZx5EQiHuphvcYN9fCji+Of35XSHGTIFrmMFPnqoJ5f+poFNFG8bPskuu Z5erEVp/KXrlQ1tsksvX4jK3CrOtimpwVisJLupH2XA3XEkykxu1FL431p1aMA== 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 4TKTtV55dLzy87; Wed, 24 Jan 2024 03:28:02 +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 40O3S24p056823; Wed, 24 Jan 2024 03:28:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O3S2A9056820; Wed, 24 Jan 2024 03:28:02 GMT (envelope-from git) Date: Wed, 24 Jan 2024 03:28:02 GMT Message-Id: <202401240328.40O3S2A9056820@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: c0a0a7db20a9 - 2024Q1 - cad/magic: Unbreak on 15 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: c0a0a7db20a971c6de34e7896c4937fdd573ef97 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0a0a7db20a971c6de34e7896c4937fdd573ef97 commit c0a0a7db20a971c6de34e7896c4937fdd573ef97 Author: Yuri Victorovich AuthorDate: 2024-01-24 03:26:56 +0000 Commit: Yuri Victorovich CommitDate: 2024-01-24 03:27:57 +0000 cad/magic: Unbreak on 15 Breakage is due to missing symbols in the *.map file. Reported by: fallout (cherry picked from commit 1f3623b709e0867551c0fd8e1bbf61b5a913df12) --- cad/magic/files/patch-scripts_configure | 52 +++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/cad/magic/files/patch-scripts_configure b/cad/magic/files/patch-scripts_configure new file mode 100644 index 000000000000..985fbe59cac9 --- /dev/null +++ b/cad/magic/files/patch-scripts_configure @@ -0,0 +1,52 @@ +--- scripts/configure.orig 2023-08-30 06:00:02 UTC ++++ scripts/configure +@@ -6589,12 +6589,12 @@ if test $usingTcl ; then + if test $usingTcl ; then + case $target in + *-sunos4*|*-*-netbsd*|NetBSD-*|FreeBSD-*|OpenBSD-*) +- TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" +- TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" ++ TCL_LIB_NAME="tcl86" ++ TK_LIB_NAME="tk86" + ;; + *) +- TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}" +- TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}" ++ TCL_LIB_NAME="tcl86" ++ TK_LIB_NAME="tk86" + ;; + esac + +@@ -6620,9 +6620,9 @@ $as_echo_n "checking for wish executable... " >&6; } + for wishexe in \ + wish-X11 \ + wish \ +- wish${TK_VERSION} \ ++ wish8.6 \ + wish.exe \ +- wish${TK_VERSION}.exe ++ wish8.6.exe + do + if test -r "$dir/$wishexe" ; then + WISH_EXE=$dir/$wishexe +@@ -6656,9 +6656,9 @@ $as_echo_n "checking for tclsh executable... " >&6; } + do + for tclshexe in \ + tclsh \ +- tclsh${TK_VERSION} \ ++ tclsh8.6 \ + tclsh.exe \ +- tclsh${TK_VERSION}.exe ++ tclsh8.6.exe + do + if test -r "$dir/$tclshexe" ; then + TCLSH_EXE=$dir/$tclshexe +@@ -8182,7 +8182,7 @@ fi + esac + fi + if test "$with_gnu_ld" = "yes" ; then +- LDDL_FLAGS="${LDDL_FLAGS} -Wl,--version-script=\${MAGICDIR}/magic/symbol.map" ++ #LDDL_FLAGS="${LDDL_FLAGS} -Wl,--version-script=\${MAGICDIR}/magic/symbol.map" + fi + +