Page MenuHomeFreeBSD
Files F142890681

D53054.id.diff
No OneTemporary
Actions

D53054.id.diff
View Options

diff --git a/cad/magic/Makefile b/cad/magic/Makefile
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,5 +1,5 @@
PORTNAME= magic
-DISTVERSION= 8.3.526
+DISTVERSION= 8.3.561
CATEGORIES= cad
MASTER_SITES= http://opencircuitdesign.com/magic/archive/
@@ -14,15 +14,17 @@
libfreetype.so:print/freetype2
RUN_DEPENDS= bash:shells/bash
-USES= gmake gnome gl localbase:ldflags python:build shebangfix tar:tgz tk:tea xorg
+USES= gl gmake gnome localbase:ldflags python:build shebangfix \
+ tar:tgz tk:tea xorg
USE_GL= gl glu
USE_GNOME= cairo
USE_XORG= ice sm x11 xext xi xmu
-SHEBANG_FILES= scripts/preproc.py tcltk/magic.sh.in tcltk/ext2sim.sh.in tcltk/ext2spice.sh.in
+SHEBANG_FILES= scripts/preproc.py tcltk/ext2sim.sh.in tcltk/ext2spice.sh.in \
+ tcltk/magic.sh.in
-CONFIGURE_ARGS= --with-opengl \
- --enable-modular # --enable-modular should fix build on 15, when failures were due to missing symbols defined in *.sym but not in code
+CONFIGURE_ARGS= --enable-modular \
+ --with-opengl # --enable-modular should fix build on 15, when failures were due to missing symbols defined in *.sym but not in code
ALL_TARGET= tcllibrary
@@ -56,10 +58,12 @@
's|^#!.*|#!${WISH}|' ${WRKSRC}/tcltk/tkshell.tcl
pre-build:
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
- ${MAKEFILE} ${MAKE_ARGS} database/database.h
+ @cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${MAKE_ARGS} database/database.h
post-install:
- @cd ${STAGEDIR}${PREFIX}/lib/magic/tcl && ${STRIP_CMD} magicexec magicdnull tclmagic.so
+ @cd ${STAGEDIR}${PREFIX}/lib/magic/tcl && \
+ ${STRIP_CMD} magicexec magicdnull tclmagic.so
.include <bsd.port.post.mk>
diff --git a/cad/magic/distinfo b/cad/magic/distinfo
--- a/cad/magic/distinfo
+++ b/cad/magic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744651958
-SHA256 (magic-8.3.526.tgz) = bba67f35fae5ce7e891436cf2cfae9699a11fe7506b44d47d6ba0cea48667b54
-SIZE (magic-8.3.526.tgz) = 4243637
+TIMESTAMP = 1760303907
+SHA256 (magic-8.3.561.tgz) = 4c42447696adbe2f8f624bdffab5ee3a01bada0b7e3bdcdd031e7efd8262e498
+SIZE (magic-8.3.561.tgz) = 4276101
diff --git a/cad/magic/files/patch-commands__Makefile b/cad/magic/files/patch-commands__Makefile
--- 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
--- /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
--- 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
--- 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
--- 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>
diff --git a/cad/magic/pkg-plist b/cad/magic/pkg-plist
--- a/cad/magic/pkg-plist
+++ b/cad/magic/pkg-plist
@@ -1,13 +1,13 @@
bin/ext2sim
bin/ext2spice
bin/magic
-@comment bin/spice2sim
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
+lib/magic/doc/html/archive.html
lib/magic/doc/html/array.html
lib/magic/doc/html/box.html
lib/magic/doc/html/calma.html
@@ -54,8 +54,6 @@
lib/magic/doc/html/ext2spice.html
lib/magic/doc/html/extract.html
lib/magic/doc/html/extresist.html
-lib/magic/doc/html/exttosim.html
-lib/magic/doc/html/exttospice.html
lib/magic/doc/html/feedback.html
lib/magic/doc/html/fill.html
lib/magic/doc/html/findbox.html
@@ -282,8 +280,6 @@
lib/magic/tcl/cellmgr.tcl
lib/magic/tcl/console.tcl
lib/magic/tcl/drcmgr.tcl
-@comment lib/magic/tcl/exttosim.so
-@comment lib/magic/tcl/exttospice.so
lib/magic/tcl/libmgr.tcl
lib/magic/tcl/magic.tcl
lib/magic/tcl/magicdnull

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 25, 12:29 PM (9 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27940616
Default Alt Text
D53054.id.diff (6 KB)

Event Timeline