cad/magic: update 8.3.515 → 8.3.522

PR:	285489
This commit is contained in:
Älven 2025-03-18 01:37:40 -07:00 committed by Yuri Victorovich
parent 12daa7791f
commit 24ec8b0ead
6 changed files with 40 additions and 31 deletions

View file

@ -1,5 +1,5 @@
PORTNAME= magic
DISTVERSION= 8.3.515
DISTVERSION= 8.3.522
CATEGORIES= cad
MASTER_SITES= http://opencircuitdesign.com/magic/archive/
@ -10,15 +10,14 @@ WWW= http://opencircuitdesign.com/magic/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libBLT25.so:x11-toolkits/blt \
libfontconfig.so:x11-fonts/fontconfig \
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
RUN_DEPENDS= bash:shells/bash
USES= gmake gnome gl localbase:ldflags python:build shebangfix tar:tgz tk:tea xorg
USE_GL= gl glu
USE_GNOME= cairo
USE_XORG= ice x11 xext xi xmu
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

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1737917566
SHA256 (magic-8.3.515.tgz) = dfd930d07f81dcd39c6ed066c42c19c5df5d3f2d68b84ea2b1edc17e046a499a
SIZE (magic-8.3.515.tgz) = 4242911
TIMESTAMP = 1742227457
SHA256 (magic-8.3.522.tgz) = 85a5e60959cf3c0af2e27f44a55592e547252ba3c203c27d385970e233cc1b0e
SIZE (magic-8.3.522.tgz) = 4246903

View file

@ -1,6 +1,6 @@
--- scripts/configure.orig 2023-08-30 06:00:02 UTC
--- scripts/configure.orig 2025-01-11 07:00:02 UTC
+++ scripts/configure
@@ -8182,7 +8182,7 @@ fi
@@ -8208,7 +8208,7 @@ fi
esac
fi
if test "$with_gnu_ld" = "yes" ; then

View file

@ -1,6 +1,6 @@
--- textio/textioInt.h.orig 2023-07-12 06:00:01 UTC
--- textio/textioInt.h.orig 2025-02-24 07:00:02 UTC
+++ textio/textioInt.h
@@ -41,7 +41,7 @@ typedef struct {
@@ -43,7 +43,7 @@ typedef struct {
#define TX_CMD_PROMPT ":"
/* all of the state associated with a tty terminal */

View file

@ -1,4 +1,4 @@
--- textio/txInput.c.orig 2023-07-12 06:00:01 UTC
--- textio/txInput.c.orig 2025-02-24 07:00:02 UTC
+++ textio/txInput.c
@@ -28,6 +28,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Heade
#include <unistd.h>
@ -8,7 +8,7 @@
#include "utils/magsgtty.h"
@@ -1208,14 +1209,14 @@ TxGetLine(dest, maxChars)
@@ -1221,13 +1222,13 @@ TxGetLine(
* ----------------------------------------------------------------------------
*/
@ -16,26 +16,25 @@
+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
void
txGetTermState(buf)
- struct termio *buf;
+ struct termios *buf;
txGetTermState(
- struct termio *buf)
+ struct termios *buf)
{
- ioctl( fileno( stdin ), TCGETA, buf);
+ ioctl( fileno( stdin ), TIOCGETA, buf);
}
#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
@@ -1257,7 +1258,7 @@ txSetTermState(buf)
@@ -1269,7 +1270,7 @@ txSetTermState(
void
txSetTermState(buf)
txSetTermState(
-#if defined(SYSV) || defined(CYGWIN)
+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
struct termio *buf;
struct termio *buf
#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
struct termios *buf;
@@ -1267,7 +1268,7 @@ txSetTermState(buf)
struct termios *buf
@@ -1280,7 +1281,7 @@ txSetTermState(
{
#if defined(SYSV) || defined(CYGWIN)
ioctl( fileno(stdin), TCSETAF, buf );
@ -44,23 +43,24 @@
(void) tcsetattr( fileno(stdin), TCSANOW, buf );
#else
/* set the current terminal characteristics */
@@ -1298,13 +1299,13 @@ txInitTermRec(buf)
txInitTermRec(buf)
@@ -1311,14 +1312,14 @@ txInitTermRec(
txInitTermRec(
#if defined(SYSV) || defined(CYGWIN)
struct termio *buf;
struct termio *buf
-#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
+#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined(EMSCRIPTEN)
struct termios *buf;
struct termios *buf
#else
txTermState *buf;
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;
@@ -1321,7 +1322,7 @@ struct termio closeTermState;
@@ -1335,7 +1336,7 @@ struct termio closeTermState;
#if defined(SYSV) || defined(CYGWIN)
struct termio closeTermState;
@ -69,8 +69,8 @@
struct termios closeTermState;
#else
static txTermState closeTermState;
@@ -1349,13 +1350,13 @@ txSaveTerm()
txSaveTerm()
@@ -1363,13 +1364,13 @@ txSaveTerm(void)
txSaveTerm(void)
{
#if defined(SYSV) || defined(CYGWIN)
- ioctl( fileno( stdin ), TCGETA, &closeTermState);
@ -85,7 +85,7 @@
(void) tcgetattr( fileno( stdin ), &closeTermState);
txEraseChar = closeTermState.c_cc[VERASE];
txKillChar = closeTermState.c_cc[VKILL];
@@ -1398,7 +1399,7 @@ TxSetTerminal()
@@ -1412,7 +1413,7 @@ TxSetTerminal(void)
{
#if defined(SYSV) || defined(CYGWIN)
struct termio buf;

View file

@ -0,0 +1,10 @@
--- 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>