From nobody Wed Jan 24 03:34:18 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 4TKV1k3NqZz57K5G; Wed, 24 Jan 2024 03:34:18 +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 4TKV1k2tgPz4RRq; Wed, 24 Jan 2024 03:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706067258; 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=DB5ilSHS+7Fg3eMTwdV4uGFx/vhKPo4LXzXROIOyic4=; b=oieAuNrQpBtWj7SBVJJ8s2iohkAOZZwwSuhGIuOphn42PSD3Bw9WSRfFPzfwYFqj+Ypgt+ J/k2MncwQn/f//NEI7dL1R44wAUAu7BxTm0Itw9sMtuJkhCV5pzbB03Dk3JNnFuGmEo4x/ jf9gLD5pqZGY09k7Q2al3VzLwqzQrwJV0lHHLHMh3vdeWIDa1EWAEwvO1MrEMrjfB4LWBM WSNhszsmgHHdTk+k1+VfeVj9CZ0MYSjopwb2Yxv4jB1cI7NpG/4DMeJaPFKnX/FfzknD27 sq3O6KExwy13Rjc8o1iS2YkPlgj4eyWPNhHl8bAXCpz6sHc0rl3QFCPuz5Bq4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706067258; 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=DB5ilSHS+7Fg3eMTwdV4uGFx/vhKPo4LXzXROIOyic4=; b=HoVgfLdkEYwsV4athPSiPW9A2Wq7VO/hD4euYwkLdzjGC7pz0eepRT2JkdhHB+p2NBz40l SVxCWfl6o0qRH5lFYYbeZuhLDG5d1SzILSHE3xqJopGhdU+pf3fvqnbVGKjuQyqL9ZzE38 LScDGw5nsdn2KmZ6/c+vBfQcsQKDoTRekLeYNOPiTFXadle7gSFC+5vamA97ckg7+Q/iPT C0tco9VHUgBFmREL2q5vS85jAYx9YGc0lhksQDAH7pjTd5Thr6RC1sM3Yb6k/Cj2YiVKX4 UYmMYAFDMqvUOCoQSudC3ofsgXJd8gm12Rq840/+yXh2vkS+Qe77b49bizMJRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706067258; a=rsa-sha256; cv=none; b=sTb6PouleuQPG5H6/dVy4A9gsWlI7j8xSNgqq79TY1JK33kI3EOwOkGOTiE+xOqtAvB0Xr b5vzMP+OZLwvtrDxbIm1S1fpHEDs0SzjNy44d39qBchYZthtD1ieT+vvFx/6mVDtjj8nw5 1xQmu8+0j/UNY9ndqiBu0FA35F2Cy/wTs/aK2KBYP2Pgn6OoeUYABSojF593PwiZClhXjx f7mKaR3FxrF3EiD0/UsvGV0ruh2Kvt0os/aMjGmSFm4MMvzPO12VPsP8+g2oyQCthSlKrj i3hSiJ/NlbLmG3RAWeQEMt/MPkmGbxdCUAgtBamwFZag1BClG8YDTlUTRKtBWA== 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 4TKV1k1y6wzyHV; Wed, 24 Jan 2024 03:34:18 +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 40O3YIKR073755; Wed, 24 Jan 2024 03:34:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O3YIrL073752; Wed, 24 Jan 2024 03:34:18 GMT (envelope-from git) Date: Wed, 24 Jan 2024 03:34:18 GMT Message-Id: <202401240334.40O3YIrL073752@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: ff0f94260bce - main - cad/magic: Remove unintended parts of the patch 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: ff0f94260bce8568b76d512bb8c622abd203131e Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff0f94260bce8568b76d512bb8c622abd203131e commit ff0f94260bce8568b76d512bb8c622abd203131e Author: Yuri Victorovich AuthorDate: 2024-01-24 03:32:15 +0000 Commit: Yuri Victorovich CommitDate: 2024-01-24 03:32:15 +0000 cad/magic: Remove unintended parts of the patch --- 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