Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 01 Apr 2026 10:01:59 +0000
From:      =?utf-8?Q?=C3=84lven?= <alven@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: af412b8687ba - main - cad/magic: Update 8.3.570 => 8.3.629
Message-ID:  <69cced17.3b974.35460d80@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by alven:

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

commit af412b8687baeb87bff23fc66c7e097a8a2da3b6
Author:     Älven <alven@FreeBSD.org>
AuthorDate: 2026-03-31 20:36:28 +0000
Commit:     Älven <alven@FreeBSD.org>
CommitDate: 2026-04-01 10:01:03 +0000

    cad/magic: Update 8.3.570 => 8.3.629
    
    Approved by:            yuri@ (maintainer, Mentor)
    Approved by:            db@, yuri@ (Mentors, implicit)
    Differential Revision:  https://reviews.freebsd.org/D56206
---
 cad/magic/Makefile                        |  2 +-
 cad/magic/distinfo                        |  6 +-
 cad/magic/files/patch-textio__textioInt.h | 11 ----
 cad/magic/files/patch-textio__txInput.c   | 92 +------------------------------
 cad/magic/pkg-plist                       |  1 +
 5 files changed, 8 insertions(+), 104 deletions(-)

diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 1b3ac2e2c386..5d99df64a48a 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	magic
-DISTVERSION=	8.3.570
+DISTVERSION=	8.3.629
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/magic/archive/
 
diff --git a/cad/magic/distinfo b/cad/magic/distinfo
index efb546fe5655..907db2d99014 100644
--- a/cad/magic/distinfo
+++ b/cad/magic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1761845095
-SHA256 (magic-8.3.570.tgz) = 9922bf558f8ee330e46dda5986a6585bd573b0d9a6b30980fd64429d97135c38
-SIZE (magic-8.3.570.tgz) = 4280150
+TIMESTAMP = 1774977203
+SHA256 (magic-8.3.629.tgz) = 4dfb51884eeaa8a90bde260ab3728a87b0e7f32ef714a4f80eb1df17203a57ed
+SIZE (magic-8.3.629.tgz) = 4309078
diff --git a/cad/magic/files/patch-textio__textioInt.h b/cad/magic/files/patch-textio__textioInt.h
deleted file mode 100644
index 9c35955bf95d..000000000000
--- a/cad/magic/files/patch-textio__textioInt.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- textio/textioInt.h.orig	2025-07-30 06:00:02 UTC
-+++ textio/textioInt.h
-@@ -43,7 +43,7 @@ typedef struct {
- #define TX_CMD_PROMPT	":"
- 
- /* 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)
- #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-textio__txInput.c b/cad/magic/files/patch-textio__txInput.c
index 3c3411dfe0dd..be714d965246 100644
--- a/cad/magic/files/patch-textio__txInput.c
+++ b/cad/magic/files/patch-textio__txInput.c
@@ -1,96 +1,10 @@
---- textio/txInput.c.orig	2025-02-24 07:00:02 UTC
+--- textio/txInput.c.orig	2026-03-27 06:00:02 UTC
 +++ textio/txInput.c
-@@ -28,6 +28,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Heade
+@@ -30,6 +30,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Heade
  #include <unistd.h>
  #include <ctype.h>
  #include <dirent.h>
 +#include <termios.h>
  
  
- #include "utils/magsgtty.h"
-@@ -1221,13 +1222,13 @@ TxGetLine(
-  * ----------------------------------------------------------------------------
-  */
- 
--#if defined(SYSV) || defined(CYGWIN)
-+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
- 
- void
- txGetTermState(
--    struct termio *buf)
-+    struct termios *buf)
- {
--    ioctl( fileno( stdin ), TCGETA, buf);
-+    ioctl( fileno( stdin ), TIOCGETA, buf);
- }
- 
- #elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
-@@ -1269,7 +1270,7 @@ txSetTermState(
- 
- void
- txSetTermState(
--#if defined(SYSV) || defined(CYGWIN)
-+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
-     struct termio *buf
- #elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
-     struct termios *buf
-@@ -1280,7 +1281,7 @@ txSetTermState(
- {
- #if defined(SYSV) || defined(CYGWIN)
-     ioctl( fileno(stdin), TCSETAF, buf );
--#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
-+#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined(EMSCRIPTEN)
-     (void) tcsetattr( fileno(stdin), TCSANOW, buf );
- #else
-     /* set the current terminal characteristics */
-@@ -1311,14 +1312,14 @@ txInitTermRec(
- txInitTermRec(
- #if defined(SYSV) || defined(CYGWIN)
-     struct termio *buf
--#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
-+#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined(EMSCRIPTEN)
-     struct termios *buf
- #else
-     txTermState *buf
- #endif /* SYSV */
-     )
- {
--#if defined(SYSV) || defined(CYGWIN) || defined(__OpenBSD__) || defined(EMSCRIPTEN)
-+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(EMSCRIPTEN)
-     buf->c_lflag = ISIG;    /* raw: no echo and no processing, allow signals */
-     buf->c_cc[ VMIN ] = 1;
-     buf->c_cc[ VTIME ] = 0;
-@@ -1335,7 +1336,7 @@ struct termio closeTermState;
- 
- #if defined(SYSV) || defined(CYGWIN)
- struct termio closeTermState;
--#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
-+#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined(EMSCRIPTEN)
- struct termios closeTermState;
- #else
- static txTermState closeTermState;
-@@ -1363,13 +1364,13 @@ txSaveTerm(void)
- txSaveTerm(void)
- {
- #if defined(SYSV) || defined(CYGWIN)
--    ioctl( fileno( stdin ), TCGETA, &closeTermState);
-+    ioctl( fileno( stdin ), TIOCGETA, &closeTermState);
-     txEraseChar = closeTermState.c_cc[VERASE];
-     txKillChar =  closeTermState.c_cc[VKILL];
-     TxEOFChar = closeTermState.c_cc[VEOF];
-     TxInterruptChar = closeTermState.c_cc[VINTR];
-     haveCloseState = TRUE;
--#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
-+#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined(EMSCRIPTEN)
-     (void) tcgetattr( fileno( stdin ), &closeTermState);
-     txEraseChar = closeTermState.c_cc[VERASE];
-     txKillChar =  closeTermState.c_cc[VKILL];
-@@ -1412,7 +1413,7 @@ TxSetTerminal(void)
- {
- #if defined(SYSV) || defined(CYGWIN)
-     struct termio buf;
--#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
-+#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined(EMSCRIPTEN)
-     struct termios buf;
- #else
-     txTermState buf;
+ #include "utils/magic.h"
diff --git a/cad/magic/pkg-plist b/cad/magic/pkg-plist
index 7f92c0b18511..5ec6d03e8e6b 100644
--- a/cad/magic/pkg-plist
+++ b/cad/magic/pkg-plist
@@ -172,6 +172,7 @@ lib/magic/doc/html/tk_path_name.html
 lib/magic/doc/html/tool.html
 lib/magic/doc/html/undo.html
 lib/magic/doc/html/unexpand.html
+lib/magic/doc/html/units.html
 lib/magic/doc/html/unmeasure.html
 lib/magic/doc/html/updatedisplay.html
 lib/magic/doc/html/upsidedown.html
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69cced17.3b974.35460d80>