git: 4d27f5822d0d - 2024Q1 - cad/magic: Remove unintended parts of the patch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 24 Jan 2024 03:34:36 UTC
The branch 2024Q1 has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4d27f5822d0d4c467b56b45fed148daed60ab44a
commit 4d27f5822d0d4c467b56b45fed148daed60ab44a
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-01-24 03:32:15 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
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