5 files changed, 22 insertions, 21 deletions
diff --git a/cad/magic/files/patch-commands__Makefile b/cad/magic/files/patch-commands__Makefile
index 249bf5d8ca65..f2b2c442d7e9 100644
--- a/cad/magic/files/patch-commands__Makefile
+++ b/cad/magic/files/patch-commands__Makefile
@@ -1,15 +1,14 @@
---- commands/Makefile.orig	2020-04-08 15:45:13 UTC
+--- commands/Makefile.orig	2025-07-30 06:00:02 UTC
 +++ commands/Makefile
-@@ -10,12 +10,7 @@ SRCS      = CmdSubrs.c CmdAB.c CmdCD.c CmdE.c CmdFI.c 
+@@ -10,11 +10,7 @@ SRCS      = CmdSubrs.c CmdAB.c CmdCD.c CmdE.c CmdFI.c 
  # Force the module to regenerate the symbolic link in the readline
  # directory, as it may be needed by CmdFI.c (in the non-Tcl compile)
  
 -module: ${MAGICDIR}/readline/readline lib${MODULE}.o
 -
+-# Delegate this task to the readline/Makefile
 -${MAGICDIR}/readline/readline:
--	@if ( ! test -f ${MAGICDIR}/readline/readline ) ; then \
--	(cd ${MAGICDIR}/readline; ln -s `ls | grep readline` readline) ; \
--	fi
+-	${MAKE} -C ${MAGICDIR}/readline readline-create-symlinks
 +module: lib${MODULE}.o
  
  include ${MAGICDIR}/defs.mak
diff --git a/cad/magic/files/patch-rules.mak b/cad/magic/files/patch-rules.mak
new file mode 100644
index 000000000000..f2e87cb6a61b
--- /dev/null
+++ b/cad/magic/files/patch-rules.mak
@@ -0,0 +1,12 @@
+Use BSD instead of GNU sed(1) convention
+--- rules.mak.orig	2025-07-30 06:00:02 UTC
++++ rules.mak
+@@ -17,7 +17,7 @@ ${DEPEND_FILE}: ${DEPSRCS}
+ # it indicates a missing dependency somewhere in a upstream/parent Makefile.
+ ${DEPEND_FILE}: ${DEPSRCS}
+ 	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${DEPEND_FLAG} ${DEPSRCS} > ${DEPEND_FILE}$$PPID.tmp
+-	${SED} -e "/#/D" -e "/ \//s/ \/.*\.h//" -e "/  \\\/D" -i ${DEPEND_FILE}$$PPID.tmp
++	${SED} -e "/#/D" -e "/ \//s/ \/.*\.h//" -e "/  \\\/D" -i '' ${DEPEND_FILE}$$PPID.tmp
+ 	${MV} -f ${DEPEND_FILE}$$PPID.tmp ${DEPEND_FILE}
+ 
+ # Original Depend file generating line:
diff --git a/cad/magic/files/patch-scripts_configure b/cad/magic/files/patch-scripts_configure
index 717527be8e9f..572bed2e0a97 100644
--- a/cad/magic/files/patch-scripts_configure
+++ b/cad/magic/files/patch-scripts_configure
@@ -1,6 +1,6 @@
---- scripts/configure.orig	2025-01-11 07:00:02 UTC
+--- scripts/configure.orig	2025-07-30 06:00:02 UTC
 +++ scripts/configure
-@@ -8208,7 +8208,7 @@ fi
+@@ -9187,7 +9187,7 @@ fi
      esac
    fi
    if test "$with_gnu_ld" = "yes" ; then
diff --git a/cad/magic/files/patch-textio__textioInt.h b/cad/magic/files/patch-textio__textioInt.h
index e7745fdfc40b..9c35955bf95d 100644
--- a/cad/magic/files/patch-textio__textioInt.h
+++ b/cad/magic/files/patch-textio__textioInt.h
@@ -1,4 +1,4 @@
---- textio/textioInt.h.orig	2025-02-24 07:00:02 UTC
+--- textio/textioInt.h.orig	2025-07-30 06:00:02 UTC
 +++ textio/textioInt.h
 @@ -43,7 +43,7 @@ typedef struct {
  #define TX_CMD_PROMPT	":"
@@ -6,6 +6,6 @@
  /* all of the state associated with a tty terminal */
 -#if !defined(SYSV) && !defined(CYGWIN) && !defined(__OpenBSD__) && !defined(EMSCRIPTEN)
 +#if !defined(SYSV) && !defined(CYGWIN) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(EMSCRIPTEN)
- typedef struct {
-     struct sgttyb tx_i_sgtty;
-     struct tchars tx_i_tchars;
+ #if defined(HAVE_SYS_IOCTL_COMPAT_H) || defined(HAVE_SGTTY_H)
+ #if defined(HAVE_SYS_IOCTL_COMPAT_H)
+ #include <sys/ioctl_compat.h> /* replaced sgtty.h */
diff --git a/cad/magic/files/patch-utils_path.c b/cad/magic/files/patch-utils_path.c
deleted file mode 100644
index 7623443cd798..000000000000
--- a/cad/magic/files/patch-utils_path.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/path.c.orig	2025-03-17 19:16:36 UTC
-+++ utils/path.c
-@@ -29,6 +29,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Heade
- #include <sys/param.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <unistd.h>
- 
- #ifdef HAVE_ZLIB
- #include <zlib.h>