git: c0a0a7db20a9 - 2024Q1 - cad/magic: Unbreak on 15

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Wed, 24 Jan 2024 03:28:02 UTC
The branch 2024Q1 has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c0a0a7db20a971c6de34e7896c4937fdd573ef97

commit c0a0a7db20a971c6de34e7896c4937fdd573ef97
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-01-24 03:26:56 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
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
+ 
+