update to magic-8.3.340, from Brad, ok Alessandro De Laurenzis (maintainer)

+ tweak from me, override MAGIC_COMMIT via MAKE_FLAGS to stop calling git and
printing "fatal: not a git repository (or any parent up to mount point /usr)
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)"
all the time.

cad/magic/Makefile

@@ -1,5 +1,5 @@
 COMMENT =	interactive system for VLSI circuit layouts
-DISTNAME =	magic-8.3.316
+DISTNAME =	magic-8.3.340
 EXTRACT_SUFX =	.tgz
 
 CATEGORIES =	cad
@@ -29,6 +29,10 @@ RUN_DEPENDS =	shells/bash
 WRKCONF =	${WRKSRC}/scripts
 
 USE_GMAKE=	Yes
+# see scripts/defs.mak.in; if not overridden this calls git, which is very
+# noisy in a non-git checkout if git is installed
+MAKE_FLAGS=	MAGIC_COMMIT=
+
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS +=	--enable-cairo-offscreen \
 			--with-distdir=${PREFIX} \

cad/magic/distinfo

@@ -1,2 +1,2 @@
-SHA256 (magic-8.3.316.tgz) = gAlgrV0lr0DJUINxl4J8Djd3rqvSTaIdMl4+6y4Sd08=
-SIZE (magic-8.3.316.tgz) = 4177392
+SHA256 (magic-8.3.340.tgz) = gugQg3RilNFal7z9b07CSQ4ziZt+w0z+GTEXtpW3Rtg=
+SIZE (magic-8.3.340.tgz) = 4190828

cad/magic/patches/patch-textio_textioInt_h

@@ -1,12 +0,0 @@
-Index: textio/textioInt.h
---- textio/textioInt.h.orig
-+++ 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(__OpenBSD__)
- typedef struct {
-     struct sgttyb tx_i_sgtty;
-     struct tchars tx_i_tchars;

cad/magic/patches/patch-textio_txInput_c

@@ -1,83 +0,0 @@
-Index: textio/txInput.c
---- textio/txInput.c.orig
-+++ textio/txInput.c
-@@ -1215,6 +1215,15 @@ txGetTermState(buf)
-     ioctl( fileno( stdin ), TCGETA, buf);
- }
- 
-+#elif defined (__OpenBSD__)
-+
-+void
-+txGetTermState(buf)
-+    struct termios *buf;
-+{
-+    (void) tcgetattr(fileno(stdin), buf);
-+}
-+
- #else
- 
- void
-@@ -1247,12 +1256,16 @@ void
- txSetTermState(buf)
- #if defined(SYSV) || defined(CYGWIN)
-     struct termio *buf;
-+#elif defined(__OpenBSD__)
-+    struct termios *buf;
- #else
-     txTermState *buf;
- #endif /* SYSV */
- {
- #if defined(SYSV) || defined(CYGWIN)
-     ioctl( fileno(stdin), TCSETAF, buf );
-+#elif defined (__OpenBSD__)
-+    (void) tcsetattr( fileno(stdin), TCSANOW, buf );
- #else
-     /* set the current terminal characteristics */
-     (void) ioctl(fileno(stdin), TIOCSETN, (char *) &(buf->tx_i_sgtty) );
-@@ -1282,11 +1295,13 @@ void
- txInitTermRec(buf)
- #if defined(SYSV) || defined(CYGWIN)
-     struct termio *buf;
-+#elif defined(__OpenBSD__)
-+    struct termios *buf;
- #else
-     txTermState *buf;
- #endif /* SYSV */
- {
--#if defined(SYSV) || defined(CYGWIN)
-+#if defined(SYSV) || defined(CYGWIN) || defined(__OpenBSD__)
-     buf->c_lflag = ISIG;    /* raw: no echo and no processing, allow signals */
-     buf->c_cc[ VMIN ] = 1;
-     buf->c_cc[ VTIME ] = 0;
-@@ -1303,6 +1318,8 @@ txInitTermRec(buf)
- 
- #if defined(SYSV) || defined(CYGWIN)
- struct termio closeTermState;
-+#elif defined(__OpenBSD__)
-+struct termios closeTermState;
- #else
- static txTermState closeTermState;
- #endif /* SYSV */
-@@ -1335,6 +1352,13 @@ txSaveTerm()
-     TxEOFChar = closeTermState.c_cc[VEOF];
-     TxInterruptChar = closeTermState.c_cc[VINTR];
-     haveCloseState = TRUE;
-+#elif defined(__OpenBSD__)
-+    (void) tcgetattr( fileno( stdin ), &closeTermState);
-+    txEraseChar = closeTermState.c_cc[VERASE];
-+    txKillChar =  closeTermState.c_cc[VKILL];
-+    TxEOFChar = closeTermState.c_cc[VEOF];
-+    TxInterruptChar = closeTermState.c_cc[VINTR];
-+    haveCloseState = TRUE;
- #else
-     struct ltchars lt;
-     txGetTermState(&closeTermState);
-@@ -1371,6 +1395,8 @@ TxSetTerminal()
- {
- #if defined(SYSV) || defined(CYGWIN)
-     struct termio buf;
-+#elif defined(__OpenBSD__)
-+    struct termios buf;
- #else
-     txTermState buf;
- #endif /* SYSV */

cad/magic/patches/patch-utils_magsgtty_h

@@ -1,16 +0,0 @@
-Index: utils/magsgtty.h
---- utils/magsgtty.h.orig
-+++ utils/magsgtty.h
-@@ -33,7 +33,12 @@
- # endif
- 
- #include <sys/ioctl.h>
-+
-+#if defined(__OpenBSD__)
-+#include <termios.h>
-+#else
- #include <sys/ioctl_compat.h>
-+#endif
- 
- #else
- #include <termio.h>