Skip to content

Commit

Permalink
cad/magic: update 8.3.315 → 8.3.459
Browse files Browse the repository at this point in the history
  • Loading branch information
@yurivict
yurivict committed Jan 24, 2024
1 parent 65fdc2b commit ce9b2ed
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 52 deletions.
3 changes: 1 addition & 2 deletions cad/magic/Makefile
View file
@@ -1,6 +1,5 @@
PORTNAME= magic
DISTVERSION= 8.3.315
PORTREVISION= 1
DISTVERSION= 8.3.459
CATEGORIES= cad
MASTER_SITES= http://opencircuitdesign.com/magic/archive/

Expand Down
6 changes: 3 additions & 3 deletions cad/magic/distinfo
View file
@@ -1,3 +1,3 @@
TIMESTAMP = 1659123533
SHA256 (magic-8.3.315.tgz) = c9b5b86287bb286b5db391c31b7a55bf4212458b073942383ff947162d758e1e
SIZE (magic-8.3.315.tgz) = 4175094
TIMESTAMP = 1706064662
SHA256 (magic-8.3.459.tgz) = 12b34564766227e0b0f1039044463da6ce7ff16a196045308fc688bb8d9d4fd4
SIZE (magic-8.3.459.tgz) = 4237442
6 changes: 3 additions & 3 deletions cad/magic/files/patch-textio__textioInt.h
View file
@@ -1,11 +1,11 @@
--- textio/textioInt.h.orig 2020-05-24 07:00:08 UTC
--- textio/textioInt.h.orig 2023-07-12 06:00:01 UTC
+++ textio/textioInt.h
@@ -41,7 +41,7 @@ typedef struct {
#define TX_CMD_PROMPT ":"

/* all of the state associated with a tty terminal */
-#if !defined(SYSV) && !defined(CYGWIN)
+#if !defined(SYSV) && !defined(CYGWIN) && !defined(__FreeBSD__)
-#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;
85 changes: 42 additions & 43 deletions cad/magic/files/patch-textio__txInput.c
View file
@@ -1,4 +1,4 @@
--- textio/txInput.c.orig 2020-05-24 07:00:08 UTC
--- textio/txInput.c.orig 2023-07-12 06:00:01 UTC
+++ textio/txInput.c
@@ -28,6 +28,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Heade
#include <unistd.h>
Expand All @@ -8,7 +8,7 @@


#include "utils/magsgtty.h"
@@ -1205,14 +1206,14 @@ TxGetLine(dest, maxChars)
@@ -1208,14 +1209,14 @@ TxGetLine(dest, maxChars)
* ----------------------------------------------------------------------------
*/

Expand All @@ -25,73 +25,72 @@
+ ioctl( fileno( stdin ), TIOCGETA, buf);
}

#else
@@ -1245,14 +1246,14 @@ txGetTermState(buf)
#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
@@ -1257,7 +1258,7 @@ txSetTermState(buf)

void
txSetTermState(buf)
-#if defined(SYSV) || defined(CYGWIN)
- struct termio *buf;
+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
+ struct termios *buf;
#else
txTermState *buf;
#endif /* SYSV */
struct termio *buf;
#elif defined (__OpenBSD__) || defined(EMSCRIPTEN)
struct termios *buf;
@@ -1267,7 +1268,7 @@ txSetTermState(buf)
{
-#if defined(SYSV) || defined(CYGWIN)
- ioctl( fileno(stdin), TCSETAF, buf );
+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
+ ioctl( fileno(stdin), TIOCSETAF, buf );
#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 */
(void) ioctl(fileno(stdin), TIOCSETN, (char *) &(buf->tx_i_sgtty) );
@@ -1280,13 +1281,13 @@ txSetTermState(buf)

void
@@ -1298,13 +1299,13 @@ txInitTermRec(buf)
txInitTermRec(buf)
-#if defined(SYSV) || defined(CYGWIN)
- struct termio *buf;
+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
+ struct termios *buf;
#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)
+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
-#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;
@@ -1301,8 +1302,8 @@ txInitTermRec(buf)

@@ -1321,7 +1322,7 @@ struct termio closeTermState;


-#if defined(SYSV) || defined(CYGWIN)
-struct termio closeTermState;
+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
+struct termios 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;
#endif /* SYSV */
@@ -1328,8 +1329,8 @@ static bool haveCloseState = FALSE;
void
@@ -1349,13 +1350,13 @@ txSaveTerm()
txSaveTerm()
{
-#if defined(SYSV) || defined(CYGWIN)
#if defined(SYSV) || defined(CYGWIN)
- ioctl( fileno( stdin ), TCGETA, &closeTermState);
+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
+ ioctl( fileno( stdin ), TIOCGETA, &closeTermState);
txEraseChar = closeTermState.c_cc[VERASE];
txKillChar = closeTermState.c_cc[VKILL];
TxEOFChar = closeTermState.c_cc[VEOF];
@@ -1369,8 +1370,8 @@ txSaveTerm()
void
TxSetTerminal()
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];
@@ -1398,7 +1399,7 @@ TxSetTerminal()
{
-#if defined(SYSV) || defined(CYGWIN)
- struct termio buf;
+#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
+ struct termios buf;
#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 */
5 changes: 4 additions & 1 deletion cad/magic/pkg-plist
View file
Expand Up @@ -76,7 +76,8 @@ lib/magic/doc/html/graphics/corner2.gif
lib/magic/doc/html/graphics/email_address.png
lib/magic/doc/html/graphics/line1.gif
lib/magic/doc/html/graphics/magic_OGL_sm.gif
lib/magic/doc/html/graphics/magic_title2.gif
lib/magic/doc/html/graphics/magic_title8_3.gif
lib/magic/doc/html/graphics/magic_title8_3.png
lib/magic/doc/html/graphics/techmgr.gif
lib/magic/doc/html/graphics/toolbar.gif
lib/magic/doc/html/graphics/writeall.gif
Expand Down Expand Up @@ -289,13 +290,15 @@ lib/magic/tcl/magicdnull
lib/magic/tcl/magicexec
lib/magic/tcl/mazeroute.tcl
lib/magic/tcl/readspice.tcl
lib/magic/tcl/reorderLayers.tcl
lib/magic/tcl/socketcmd.tcl
lib/magic/tcl/strip_reflibs.tcl
lib/magic/tcl/tclmagic.so
lib/magic/tcl/techbuilder.tcl
lib/magic/tcl/texthelper.tcl
lib/magic/tcl/tkcon.tcl
lib/magic/tcl/tkshell.tcl
lib/magic/tcl/toolbar.tcl
lib/magic/tcl/toolkit.tcl
lib/magic/tcl/toolkit_rev0.tcl
lib/magic/tcl/tools.tcl
Expand Down

0 comments on commit ce9b2ed

Please sign in to comment.