git: 165f19909c50 - main - cad/magic: Update 8.3.664 => 8.3.680

The branch main has been updated by alven:

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

commit 165f19909c508ef540e72ff487422a0aaf2b3c7d
Author:     Älven <[email protected]>
AuthorDate: 2026-07-09 07:32:45 +0000
Commit:     Älven <[email protected]>
CommitDate: 2026-08-12 18:36:47 +0000

    cad/magic: Update 8.3.664 => 8.3.680
    
    * Follow upstream simplifying it's building scripts
    
    Approved by:            yuri@ (maintainer, Mentor)
    Approved by:            db@, yuri@ (Mentors, implicit)
    Differential Revision:  https://reviews.freebsd.org/D58119
---
 cad/magic/Makefile                       |  6 ++----
 cad/magic/distinfo                       |  6 +++---
 cad/magic/files/patch-commands__Makefile | 15 ---------------
 cad/magic/files/patch-rules.mak          | 12 ------------
 cad/magic/files/patch-scripts_configure  |  8 ++++----
 cad/magic/pkg-plist                      |  1 -
 6 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 962cb11c3d57..c168b72e0e08 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	magic
-DISTVERSION=	8.3.664
+DISTVERSION=	8.3.680
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/magic/archive/
 
@@ -34,8 +34,6 @@ DESKTOP_ENTRIES="Magic" "" "" "${PORTNAME}" "" ""
 
 PORTSCOUT=	limit:^8\.
 
-CONFIGURE_WRKSRC=	${WRKSRC}/scripts
-
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
@@ -51,7 +49,7 @@ post-patch:
 		 s|wish$${TK_VERSION}|${WISH:T}|g ; \
 		 s|tclsh$${TK_VERSION}|${TCLSH:T}|g ; \
 		 s|-l/usr/X11R6/include|-I${LOCALBASE}/include|g' \
-	    ${CONFIGURE_WRKSRC}/configure
+	    ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|^#!.*|#!${TCLSH}|' ${WRKSRC}/tcltk/strip_reflibs.tcl
 	@${REINPLACE_CMD} -e \
diff --git a/cad/magic/distinfo b/cad/magic/distinfo
index 92bc528e3afe..2b07060fba4e 100644
--- a/cad/magic/distinfo
+++ b/cad/magic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1783800032
-SHA256 (magic-8.3.664.tgz) = 5e952f3f490b3f2d3a1a9229897af9e14df9ac33e2a899af5554bece3e87d4ab
-SIZE (magic-8.3.664.tgz) = 4363132
+TIMESTAMP = 1786313127
+SHA256 (magic-8.3.680.tgz) = 7cecc8355da280457c1f620c418096ee66c790e1ddb98484868f89654cbe8437
+SIZE (magic-8.3.680.tgz) = 3919527
diff --git a/cad/magic/files/patch-commands__Makefile b/cad/magic/files/patch-commands__Makefile
deleted file mode 100644
index f2b2c442d7e9..000000000000
--- a/cad/magic/files/patch-commands__Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- commands/Makefile.orig	2025-07-30 06:00:02 UTC
-+++ commands/Makefile
-@@ -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:
--	${MAKE} -C ${MAGICDIR}/readline readline-create-symlinks
-+module: lib${MODULE}.o
- 
- include ${MAGICDIR}/defs.mak
- include ${MAGICDIR}/rules.mak
diff --git a/cad/magic/files/patch-rules.mak b/cad/magic/files/patch-rules.mak
deleted file mode 100644
index f2e87cb6a61b..000000000000
--- a/cad/magic/files/patch-rules.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-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 572bed2e0a97..59c78c51fd18 100644
--- a/cad/magic/files/patch-scripts_configure
+++ b/cad/magic/files/patch-scripts_configure
@@ -1,11 +1,11 @@
---- scripts/configure.orig	2025-07-30 06:00:02 UTC
+--- scripts/configure.orig	2026-07-27 06:00:06 UTC
 +++ scripts/configure
-@@ -9187,7 +9187,7 @@ fi
+@@ -9385,7 +9385,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"
+-    LDDL_FLAGS="${LDDL_FLAGS} -Wl,--version-script=\${MAGICSRC}/magic/symbol.map"
++    #LDDL_FLAGS="${LDDL_FLAGS} -Wl,--version-script=\${MAGICSRC}/magic/symbol.map"
    fi
  
  
diff --git a/cad/magic/pkg-plist b/cad/magic/pkg-plist
index 5ec6d03e8e6b..81e2ecce8254 100644
--- a/cad/magic/pkg-plist
+++ b/cad/magic/pkg-plist
@@ -3,7 +3,6 @@ bin/ext2spice
 bin/magic
 lib/magic/doc/addendum6_5.ps
 lib/magic/doc/copyright.ps
-lib/magic/doc/html/Makefile
 lib/magic/doc/html/addcommandentry.html
 lib/magic/doc/html/addpath.html
 lib/magic/doc/html/antennacheck.html