From nobody Wed Jan 24 03:34:36 2024 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 4TKV2525Bsz57K84; Wed, 24 Jan 2024 03:34:37 +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 4TKV251G11z4Rgv; Wed, 24 Jan 2024 03:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706067277; 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=uxDAQtmEC1cudWbO9Pj8NAM8OWwWC4V7p5iizopmc7E=; b=YXfwfJKmSAkVmTVav+2m8llBj6mZmGUaybkIGPQcvgOq0sfdJU0INuVNJSMu5ByuXQenoq 16ES+v7FiccpT/eMHs+nmtaERtrszt7U2XAGS4gCA9bv6unQrz/rdmDe3qwdMxyS9Aztdy B0alTqA3yGwtMUdJRXtPoHjOVLVs6zak2vf+Z2lNPzVpCf6jfFJqSeZUOJBuvcvLfsgnhb d+Qdp1TQDqm9C+pgUvkm1s4izH9k3k91oKF7dSnuU7X9Lv7Zw21YUmTzKI7hijHi2MlCb2 oBsdhSas1JnW/HaaSfqV2rt846zrDP6d/7OJA9Xmv7BUF3UXK3rkpp+65UhnAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706067277; 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=uxDAQtmEC1cudWbO9Pj8NAM8OWwWC4V7p5iizopmc7E=; b=BOhWIEwMXTasCEqeC+4e5I713UGjRIMvyYfx/Rw+f50jjYWdTxh2STandFPoxC4A4MFBgq NFoRhQpzYtD/xnxKu5ch8b7v54Tl5Pqoyqu5hEY+AP7Z+g/ZOtLzspAgVeUZdEEb0y8K0n Le6tex1X2Eu0ZJr6wbIv5/fU65/ptKHOBW/2NXjKQPPJqlCMfdjEYmH1hVs5bhBATBWW9P Xui2t3kbIGmdaeChraTzh4LDqgvlZ9WwDmteMG3TO4a+rQ7a1b4sxrPl/emyhnq0divWwy nk3B/7LzbmlbUqEeFfxHKXnEeDAR63xPNhdz2+t3xww1TF9sGxtVySPQnxAuJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706067277; a=rsa-sha256; cv=none; b=wZrv1O9pettmIoREjX0aJ9RmCCQjNeOjQbqTwOgIAqXftnTI6CAgMAtEeI4X72xKjzeaSu T5BeXMaA9G9kmRma015Tt0mkymlFTsIw2tSETwtR1dJIFJBCvq3vLa3s6cEnpVGVVprjFC VIqHxgC61acjmajhcnQf95KJhKpniXb4Sdb+bHUz/Prm9v5NaF11oiQJvHwFxA7/Qam3NF ZHbSXREBojJUaRB7hIum65yVFSgjnRWu/XI3Wuc0Makq+j/joZeGySLxER9i0Hazwtqa+Y V56fqjOr0LGMhpoozltrAvX25O4R5m9ME0PIIe+dK+s7e/bCPBeD2z7WjZJQRQ== 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 4TKV2501jfzy6c; Wed, 24 Jan 2024 03:34:37 +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 40O3YaYc073948; Wed, 24 Jan 2024 03:34:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O3Yaiq073945; Wed, 24 Jan 2024 03:34:36 GMT (envelope-from git) Date: Wed, 24 Jan 2024 03:34:36 GMT Message-Id: <202401240334.40O3Yaiq073945@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: 4d27f5822d0d - 2024Q1 - cad/magic: Remove unintended parts of the patch 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 4d27f5822d0d4c467b56b45fed148daed60ab44a Auto-Submitted: auto-generated The branch 2024Q1 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4d27f5822d0d4c467b56b45fed148daed60ab44a commit 4d27f5822d0d4c467b56b45fed148daed60ab44a Author: Yuri Victorovich AuthorDate: 2024-01-24 03:32:15 +0000 Commit: Yuri Victorovich CommitDate: 2024-01-24 03:34:31 +0000 cad/magic: Remove unintended parts of the patch (cherry picked from commit ff0f94260bce8568b76d512bb8c622abd203131e) --- cad/magic/files/patch-scripts_configure | 41 --------------------------------- 1 file changed, 41 deletions(-) diff --git a/cad/magic/files/patch-scripts_configure b/cad/magic/files/patch-scripts_configure index 985fbe59cac9..01b51d3ce3a6 100644 --- a/cad/magic/files/patch-scripts_configure +++ b/cad/magic/files/patch-scripts_configure @@ -1,46 +1,5 @@ --- 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