From nobody Wed Jan 24 03:27:39 2024 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 4TKTt36Phsz57JQM; Wed, 24 Jan 2024 03:27:39 +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 4TKTt35TJ3z4QmM; Wed, 24 Jan 2024 03:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706066859; 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=P8wS9m3nxU4HnteSc4YKUyu+VU+EjssFXPV3VHN23UY=; b=dl+p+/e6hX0vm6XeNL848Vg3iNA4o5h4MgYjj4kgNQH5qm0xg6dFjuQzEx1QUp3zoZLBb6 jswSYUYcbOcQ9a525dqkBL2JfDRMJ98JPyMDQvwyTbKwo4evjfm8Qf+ZvmYhzaU8ncSdD5 UqXgbIzkzT4Fjn6eEDj0ov3Wwdig2AQIlft6cAhIFOC6K+e6t5fwjRFtLGAC+m0fcNRnO+ i+Y/DTvU8/mmzgNs0ge61bjBdCmElyl6NVkGNElBy3nZwPizdxksqs3z3tAiWQNKmzXlbr 0jaO93I5+LvJDnGXmM2j3FSzMvW5a7xRHUaoYzP4vDPaBBHx4NlDUn6esZ8wPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706066859; 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=P8wS9m3nxU4HnteSc4YKUyu+VU+EjssFXPV3VHN23UY=; b=IKXRLDacrdxYucnYYTGKW+9nW1pljWHZlW9tEUhVMwLsU9JUgqp0F5573CJDHZDarBJBUs pSnf3mL8YN6zZj7ICc4qQluOqv6EoGAXXKUQjpChmncfZcALJS6X1HH841/eDVt6zldaon ENTlFvbv7cPTjQd7QNBEpuyyNtoMRBupP+zigwsgUjPyxAZv8fXcNFeU/A+iMV0U0ycy/d gsuecgVG8Ta4W0qKliyCipNZjuTpACY5J3kSuk6u8Z4db4bsRu/mk8ujyn+smdIRW1ulSj d6pZ/P2M+M5XP5rkuWbSPBFFnmb1iWf6ouHrf+jN46HHzWYE+MnQYTApJjj5Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706066859; a=rsa-sha256; cv=none; b=KQaWHqsw5CELHiMSkmxLoXhZZVvD0rSIvCIzJqURzrn77uKYZz+FaKjtB/TaP/u7/pb6Ho R6sz33Kjo8feWeVBbCRw1AxBQgC8gxjamKhaoYXdR0ElIf/i/GMMqnZd1CVp9GkAEexIM4 /x5Rqeoui8t5i7CtpkAxy7arXAbV4bD6j26+bVpGteopxjlqSnz+Ec7+q24t1BUMWwQQe/ wKy62lowDSv/O8ePgo0dARsY0/yXZBY34aIWXMQd5wcRuB8K6suDTFOBLSCQLQgrI4gAy9 rZe/Tr4id2g4YKkeM/BAfw3iqYJIEu4sVaC21QEzCU7T9lpW7MYqc14mL0SwSw== 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 4TKTt34Xk2zy5n; Wed, 24 Jan 2024 03:27:39 +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 40O3Rd69056636; Wed, 24 Jan 2024 03:27:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O3RdUD056633; Wed, 24 Jan 2024 03:27:39 GMT (envelope-from git) Date: Wed, 24 Jan 2024 03:27:39 GMT Message-Id: <202401240327.40O3RdUD056633@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 1f3623b709e0 - main - cad/magic: Unbreak on 15 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f3623b709e0867551c0fd8e1bbf61b5a913df12 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f3623b709e0867551c0fd8e1bbf61b5a913df12 commit 1f3623b709e0867551c0fd8e1bbf61b5a913df12 Author: Yuri Victorovich AuthorDate: 2024-01-24 03:26:56 +0000 Commit: Yuri Victorovich CommitDate: 2024-01-24 03:26:56 +0000 cad/magic: Unbreak on 15 Breakage is due to missing symbols in the *.map file. Reported by: fallout --- 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 + +