Attachment #117923 for bug #160086




#

PORTNAME=	magic
PORTVERSION=	7.5.213
PORTREVISION=	4
CATEGORIES=	cad
MASTER_SITES=	http://opencircuitdesign.com/magic/archive/
EXTRACT_SUFX=	.tgz

MAINTAINER=	ports@FreeBSD.org
COMMENT=	An interactive editor for VLSI layouts

LIB_DEPENDS+=	BLT24.3:${PORTSDIR}/x11-toolkits/blt

CONFIGURE_WRKSRC=	${WRKSRC}/scripts

USE_XORG=	ice xext xi xmu
USE_GL=		gl
USE_TCL_BUILD=	yes
USE_TK_BUILD=	yes
USE_TCL=	yes
USE_TK=		yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR}
ALL_TARGET=	tcllibrary
MAKE_JOBS_UNSAFE=yes

MAN1=		ext2sim.1 ext2spice.1 extcheck.1 magic.1
MAN5=		cmap.5 displays.5 dlys.5 dstyle.5 ext.5 glyphs.5 mag.5 \
		net.5 sim.5

CPPFLAGS=	-I${LOCALBASE}/include
LDFLAGS=	-L${LOCALBASE}/lib
MAN3=	dqueue.3 extflat.3 geometry.3 hash.3 heap.3 libmalloc.3 list.3 \
	magicutils.3 malloc.3 path.3 runstats.3 set.3 show.3 stack.3 string.3
MAN5=	cmap.5 displays.5 dlys.5 dstyle.5 ext.5 glyphs.5 magic.5 net.5 sim.5
MAN8=	prleak.8

.include <bsd.port.pre.mk>

post-patch:
	@${REINPLACE_CMD} -e \
		's|^#!.*|#!${AWK} -f|' ${WRKSRC}/ext2spice/spice2sim
	@${REINPLACE_CMD} -e \
		's|TCL_LIB_NAME=.*|TCL_LIB_NAME="tcl${TCL_VER:S/.//}"|g ; \
		 s|TK_LIB_NAME=.*|TK_LIB_NAME="tk${TK_VER:S/.//}"|g ; \
		 s|wish$${TK_VERSION}|${WISH:T}|g ; \
		 s|tclsh$${TK_VERSION}|${TCLSH:T}|g ; \
		 s|-l/usr/X11R6/include|-I${LOCALBASE}/include|g' ${CONFIGURE_WRKSRC}/configure 
	@${REINPLACE_CMD} -e \
		'/CFLAGS/s| -pg | |' ${WRKSRC}/tcltk/Makefile
	@${REINPLACE_CMD} -e \
		's|^#!.*|#!${TCLSH}|' ${WRKSRC}/tcltk/strip_reflibs.tcl
	@${REINPLACE_CMD} -e \
		's|^#!.*|#!${WISH}|' ${WRKSRC}/tcltk/tkshell.tcl
	@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/bin/spice2sim
.for f in ${BINS}
	@${CHMOD} ${BINMODE} ${PREFIX}/bin/${f}
	@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/bin/${f}
	@${STRIP_CMD} ${PREFIX}/bin/${f}
.endfor
.for f in ${MAN1}
	@${CHMOD} ${MANMODE} ${PREFIX}/man/man1/${f}
	@${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/man/man1/${f}
.endfor
.for f in ${MAN3}
	@${CHMOD} ${MANMODE} ${PREFIX}/man/man3/${f}
	@${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/man/man3/${f}
.endfor
.for f in ${MAN5}
	@${CHMOD} ${MANMODE} ${PREFIX}/man/man5/${f}
	@${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/man/man5/${f}
.endfor
.for f in ${MAN8}
	@${CHMOD} ${MANMODE} ${PREFIX}/man/man8/${f}
	@${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/man/man8/${f}
.endfor
	@${CHMOD} -R a+rX,go-w ${PREFIX}/lib/magic
	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/magic
	@${CHMOD} ${SHAREMODE} ${PREFIX}/lib/mpack.h ${PREFIX}/lib/libmpack.a
	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/mpack.h		\
	  ${PREFIX}/lib/libmpack.a

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)cad/magic/distinfo (-2 / +2 lines)
1	SHA256 (magic-7.1.tar.gz) = 9c4dc1f05c3a55ab57e4919807e233bb750736ebc10854263b08a54eb3376aba	1	SHA256 (magic-7.5.213.tgz) = cacd14275ec13a008cb2dd0455e3bd5ff288be9060de0a805bb15b890ea42bf0
2	SIZE (magic-7.1.tar.gz) = 3860487	2	SIZE (magic-7.5.213.tgz) = 3694855




# $FreeBSD: ports/cad/magic/files/defs.mak,v 1.2 2008/04/19 17:46:54 miwi Exp $

SHELL                  = /bin/sh

CADDIR                 = ${PREFIX}
BINDIR                 = ${CADDIR}/bin
LIBDIR                 = ${CADDIR}/lib
MANDIR                 = ${CADDIR}/man
SYSDIR                 = ${CADDIR}/lib/magic/sys
SCMDIR                 = ${CADDIR}/lib/magic/scm

SCRIPTS                = ${MAGICDIR}/scripts

RM                     = rm -f
CP                     = cp
AR                     = ar
ARFLAGS                = crv
LD                     = ld -r
RANLIB                 = ranlib

CPP                    = /usr/bin/cpp -P -traditional
CPPFLAGS               = -I. -I${MAGICDIR}
DFLAGS                 =  -DFILE_LOCKS -DHAVE_READLINE -DNONMANHATTAN -DUSE_NEW_MACROS

READLINE_DEFS          = 
READLINE_LIBS          =  -lreadline -ltermcap

DEPEND_FLAG            = -MM
DEPEND_FILE            = Depend

GR_CFLAGS              =  -I${LOCALBASE}/include
GR_DFLAGS              = -DX11 -DXLIB -DX11HELP_PROG=\"${X11HELP_PROG}\"
GR_LIBS                = -L${LOCALBASE}/lib  -lX11
GR_SRCS                =  ${X11_SRCS}
GR_HELPER_SRCS         =  ${X11HELPER_SRCS}
GR_HELPER_PROG         =  ${X11HELP_PROG}

OBJS      = ${SRCS:.c=.o}
LIB_OBJS  = ${LIB_SRCS:.c=.o}
CLEANS    = ${OBJS} ${LIB_OBJS} lib${MODULE}.a lib${MODULE}.o ${MODULE}




--- ext2spice/ext2spice.c.orig	Tue Dec  9 16:53:56 2003
+++ ext2spice/ext2spice.c	Tue Dec  9 16:55:34 2003
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include <varargs.h>
+#include <stdarg.h>
 #include "misc/magic.h"
 #include "utils/malloc.h"
 #include "utils/geometry.h"
@@ -316,7 +316,7 @@
 #ifdef	free_all_mem
     EFFlatDone(); 
     EFDone();
-#endif	free_all_mem
+#endif
 
     printf("Memory used: %s\n", RunStats(RS_MEM, NULL, NULL));
     exit (0);
@@ -1586,22 +1586,19 @@
 }
 
 /* debugging stuff */
-#include <varargs.h>
+#include <stdarg.h>
 
 #define DBG 1
 
-DBPRINT( va_alist )
-  va_dcl
+DBPRINT( char *fmt, ... )
   {
     va_list  args;
-    char     *fmt;
     FILE     *fp;
     char     buff[ 300 ];
 
     if ( DBG ) {
-    va_start( args );
+    va_start( args, fmt );
     fp = stderr ;
-    fmt = va_arg( args, char * );
     (void) vsprintf( buff, fmt, args );
     va_end( args );
 

Lines 1-8 Link Here

(-)cad/magic/files/patch-ext2spice::spice2sim (-8 lines)
1	--- ext2spice/spice2sim.orig Thu Mar 30 03:34:59 2000
2	+++ ext2spice/spice2sim Fri Oct 11 23:38:53 2002
3	@@ -1,4 +1,4 @@
4	-#!/bin/awk -f
5	+#!/usr/bin/awk -f
6	# convert an ext2spice produced file to a .sim file for debugging
7	#
8	BEGIN {




--- extflat/EFint.h.orig	Tue Dec  9 16:34:04 2003
+++ extflat/EFint.h	Tue Dec  9 16:33:35 2003
@@ -21,7 +21,7 @@
 
 #ifndef	_MAGIC
 int err0 = Need_to_include_misc/magic_header;
-#endif	_MAGIC
+#endif
 
 
 /*
@@ -306,3 +306,4 @@
 extern Void efBuildConnect();
 extern Void efBuildResistor();
 extern Void efBuildCap();
+extern Void efReadError(char *fmt, ...);




--- extflat/EFread.c.orig	Tue Dec  9 16:24:57 2003
+++ extflat/EFread.c	Tue Dec  9 16:25:13 2003
@@ -19,12 +19,12 @@
 
 #ifndef lint
 static char rcsid[] = "$Header: /ufs/repository/magic/extflat/EFread.c,v 1.2 2001/01/12 22:12:35 jsolomon Exp $";
-#endif  not lint
+#endif
 
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <varargs.h>
+#include <stdarg.h>
 #include "misc/magic.h"
 #include "utils/geometry.h"
 #include "utils/hash.h"
@@ -534,14 +534,12 @@
  */
 
     /*VARARGS1*/
-efReadError(fmt, va_alist)
-    char *fmt;
-    va_dcl
+efReadError(char *fmt, ... )
 {
     va_list args;
 
     (void) printf("%s, line %d: ", efReadFileName, efReadLineNum);
-    va_start(args);
+    va_start(args, fmt);
     vfprintf(stdout, fmt, args);
     va_end(args);
     (void) fflush(stdout);




--- magic/proto.magic.orig	Tue Dec  9 16:50:51 2003
+++ magic/proto.magic	Tue Dec  9 16:51:06 2003
@@ -1,12 +1,4 @@
-#	$(CAD_HOME)/lib/sys/.magic 
-# 	System wide start up file for magic, defines default macros.
-#
-#	rcsid $Header: /ufs/repository/magic/magic/proto.magic,v 1.4 2001/09/26 18:24:39 tim Exp $
-#
 #ifndef USE_NEW_MACROS
-###############################################################################
-#  Default .magic macro file (original)
-###############################################################################
 echo ""
 macro s "select"
 macro S "select more"
@@ -49,104 +41,75 @@
 macro " " "tool"
 macro '' "iroute route -dBox"
 macro '' "iroute route -dSelection"
-#else	(USE_NEW_MACROS)
-###############################################################################
-#  Default .magic macro file (new macros)
-###############################################################################
-# A key
+#else
 macro a "select visible"
 macro A "select more visible"
 macro '' "select less visible"
-# B key
 macro b "box"
 macro B "findbox"
-# C key
 macro c "copy"
-# D key
 macro d "delete"
 macro '' "erase $"
-# E key
 macro e "edit"
-# F key
 macro f "sideways"
 macro F "upsidedown"
-# G key
 macro g "grid"
 macro G "grid 2"
-# I key
 macro i "select cell"
 macro I "select more cell"
 #ifdef XLIB
 macro Control_XK_i "select less cell"
 #endif
-# L key
 #ifdef USE_READLINE
 imacro l "label "
 #endif
 macro L "shell ls"
 macro '' "redraw"
-# M key
 macro m "move"
 macro M "stretch"
-# N key
 macro '' ""
-# O key
 macro o "openwindow"
 macro O "closewindow"
-# P key
 #ifdef USE_READLINE
 imacro p "paint "
 #endif
-# Q key
 #ifdef XLIB
 macro Control_Shift_XK_q "quit"
 #endif
-# R key
 macro r "clockwise"
 macro R "clockwise 270"
 macro '' "clockwise 180"
-# S key
 macro s "select"
 macro S "select more"
 macro '' "select less"
 #ifdef XLIB
 macro Control_Shift_XK_s "undo ; select"
 #endif
-# U key
 macro u "undo"
 macro U "redo"
-# V key
 macro v "view"
 macro V "xview"
-# W key
 macro w "writeall"
 macro W "writeall force"
-# X key
 macro x "expand"
 macro X "unexpand"
 macro '' "expand toggle"
-# Z key
 macro z "zoom .5"
 macro Z "zoom 2"
 macro '' "findbox zoom"
 #ifdef XLIB
 macro Control_Shift_XK_z "center"
 #endif
-# Question mark
 macro ? "drc why"
 macro / "select area; what ; select clear"
-# Comma key
 macro , "select clear"
-# Exclamation mark
 #ifdef USE_READLINE
 imacro ! "shell "
 #endif
-# Space bar
 macro " " "tool"
 #ifdef XLIB
 macro Shift_XK_space "tool box"
 macro Control_XK_space "tool wiring"
-# Arrow keys (X11 versions only)
 macro XK_Left "scroll l .1"
 macro Shift_XK_Left "scroll l 1"
 macro Control_XK_Left "box +l 1"
@@ -163,8 +126,6 @@
 macro Shift_XK_Down "scroll d 1"
 macro Control_XK_Down "box +d 1"
 macro Control_Shift_XK_Down "box -u 1"
-# Keypad keys (X11 versions only)
-# Functions duplicated for use both with Num_Lock ON and OFF
 macro XK_KP_Delete "box w 0; box h 0"
 macro XK_KP_0 "box w 4; box h 4"
 macro XK_KP_Insert "box w 4; box h 4"
@@ -208,7 +169,6 @@
 macro XK_KP_Prior "move r 1; move u 1"
 macro Shift_XK_KP_9 "stretch r 1; stretch u 1"
 macro XK_9 "stretch r 1; stretch u 1"
-# Quick macro function keys for scmos tech (X11 versions only)
 macro XK_F1  "paint ndiff"
 macro XK_F2  "paint pdiff"
 macro XK_F3  "paint poly"
@@ -222,19 +182,13 @@
 macro XK_F11 "paint pc"
 macro XK_F12 "paint via"
 #endif
-#endif	(USE_NEW_MACROS)
+#endif
 #ifndef NO_PLOT
-#
-# additions for plot package
-#
 plot parameter spoolCommand "echo use 'lpr -P%s -v -s -JMagic %s' to print plot"
 plot parameter directory "."
-#endif	(NO_PLOT)
+#endif
 #ifndef NO_SCHEME_INTERPRETER
-#
-# additions for default scm path
-#
 define scm-library-path "~cad/lib/magic/scm"
 load-scm "default.scm"
 load-scm "layout.scm"
-#endif (NO_SCHEME_INTERPRETER)
+#endif




--- misc/magic.h.orig	Fri Sep 21 17:15:45 2001
+++ misc/magic.h	Sat Jan 31 13:07:11 2004
@@ -18,6 +18,8 @@
  * rcsid="$Header"
  */
 
+#include <machine/endian.h>
+
 #define	_MAGIC
 
 /* Note:  System files, such as "stdio.h" and "sys/types.h", should be
@@ -146,6 +148,12 @@
  *
  */
 
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define	IS_LITTLE_ENDIAN
+#elif BYTE_ORDER == BIG_ENDIAN
+#define	IS_BIG_ENDIAN
+#endif
+
 #ifdef        i386
 #define       IS_LITTLE_ENDIAN        /* Intel x86 processors. */
 #endif
@@ -224,7 +232,7 @@
 #if defined(sun) && !defined(sparc)
 # define NEED_MONCNTL
 #endif  
-#ifdef	ALPHA
+#if defined(ALPHA) || (defined(__alpha__) && defined(__FreeBSD__))
 # define NEED_MONCNTL
 #endif  
 




--- misc/magsgtty.h	2001-09-21 17:15:45.000000000 +0200
+++ misc/magsgtty.h	2008-02-04 19:28:46.000000000 +0100
@@ -20,7 +20,9 @@
 
 #ifndef	_MAGSGTTY
 
-#if !defined(SYSV) && !defined(CYGWIN)
+#ifdef __FreeBSD__
+#include <termios.h>
+#elif !defined(SYSV) && !defined(CYGWIN)
 # ifdef	ALPHA
 # undef MAX
 # undef MIN

Lines 1-11 Link Here

(-)cad/magic/files/patch-misc::nicebort.c (-11 lines)
1	--- misc/niceabort.c.orig Sat Jan 13 07:13:00 2001
2	+++ misc/niceabort.c Fri Oct 11 23:38:53 2002
3	@@ -52,7 +52,7 @@
4	bool AbortFatal = FALSE;
5
6	/* For lint */
7	-long time();
8	+time_t time();
9	char *ctime();
10
11	void

Lines 1-11 Link Here

(-)cad/magic/files/patch-resis::ResRex.c (-11 lines)
1	--- resis/ResRex.c.orig Sat Sep 22 00:15:50 2001
2	+++ resis/ResRex.c Mon Oct 14 20:50:32 2002
3	@@ -10,7 +10,7 @@
4	/* It is hard to get the value of MAXFLOAT in a portable manner. */
5	#if defined(ibm032) \|\| defined(CYGWIN)
6	#define MAXFLOAT ((float)3.40282346638528860e+38)
7	-#elif !defined(__NetBSD__)
8	+#elif !defined(__NetBSD__) && !defined(__FreeBSD__)
9	#include <values.h>
10	#endif
11




--- scmos/extract_template/scmosExt.tech.orig	Tue Dec  9 17:06:27 2003
+++ scmos/extract_template/scmosExt.tech	Tue Dec  9 17:05:57 2003
@@ -10,9 +10,10 @@
 
 
 /* Make sure local cap defs don't appear before regardless of what cpp does*/
-#ifdef M1ContactsAct|M1Contacts|PNplusCap|PolyCap|\
-	M1Cap|M2Cap|M3Cap|M1CapNoDiff|NdRes|PdRes|M1Res|\
-	PolyRes|M2Res|M3Res|nothing
+#if defined(M1ContactsAct) || defined(M1Contacts) || defined(PNplusCap) ||\
+    defined(PolyCap) || defined(M1Cap) || defined(M2Cap) || defined(M3Cap) ||\
+    defined(M1CapNoDiff) || defined(NdRes) || defined(PdRes) || defined(M1Res) ||\
+    defined(PolyRes) || defined(M2Res) || defined(M3Res) || defined(nothing)
 THERE_IS_AN_ERROR_SOME_LOCAL_CAPACITANCE_DEFINITIONS_HAVE_ALREADY_BEEN_DEFINED
 #endif
 
@@ -43,14 +44,14 @@
 #define	sideOverlap(l1,sep,l2,cap,shield)\
 	sideoverlap	l1	sep	l2	cap	shield
 
-#else /* V5 */
+#else
 
 #define	planeOrder(l,ord)	
 #define	noplaneOrdering	
 #define	sideOverlap(l1,sep,l2,cap,shield)\
 	sideoverlap	l1	sep	l2	cap	
 
-#endif /* V5 */
+#endif
 
 
 #define	 extForSpice
@@ -69,7 +70,7 @@
 #include "scmosExt060_orb.tech"
 #include "scmosExt34.tech"
 #include "scmosExt26b.tech"
-#endif /* STANDARD */
+#endif
 
 #if defined(TIGHTMETAL)
 #include "scmosExt34.tech"




--- tech/tech.c.orig	Tue Dec  9 16:40:02 2003
+++ tech/tech.c	Tue Dec  9 16:40:18 2003
@@ -18,7 +18,7 @@
 
 #ifndef lint
 static char rcsid[] = "$Header: /ufs/repository/magic/tech/tech.c,v 1.3 2001/01/12 22:13:25 jsolomon Exp $";
-#endif  not lint
+#endif
 
 #include <stdio.h>
 #include <ctype.h>
@@ -31,8 +31,8 @@
 #include "utils/malloc.h"
 
 #ifndef NO_VARARGS
-#include <varargs.h>
-#endif  NO_VARARGS
+#include <stdarg.h>
+#endif
 
 global char *TechDefault = NULL;
 
@@ -415,19 +415,16 @@
  /*VARARGS0*/
 
 void
-TechError(va_alist)
-va_dcl
+TechError(char *fmt, ...)
 {
     va_list args;
-    char *fmt;
 
     TechPrintLine();
-    va_start(args);
-    fmt = va_arg(args, char *);
+    va_start(args, fmt);
     (void) GrVfprintf(stderr, fmt, args);
     va_end(args);
 }
-#else	NO_VARARGS
+#else
 
  /*VARARGS0*/
 
@@ -440,7 +437,7 @@
     (void) GrFprintf(stderr, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, 
 		     a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
 }
-#endif	NO_VARARGS
+#endif
 
 /* ================== Functions local to this module ================== */
 

Lines 1-8 Link Here

(-)cad/magic/files/patch-tech::tech.h (-8 lines)
1	--- tech/tech.h.orig Tue Dec 9 16:42:58 2003
2	+++ tech/tech.h Tue Dec 9 16:43:01 2003
3	@@ -23,4 +23,4 @@
4	/* ----------------- Exported variables and procedures ---------------- */
5
6	extern char TechDefault; / Name of default technology */
7	-extern void TechError();
8	+extern void TechError(char *fmt, ...);




--- textio/textio.h.orig	Tue Dec  9 16:44:37 2003
+++ textio/textio.h	Tue Dec  9 16:56:52 2003
@@ -29,10 +29,10 @@
 #endif
 
 /* printing procedures */
-extern void TxPrintf();
+/* extern void TxPrintf(); */
 extern bool TxPrintOn();  	/* enables TxPrintf output */
 extern bool TxPrintOff();	/* disables TxPrintf output */
-extern void TxError();
+/* extern void TxError(); */
 extern void TxFlush();
 extern void TxVisChar();
 extern void TxUseMore();




--- textio/textioInt.h.orig	Tue Dec  9 16:41:17 2003
+++ textio/textioInt.h	Tue Dec  9 16:41:29 2003
@@ -48,7 +48,7 @@
 #define TX_LONG_CMD2	';'	/* Alternate way of invoking a long command. */
 
 /* all of the state associated with a tty terminal */
-#if !defined(SYSV) && !defined(CYGWIN)
+#if !defined(__FreeBSD__) && !defined(SYSV) && !defined(CYGWIN)
 typedef struct {
     struct sgttyb tx_i_sgtty;
     struct tchars tx_i_tchars;
@@ -56,4 +56,4 @@
 #endif SYSV
 
 extern int TxGetInputEvent();
-extern void txFprintfBasic();
+extern void txFprintfBasic(FILE *f, char *fmt, ... );




--- textio/txInput.c	2001-09-21 17:15:56.000000000 +0200
+++ textio/txInput.c	2008-02-04 19:26:44.000000000 +0100
@@ -1027,7 +1027,16 @@
  * ----------------------------------------------------------------------------
  */
 
-#if defined(SYSV) || defined(CYGWIN)
+#ifdef __FreeBSD__
+void
+txGetTermState(buf)
+    struct termios *buf;
+
+{
+    tcgetattr( fileno( stdin ), buf);
+}
+
+#elif defined(SYSV) || defined(CYGWIN)
 void
 txGetTermState(buf)
     struct termio *buf;
@@ -1066,13 +1075,17 @@
 
 void
 txSetTermState(buf)
-#if defined(SYSV) || defined(CYGWIN)
+#ifdef __FreeBSD__
+    struct termios *buf;
+#elif defined(SYSV) || defined(CYGWIN)
     struct termio *buf;
 #else
     txTermState *buf;
 #endif SYSV
 {
-#if defined(SYSV) || defined(CYGWIN)
+#ifdef __FreeBSD__
+    tcsetattr( fileno(stdin), TCSAFLUSH, buf );
+#elif defined(SYSV) || defined(CYGWIN)
     ioctl( fileno(stdin), TCSETAF, buf );
 #else
     /* set the current terminal characteristics */
@@ -1100,13 +1113,15 @@
 
 void
 txInitTermRec(buf)
-#if defined(SYSV) || defined(CYGWIN)
+#ifdef __FreeBSD__
+    struct termios *buf;
+#elif defined(SYSV) || defined(CYGWIN)
     struct termio *buf;
 #else
     txTermState *buf;
 #endif SYSV
 {
-#if defined(SYSV) || defined(CYGWIN)
+#if defined(__FreeBSD__) || defined(SYSV) || defined(CYGWIN)
     buf->c_lflag = ISIG;    /* raw: no echo and no processing, allow signals */
     buf->c_cc[ VMIN ] = 1;
     buf->c_cc[ VTIME ] = 0;
@@ -1124,7 +1139,9 @@
 
 
 
-#if defined(SYSV) || defined(CYGWIN)
+#ifdef __FreeBSD__
+struct termios closeTermState;
+#elif defined(SYSV) || defined(CYGWIN)
 struct termio closeTermState;
 #else
 static txTermState closeTermState;
@@ -1151,7 +1168,14 @@
 void
 txSaveTerm()
 {
-#if defined(SYSV) || defined(CYGWIN)
+#ifdef __FreeBSD__
+    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;
+#elif defined(SYSV) || defined(CYGWIN)
     ioctl( fileno( stdin ), TCGETA, &closeTermState);
     txEraseChar = closeTermState.c_cc[VERASE];
     txKillChar =  closeTermState.c_cc[VKILL];
@@ -1192,7 +1216,9 @@
 void
 TxSetTerminal()
 {
-#if defined(SYSV) || defined(CYGWIN)
+#ifdef __FreeBSD__
+    struct termios buf;
+#elif defined(SYSV) || defined(CYGWIN)
     struct termio buf;
 #else
     txTermState buf;




--- textio/txOutput.c.orig	Tue Dec  9 16:38:35 2003
+++ textio/txOutput.c	Tue Dec  9 16:39:01 2003
@@ -18,7 +18,7 @@
 
 #ifndef lint
 static char rcsid[] = "$Header: /ufs/repository/magic/textio/txOutput.c,v 1.4 2001/02/21 15:52:52 tim Exp $";
-#endif  not lint
+#endif
 
 #include <stdio.h>
 #ifndef	SYSV
@@ -26,7 +26,7 @@
 #include <strings.h>
 #else
 #include <string.h>
-#endif SYSV
+#endif
 #include <sys/stat.h>
 #include <unistd.h>
 #include "misc/magsgtty.h"
@@ -42,8 +42,8 @@
 #include "utils/malloc.h"
 
 #ifndef	NO_VARARGS
-#include <varargs.h>
-#endif	NO_VARARGS
+#include <stdarg.h>
+#endif
 
 /* When a pipe has been opened to "more", the following variables
  * keep track of the file and process.  The "TxMoreFile" variable is
@@ -82,20 +82,15 @@
  /*VARARGS0*/
 
 void
-txFprintfBasic(va_alist)
-va_dcl
+txFprintfBasic(FILE *f, char *fmt, ...)
 {
     va_list args;
-    char *fmt;
-    FILE *f;
 
-    va_start(args);
-    f = va_arg(args, FILE *);
-    fmt = va_arg(args, char *);
+    va_start(args, fmt);
     (void) GrVfprintf(f, fmt, args);
     va_end(args);
 }
-#else	NO_VARARGS
+#else
 
  /*VARARGS0*/
 
@@ -107,7 +102,7 @@
     (void) GrFprintf(f, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, 
 		     a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
 }
-#endif	NO_VARARGS
+#endif
 
 
 /*
@@ -135,11 +130,9 @@
  /*VARARGS0*/
 
 void
-TxPrintf(va_alist)
-va_dcl
+TxPrintf(char *fmt, ...)
 {
     va_list args;
-    char *fmt;
     FILE *f;
 
     if (txPrintFlag)
@@ -156,16 +149,14 @@
 	if (txHavePrompt)
 	{
 	    TxUnPrompt();
-	    va_start(args);
-	    fmt = va_arg(args, char *);
+	    va_start(args, fmt);
 	    (void) GrVfprintf(f, fmt, args);
 	    va_end(args);
 	    TxPrompt();
 	}
 	else 
 	{
-	    va_start(args);
-	    fmt = va_arg(args, char *);
+	    va_start(args, fmt);
 	    (void) GrVfprintf(f, fmt, args);
 	    va_end(args);
 	}
@@ -173,7 +164,7 @@
 	return;
     }
 }
-#else	NO_VARARGS
+#else
 
  /*VARARGS1*/
 
@@ -212,7 +203,7 @@
 	return;
     }
 }
-#endif	NO_VARARGS
+#endif
 
 
 /*
@@ -306,11 +297,9 @@
 #ifndef	NO_VARARGS
 
 void
-TxError(va_alist)
-va_dcl
+TxError(char *fmt, ...)
 {
     va_list args;
-    char *fmt;
     FILE *f;
 
     (void) fflush(stdout);
@@ -321,22 +310,20 @@
     if (txHavePrompt)
     {
 	TxUnPrompt();
-	va_start(args);
-	fmt = va_arg(args, char *);
+	va_start(args, fmt);
 	(void) GrVfprintf(f, fmt, args);
 	va_end(args);
 	TxPrompt();
     }
     else {
-	va_start(args);
-	fmt = va_arg(args, char *);
+	va_start(args, fmt);
 	(void) GrVfprintf(f, fmt, args);
 	va_end(args);
     }
     (void) fflush(stderr);
 }
 
-#else	NO_VARARGS
+#else
 
  /*VARARGS1*/
 
@@ -364,7 +351,7 @@
     }
     (void) fflush(stderr);
 }
-#endif	NO_VARARGS
+#endif
 
 
 /*
@@ -482,7 +469,7 @@
     int status;
 #else
     union wait status;
-#endif SYSV
+#endif
 */
     /* TxMoreFile may be NULL if the "more" executable was not found */
     if (TxMoreFile == NULL) return;
@@ -532,5 +519,5 @@
 
     return (ferror(iop) ? EOF : len);
 }
-#endif  NEED_VFPRINTF
+#endif
 




--- utils/LIBtextio.c.orig	Tue Dec  9 16:52:38 2003
+++ utils/LIBtextio.c	Tue Dec  9 16:52:53 2003
@@ -19,10 +19,10 @@
 
 #ifndef	lint
 static char rcsid[] = "$Header: /ufs/repository/magic/utils/LIBtextio.c,v 1.1.1.1 2000/03/29 18:35:16 rajit Exp $";
-#endif	not lint
+#endif
 
 #include <stdio.h>
-#include <varargs.h>
+#include <stdarg.h>
 
 /*
  * ----------------------------------------------------------------------------
@@ -65,15 +65,13 @@
  */
 
     /*VARARGS*/
-TxError(fmt, va_alist)
-    char *fmt;
-    va_dcl
+TxError(char *fmt, ... )
 {
     va_list ap;
  
     (void) fflush(stdout);
     (void) fflush(stderr);
-    va_start(ap);
+    va_start(ap, fmt);
     vfprintf(stderr, fmt, ap);
     va_end(ap);
     (void) fflush(stderr);
@@ -96,15 +94,13 @@
  */
 
     /*VARARGS*/
-TxPrintf(fmt, va_alist)
-    char *fmt;
-    va_dcl
+TxPrintf(char *fmt, ... )
 {
     va_list ap;
  
     (void) fflush(stderr);
     (void) fflush(stdout);
-    va_start(ap);
+    va_start(ap, fmt);
     vfprintf(stdout, fmt, ap);
     va_end(ap);
     (void) fflush(stdout);

Lines 5-8 Link Here

(-)cad/magic/pkg-descr (-1 / +1 lines)
5	administrator can create a dummy user named 'cad' with its home	5	administrator can create a dummy user named 'cad' with its home
6	directory set to the installation directory.	6	directory set to the installation directory.
7		7
8	WWW: http://vlsi.cornell.edu/magic/	8	WWW: http://opencircuitdesign.com/magic/




bin/XHelper7
bin/ext2sim
bin/ext2spice
bin/extcheck
bin/magic
bin/magicusage
bin/net2ir
bin/spice2sim
lib/libmpack.a
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/array.html
lib/magic/doc/html/box.html
lib/magic/doc/html/calma.html
lib/magic/doc/html/caption.html
lib/magic/doc/html/cellmanager.html
lib/magic/doc/html/cellname.html
lib/magic/doc/html/cellsearch.html
lib/magic/doc/html/center.html
lib/magic/doc/html/changetool.html
lib/magic/doc/html/channels.html
lib/magic/doc/html/cif.html
lib/magic/doc/html/clockwise.html
lib/magic/doc/html/closewindow.html
lib/magic/doc/html/closewrapper.html
lib/magic/doc/html/color/color.html
lib/magic/doc/html/color/load.html
lib/magic/doc/html/color/pushbutton.html
lib/magic/doc/html/color/save.html
lib/magic/doc/html/commands.html
lib/magic/doc/html/commands.list
lib/magic/doc/html/contact.html
lib/magic/doc/html/copy.html
lib/magic/doc/html/corner.html
lib/magic/doc/html/crash.html
lib/magic/doc/html/crashbackups.html
lib/magic/doc/html/crosshair.html
lib/magic/doc/html/cursor.html
lib/magic/doc/html/def.html
lib/magic/doc/html/delete.html
lib/magic/doc/html/deletecommandentry.html
lib/magic/doc/html/direction.html
lib/magic/doc/html/distance.html
lib/magic/doc/html/down.html
lib/magic/doc/html/drc.html
lib/magic/doc/html/dump.html
lib/magic/doc/html/edit.html
lib/magic/doc/html/element.html
lib/magic/doc/html/erase.html
lib/magic/doc/html/expand.html
lib/magic/doc/html/ext.html
lib/magic/doc/html/ext2sim.html
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
lib/magic/doc/html/findlabel.html
lib/magic/doc/html/flatten.html
lib/magic/doc/html/flush.html
lib/magic/doc/html/garoute.html
lib/magic/doc/html/gds.html
lib/magic/doc/html/get.html
lib/magic/doc/html/getcell.html
lib/magic/doc/html/getnode.html
lib/magic/doc/html/goto.html
lib/magic/doc/html/graphics/blpaper.gif
lib/magic/doc/html/graphics/cellmgr.gif
lib/magic/doc/html/graphics/cif_see.gif
lib/magic/doc/html/graphics/corner1.gif
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/techmgr.gif
lib/magic/doc/html/graphics/toolbar.gif
lib/magic/doc/html/graphics/writeall.gif
lib/magic/doc/html/grid.html
lib/magic/doc/html/help.html
lib/magic/doc/html/identify.html
lib/magic/doc/html/imacro.html
lib/magic/doc/html/initialize.html
lib/magic/doc/html/instance.html
lib/magic/doc/html/invoke.html
lib/magic/doc/html/iroute.html
lib/magic/doc/html/irsim.html
lib/magic/doc/html/label.html
lib/magic/doc/html/lef.html
lib/magic/doc/html/load.html
lib/magic/doc/html/logcommands.html
lib/magic/doc/html/macro.html
lib/magic/doc/html/maketoolbar.html
lib/magic/doc/html/measure.html
lib/magic/doc/html/move.html
lib/magic/doc/html/netlist/add.html
lib/magic/doc/html/netlist/cleanup.html
lib/magic/doc/html/netlist/cull.html
lib/magic/doc/html/netlist/dnet.html
lib/magic/doc/html/netlist/dterm.html
lib/magic/doc/html/netlist/extract.html
lib/magic/doc/html/netlist/find.html
lib/magic/doc/html/netlist/flush.html
lib/magic/doc/html/netlist/joinnets.html
lib/magic/doc/html/netlist/netlist.html
lib/magic/doc/html/netlist/print.html
lib/magic/doc/html/netlist/pushbutton.html
lib/magic/doc/html/netlist/ripup.html
lib/magic/doc/html/netlist/savenetlist.html
lib/magic/doc/html/netlist/shownet.html
lib/magic/doc/html/netlist/showterms.html
lib/magic/doc/html/netlist/trace.html
lib/magic/doc/html/netlist/verify.html
lib/magic/doc/html/netlist/writeall.html
lib/magic/doc/html/netlist.html
lib/magic/doc/html/openwindow.html
lib/magic/doc/html/openwrapper.html
lib/magic/doc/html/paint.html
lib/magic/doc/html/path.html
lib/magic/doc/html/peekbox.html
lib/magic/doc/html/plot.html
lib/magic/doc/html/plow.html
lib/magic/doc/html/polygon.html
lib/magic/doc/html/popbox.html
lib/magic/doc/html/popstack.html
lib/magic/doc/html/port.html
lib/magic/doc/html/promptload.html
lib/magic/doc/html/promptsave.html
lib/magic/doc/html/property.html
lib/magic/doc/html/pushbox.html
lib/magic/doc/html/pushbutton.html
lib/magic/doc/html/pushstack.html
lib/magic/doc/html/quit.html
lib/magic/doc/html/redo.html
lib/magic/doc/html/redraw.html
lib/magic/doc/html/render3d.html
lib/magic/doc/html/resumeall.html
lib/magic/doc/html/rotate.html
lib/magic/doc/html/route.html
lib/magic/doc/html/ruler.html
lib/magic/doc/html/save.html
lib/magic/doc/html/scalegrid.html
lib/magic/doc/html/scroll.html
lib/magic/doc/html/search.html
lib/magic/doc/html/see.html
lib/magic/doc/html/select.html
lib/magic/doc/html/setpoint.html
lib/magic/doc/html/shell.html
lib/magic/doc/html/sideways.html
lib/magic/doc/html/sleep.html
lib/magic/doc/html/snap.html
lib/magic/doc/html/specialopen.html
lib/magic/doc/html/spliterase.html
lib/magic/doc/html/splitpaint.html
lib/magic/doc/html/startup.html
lib/magic/doc/html/straighten.html
lib/magic/doc/html/stretch.html
lib/magic/doc/html/suspendall.html
lib/magic/doc/html/tag.html
lib/magic/doc/html/tech.html
lib/magic/doc/html/techmanager.html
lib/magic/doc/html/template.html
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/unmeasure.html
lib/magic/doc/html/updatedisplay.html
lib/magic/doc/html/upsidedown.html
lib/magic/doc/html/version.html
lib/magic/doc/html/view.html
lib/magic/doc/html/what.html
lib/magic/doc/html/wind3d/cif.html
lib/magic/doc/html/wind3d/closewindow.html
lib/magic/doc/html/wind3d/cutbox.html
lib/magic/doc/html/wind3d/defaults.html
lib/magic/doc/html/wind3d/help.html
lib/magic/doc/html/wind3d/level.html
lib/magic/doc/html/wind3d/refresh.html
lib/magic/doc/html/wind3d/render.html
lib/magic/doc/html/wind3d/scroll.html
lib/magic/doc/html/wind3d/see.html
lib/magic/doc/html/wind3d/view.html
lib/magic/doc/html/wind3d/zoom.html
lib/magic/doc/html/windowborder.html
lib/magic/doc/html/windowcaption.html
lib/magic/doc/html/windownames.html
lib/magic/doc/html/windowscrollbars.html
lib/magic/doc/html/wire.html
lib/magic/doc/html/wizard/coord.html
lib/magic/doc/html/wizard/crash.html
lib/magic/doc/html/wizard/extract.html
lib/magic/doc/html/wizard/files.html
lib/magic/doc/html/wizard/grstats.html
lib/magic/doc/html/wizard/pause.html
lib/magic/doc/html/wizard/plow.html
lib/magic/doc/html/wizard/psearch.html
lib/magic/doc/html/wizard/showtech.html
lib/magic/doc/html/wizard/tilestats.html
lib/magic/doc/html/wizard/tsearch.html
lib/magic/doc/html/wizard/watch.html
lib/magic/doc/html/wizard/winddebug.html
lib/magic/doc/html/wizard/winddump.html
lib/magic/doc/html/writeall.html
lib/magic/doc/html/xload.html
lib/magic/doc/html/xview.html
lib/magic/doc/html/zoom.html
lib/magic/doc/introduction.ps
lib/magic/doc/maint1.ps
lib/magic/doc/maint2.ps

lib/magic/doc/tutscm2.ps
lib/magic/doc/tutscm3.ps
lib/magic/doc/tutscm4.ps
lib/magic/doc/tuttcl1.ps
lib/magic/doc/tuttcl2.ps
lib/magic/doc/tuttcl3.ps
lib/magic/doc/tuttcl4.ps
lib/magic/doc/tuttcl5.ps
lib/magic/doc/tutwrl1.ps
lib/magic/sys/.magicrc
lib/magic/scm/default.scm
lib/magic/scm/draw.scm
lib/magic/scm/drc.scm
lib/magic/scm/gate.scm
lib/magic/scm/help.scm
lib/magic/scm/label.scm
lib/magic/scm/layout.scm
lib/magic/scm/prs.scm
lib/magic/scm/sel.scm
lib/magic/scm/stack.scm
lib/magic/sys/.magic
lib/magic/sys/bw.glyphs
lib/magic/sys/color.glyphs
lib/magic/sys/gdsquery.tech
lib/magic/sys/magicps.pro
lib/magic/sys/minimum.tech
lib/magic/sys/mos.24bit.dstyle
lib/magic/sys/mos.24bit.std.cmap
lib/magic/sys/mos.7bit.dstyle
lib/magic/sys/mos.7bit.mraster.cmap
lib/magic/sys/mos.7bit.mraster_dstyle
lib/magic/sys/mos.7bit.std.cmap
lib/magic/sys/mos.OpenGL.dstyle
lib/magic/sys/mos.OpenGL.std.cmap
lib/magic/sys/scmos-sub.tech
lib/magic/sys/scmos-tm.tech
lib/magic/sys/scmos.tech
lib/magic/sys/scmosWR.tech
lib/magic/sys/vfont.B.12
lib/magic/sys/vfont.I.12
lib/magic/sys/vfont.R.8
lib/magic/sys/windows11.glyphs
lib/magic/sys/windows14.glyphs
lib/magic/sys/windows22.glyphs
lib/magic/sys/windows7.glyphs
lib/magic/tcl/bitmaps/down.xbm
lib/magic/tcl/bitmaps/left.xbm
lib/magic/tcl/bitmaps/right.xbm
lib/magic/tcl/bitmaps/up.xbm
lib/magic/tcl/bitmaps/zoom.xbm
lib/magic/tcl/console.tcl
lib/magic/tcl/exttosim.so
lib/magic/tcl/exttospice.so
lib/magic/tcl/magic.tcl
lib/magic/tcl/magicdnull
lib/magic/tcl/magicexec
lib/magic/tcl/mazeroute.tcl
lib/magic/tcl/strip_reflibs.tcl
lib/magic/tcl/tclmagic.so
lib/magic/tcl/techbuilder.tcl
lib/magic/tcl/tkcon.tcl
lib/magic/tcl/tkshell.tcl
lib/magic/tcl/toolkit.tcl
lib/magic/tcl/tools.tcl
lib/magic/tcl/wrapper.tcl
lib/magic/tutorial/m3a.mag
lib/magic/tutorial/maint2a.mag
lib/magic/tutorial/tut1.mag

lib/magic/tutorial/tut11a.ext
lib/magic/tutorial/tut11a.mag
lib/magic/tutorial/tut11a.nodes
lib/magic/tutorial/tut11a.rsm
lib/magic/tutorial/tut11a.sim
lib/magic/tutorial/tut11b.ext
lib/magic/tutorial/tut11b.mag

lib/magic/tutorial/tut9b.mag
lib/magic/tutorial/tut9x.mag
lib/magic/tutorial/tut9y.mag
lib/mpack.h
@dirrm lib/magic/tutorial
@dirrm lib/magic/tcl/bitmaps
@dirrm lib/magic/tcl
@dirrm lib/magic/sys
@dirrm lib/magic/doc/html/wizard
@dirrm lib/magic/doc/html/wind3d
@dirrm lib/magic/doc/html/netlist
@dirrm lib/magic/doc/html/graphics
@dirrm lib/magic/doc/html/color
@dirrm lib/magic/doc/html
@dirrm lib/magic/doc
@dirrm lib/magic

Return to bug 160086

Lines 6-74 Link Here

(-)cad/magic/Makefile (-53 / +38 lines)
6	#	6	#
7		7
8	PORTNAME= magic	8	PORTNAME= magic
9	PORTVERSION= 7.1	9	PORTVERSION= 7.5.213
10	PORTREVISION= 4
11	CATEGORIES= cad	10	CATEGORIES= cad
12	MASTER_SITES= http://vlsi.cornell.edu/magic/	11	MASTER_SITES= http://opencircuitdesign.com/magic/archive/
		12	EXTRACT_SUFX= .tgz
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= An interactive editor for VLSI layouts	15	COMMENT= An interactive editor for VLSI layouts
16		16
17	USE_XORG= x11	17	LIB_DEPENDS+= BLT24.3:${PORTSDIR}/x11-toolkits/blt
		18
		19	CONFIGURE_WRKSRC= ${WRKSRC}/scripts
		20
		21	USE_XORG= ice xext xi xmu
		22	USE_GL= gl
		23	USE_TCL_BUILD= yes
		24	USE_TK_BUILD= yes
		25	USE_TCL= yes
		26	USE_TK= yes
18	USE_GMAKE= yes	27	USE_GMAKE= yes
19	MAKE_ENV= CADDIR="${PREFIX}"	28	GNU_CONFIGURE= yes
20	ALL_TARGET= mains	29	CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
		30	CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR}
		31	ALL_TARGET= tcllibrary
		32	MAKE_JOBS_UNSAFE=yes
		33
		34	MAN1= ext2sim.1 ext2spice.1 extcheck.1 magic.1
		35	MAN5= cmap.5 displays.5 dlys.5 dstyle.5 ext.5 glyphs.5 mag.5 \
		36	net.5 sim.5
21		37
22	BINS= XHelper7 ext2sim ext2spice extcheck magic magicusage net2ir	38	CPPFLAGS= -I${LOCALBASE}/include
23	MAN1= ext2sim.1 ext2spice.1 extcheck.1 magic.1 magicusage.1	39	LDFLAGS= -L${LOCALBASE}/lib
24	MAN3= dqueue.3 extflat.3 geometry.3 hash.3 heap.3 libmalloc.3 list.3 \
25	magicutils.3 malloc.3 path.3 runstats.3 set.3 show.3 stack.3 string.3
26	MAN5= cmap.5 displays.5 dlys.5 dstyle.5 ext.5 glyphs.5 magic.5 net.5 sim.5
27	MAN8= prleak.8
28		40
29	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
30		42
31	post-patch:	43	post-patch:
32	@${EGREP} -lr '^#endif[^$$]' ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} -e \	44	@${REINPLACE_CMD} -e \
33	's\|\(^#endif\).*\|\1\|g; \	45	's\|^#!.*\|#!${AWK} -f\|' ${WRKSRC}/ext2spice/spice2sim
34	s\|\(^#else\).*\|\1\|g; \	46	@${REINPLACE_CMD} -e \
35	s\|include.*<varargs\.h>\|include <stdarg\.h>\|'	47	's\|TCL_LIB_NAME=.*\|TCL_LIB_NAME="tcl${TCL_VER:S/.//}"\|g ; \
36	@${FIND} ${WRKSRC} -name "Makefile" \| ${XARGS} ${REINPLACE_CMD} -e \	48	s\|TK_LIB_NAME=.*\|TK_LIB_NAME="tk${TK_VER:S/.//}"\|g ; \
37	's\|make \|\$$\{MAKE\} \|g'	49	s\|wish$${TK_VERSION}\|${WISH:T}\|g ; \
38		50	s\|tclsh$${TK_VERSION}\|${TCLSH:T}\|g ; \
39	do-configure:	51	s\|-l/usr/X11R6/include\|-I${LOCALBASE}/include\|g' ${CONFIGURE_WRKSRC}/configure
40	@cd ${WRKSRC} && ${WRKSRC}/scripts/makedbh \	52	@${REINPLACE_CMD} -e \
41	database/database.h.in database/database.h	53	'/CFLAGS/s\| -pg \| \|' ${WRKSRC}/tcltk/Makefile
42	@${CP} ${FILESDIR}/defs.mak ${WRKSRC}/defs.mak	54	@${REINPLACE_CMD} -e \
43		55	's\|^#!.*\|#!${TCLSH}\|' ${WRKSRC}/tcltk/strip_reflibs.tcl
44	post-install:	56	@${REINPLACE_CMD} -e \
45	@${CHMOD} ${BINMODE} ${PREFIX}/bin/spice2sim	57	's\|^#!.*\|#!${WISH}\|' ${WRKSRC}/tcltk/tkshell.tcl
46	@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/bin/spice2sim
47	.for f in ${BINS}
48	@${CHMOD} ${BINMODE} ${PREFIX}/bin/${f}
49	@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/bin/${f}
50	@${STRIP_CMD} ${PREFIX}/bin/${f}
51	.endfor
52	.for f in ${MAN1}
53	@${CHMOD} ${MANMODE} ${PREFIX}/man/man1/${f}
54	@${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/man/man1/${f}
55	.endfor
56	.for f in ${MAN3}
57	@${CHMOD} ${MANMODE} ${PREFIX}/man/man3/${f}
58	@${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/man/man3/${f}
59	.endfor
60	.for f in ${MAN5}
61	@${CHMOD} ${MANMODE} ${PREFIX}/man/man5/${f}
62	@${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/man/man5/${f}
63	.endfor
64	.for f in ${MAN8}
65	@${CHMOD} ${MANMODE} ${PREFIX}/man/man8/${f}
66	@${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/man/man8/${f}
67	.endfor
68	@${CHMOD} -R a+rX,go-w ${PREFIX}/lib/magic
69	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/magic
70	@${CHMOD} ${SHAREMODE} ${PREFIX}/lib/mpack.h ${PREFIX}/lib/libmpack.a
71	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/mpack.h \
72	${PREFIX}/lib/libmpack.a
73		58
74	.include <bsd.port.post.mk>	59	.include <bsd.port.post.mk>

Lines 1-40 Link Here

(-)cad/magic/files/defs.mak (-40 lines)
1	# $FreeBSD: ports/cad/magic/files/defs.mak,v 1.2 2008/04/19 17:46:54 miwi Exp $
2
3	SHELL = /bin/sh
4
5	CADDIR = ${PREFIX}
6	BINDIR = ${CADDIR}/bin
7	LIBDIR = ${CADDIR}/lib
8	MANDIR = ${CADDIR}/man
9	SYSDIR = ${CADDIR}/lib/magic/sys
10	SCMDIR = ${CADDIR}/lib/magic/scm
11
12	SCRIPTS = ${MAGICDIR}/scripts
13
14	RM = rm -f
15	CP = cp
16	AR = ar
17	ARFLAGS = crv
18	LD = ld -r
19	RANLIB = ranlib
20
21	CPP = /usr/bin/cpp -P -traditional
22	CPPFLAGS = -I. -I${MAGICDIR}
23	DFLAGS = -DFILE_LOCKS -DHAVE_READLINE -DNONMANHATTAN -DUSE_NEW_MACROS
24
25	READLINE_DEFS =
26	READLINE_LIBS = -lreadline -ltermcap
27
28	DEPEND_FLAG = -MM
29	DEPEND_FILE = Depend
30
31	GR_CFLAGS = -I${LOCALBASE}/include
32	GR_DFLAGS = -DX11 -DXLIB -DX11HELP_PROG=\"${X11HELP_PROG}\"
33	GR_LIBS = -L${LOCALBASE}/lib -lX11
34	GR_SRCS = ${X11_SRCS}
35	GR_HELPER_SRCS = ${X11HELPER_SRCS}
36	GR_HELPER_PROG = ${X11HELP_PROG}
37
38	OBJS = ${SRCS:.c=.o}
39	LIB_OBJS = ${LIB_SRCS:.c=.o}
40	CLEANS = ${OBJS} ${LIB_OBJS} lib${MODULE}.a lib${MODULE}.o ${MODULE}

Lines 1-46 Link Here

(-)cad/magic/files/patch-ext2spice::ext2spice.c (-46 lines)
1	--- ext2spice/ext2spice.c.orig Tue Dec 9 16:53:56 2003
2	+++ ext2spice/ext2spice.c Tue Dec 9 16:55:34 2003
3	@@ -18,7 +18,7 @@
4
5	#include <stdio.h>
6	#include <ctype.h>
7	-#include <varargs.h>
8	+#include <stdarg.h>
9	#include "misc/magic.h"
10	#include "utils/malloc.h"
11	#include "utils/geometry.h"
12	@@ -316,7 +316,7 @@
13	#ifdef free_all_mem
14	EFFlatDone();
15	EFDone();
16	-#endif free_all_mem
17	+#endif
18
19	printf("Memory used: %s\n", RunStats(RS_MEM, NULL, NULL));
20	exit (0);
21	@@ -1586,22 +1586,19 @@
22	}
23
24	/* debugging stuff */
25	-#include <varargs.h>
26	+#include <stdarg.h>
27
28	#define DBG 1
29
30	-DBPRINT( va_alist )
31	- va_dcl
32	+DBPRINT( char *fmt, ... )
33	{
34	va_list args;
35	- char *fmt;
36	FILE *fp;
37	char buff[ 300 ];
38
39	if ( DBG ) {
40	- va_start( args );
41	+ va_start( args, fmt );
42	fp = stderr ;
43	- fmt = va_arg( args, char * );
44	(void) vsprintf( buff, fmt, args );
45	va_end( args );
46

Lines 1-16 Link Here

(-)cad/magic/files/patch-extflat::EFint.h (-16 lines)
1	--- extflat/EFint.h.orig Tue Dec 9 16:34:04 2003
2	+++ extflat/EFint.h Tue Dec 9 16:33:35 2003
3	@@ -21,7 +21,7 @@
4
5	#ifndef _MAGIC
6	int err0 = Need_to_include_misc/magic_header;
7	-#endif _MAGIC
8	+#endif
9
10
11	/*
12	@@ -306,3 +306,4 @@
13	extern Void efBuildConnect();
14	extern Void efBuildResistor();
15	extern Void efBuildCap();
16	+extern Void efReadError(char *fmt, ...);

Lines 1-34 Link Here

(-)cad/magic/files/patch-extflat::EFread.c (-34 lines)
1	--- extflat/EFread.c.orig Tue Dec 9 16:24:57 2003
2	+++ extflat/EFread.c Tue Dec 9 16:25:13 2003
3	@@ -19,12 +19,12 @@
4
5	#ifndef lint
6	static char rcsid[] = "$Header: /ufs/repository/magic/extflat/EFread.c,v 1.2 2001/01/12 22:12:35 jsolomon Exp $";
7	-#endif not lint
8	+#endif
9
10	#include <stdio.h>
11	#include <ctype.h>
12	#include <stdlib.h>
13	-#include <varargs.h>
14	+#include <stdarg.h>
15	#include "misc/magic.h"
16	#include "utils/geometry.h"
17	#include "utils/hash.h"
18	@@ -534,14 +534,12 @@
19	*/
20
21	/VARARGS1/
22	-efReadError(fmt, va_alist)
23	- char *fmt;
24	- va_dcl
25	+efReadError(char *fmt, ... )
26	{
27	va_list args;
28
29	(void) printf("%s, line %d: ", efReadFileName, efReadLineNum);
30	- va_start(args);
31	+ va_start(args, fmt);
32	vfprintf(stdout, fmt, args);
33	va_end(args);
34	(void) fflush(stdout);

Lines 1-161 Link Here

(-)cad/magic/files/patch-magic::proto.magic (-161 lines)
1	--- magic/proto.magic.orig Tue Dec 9 16:50:51 2003
2	+++ magic/proto.magic Tue Dec 9 16:51:06 2003
3	@@ -1,12 +1,4 @@
4	-# $(CAD_HOME)/lib/sys/.magic
5	-# System wide start up file for magic, defines default macros.
6	-#
7	-# rcsid $Header: /ufs/repository/magic/magic/proto.magic,v 1.4 2001/09/26 18:24:39 tim Exp $
8	-#
9	#ifndef USE_NEW_MACROS
10	-###############################################################################
11	-# Default .magic macro file (original)
12	-###############################################################################
13	echo ""
14	macro s "select"
15	macro S "select more"
16	@@ -49,104 +41,75 @@
17	macro " " "tool"
18	macro '' "iroute route -dBox"
19	macro '' "iroute route -dSelection"
20	-#else (USE_NEW_MACROS)
21	-###############################################################################
22	-# Default .magic macro file (new macros)
23	-###############################################################################
24	-# A key
25	+#else
26	macro a "select visible"
27	macro A "select more visible"
28	macro '' "select less visible"
29	-# B key
30	macro b "box"
31	macro B "findbox"
32	-# C key
33	macro c "copy"
34	-# D key
35	macro d "delete"
36	macro '' "erase $"
37	-# E key
38	macro e "edit"
39	-# F key
40	macro f "sideways"
41	macro F "upsidedown"
42	-# G key
43	macro g "grid"
44	macro G "grid 2"
45	-# I key
46	macro i "select cell"
47	macro I "select more cell"
48	#ifdef XLIB
49	macro Control_XK_i "select less cell"
50	#endif
51	-# L key
52	#ifdef USE_READLINE
53	imacro l "label "
54	#endif
55	macro L "shell ls"
56	macro '' "redraw"
57	-# M key
58	macro m "move"
59	macro M "stretch"
60	-# N key
61	macro '' ""
62	-# O key
63	macro o "openwindow"
64	macro O "closewindow"
65	-# P key
66	#ifdef USE_READLINE
67	imacro p "paint "
68	#endif
69	-# Q key
70	#ifdef XLIB
71	macro Control_Shift_XK_q "quit"
72	#endif
73	-# R key
74	macro r "clockwise"
75	macro R "clockwise 270"
76	macro '' "clockwise 180"
77	-# S key
78	macro s "select"
79	macro S "select more"
80	macro '' "select less"
81	#ifdef XLIB
82	macro Control_Shift_XK_s "undo ; select"
83	#endif
84	-# U key
85	macro u "undo"
86	macro U "redo"
87	-# V key
88	macro v "view"
89	macro V "xview"
90	-# W key
91	macro w "writeall"
92	macro W "writeall force"
93	-# X key
94	macro x "expand"
95	macro X "unexpand"
96	macro '' "expand toggle"
97	-# Z key
98	macro z "zoom .5"
99	macro Z "zoom 2"
100	macro '' "findbox zoom"
101	#ifdef XLIB
102	macro Control_Shift_XK_z "center"
103	#endif
104	-# Question mark
105	macro ? "drc why"
106	macro / "select area; what ; select clear"
107	-# Comma key
108	macro , "select clear"
109	-# Exclamation mark
110	#ifdef USE_READLINE
111	imacro ! "shell "
112	#endif
113	-# Space bar
114	macro " " "tool"
115	#ifdef XLIB
116	macro Shift_XK_space "tool box"
117	macro Control_XK_space "tool wiring"
118	-# Arrow keys (X11 versions only)
119	macro XK_Left "scroll l .1"
120	macro Shift_XK_Left "scroll l 1"
121	macro Control_XK_Left "box +l 1"
122	@@ -163,8 +126,6 @@
123	macro Shift_XK_Down "scroll d 1"
124	macro Control_XK_Down "box +d 1"
125	macro Control_Shift_XK_Down "box -u 1"
126	-# Keypad keys (X11 versions only)
127	-# Functions duplicated for use both with Num_Lock ON and OFF
128	macro XK_KP_Delete "box w 0; box h 0"
129	macro XK_KP_0 "box w 4; box h 4"
130	macro XK_KP_Insert "box w 4; box h 4"
131	@@ -208,7 +169,6 @@
132	macro XK_KP_Prior "move r 1; move u 1"
133	macro Shift_XK_KP_9 "stretch r 1; stretch u 1"
134	macro XK_9 "stretch r 1; stretch u 1"
135	-# Quick macro function keys for scmos tech (X11 versions only)
136	macro XK_F1 "paint ndiff"
137	macro XK_F2 "paint pdiff"
138	macro XK_F3 "paint poly"
139	@@ -222,19 +182,13 @@
140	macro XK_F11 "paint pc"
141	macro XK_F12 "paint via"
142	#endif
143	-#endif (USE_NEW_MACROS)
144	+#endif
145	#ifndef NO_PLOT
146	-#
147	-# additions for plot package
148	-#
149	plot parameter spoolCommand "echo use 'lpr -P%s -v -s -JMagic %s' to print plot"
150	plot parameter directory "."
151	-#endif (NO_PLOT)
152	+#endif
153	#ifndef NO_SCHEME_INTERPRETER
154	-#
155	-# additions for default scm path
156	-#
157	define scm-library-path "~cad/lib/magic/scm"
158	load-scm "default.scm"
159	load-scm "layout.scm"
160	-#endif (NO_SCHEME_INTERPRETER)
161	+#endif

Lines 1-33 Link Here

(-)cad/magic/files/patch-misc::magic.h (-33 lines)
1	--- misc/magic.h.orig Fri Sep 21 17:15:45 2001
2	+++ misc/magic.h Sat Jan 31 13:07:11 2004
3	@@ -18,6 +18,8 @@
4	* rcsid="$Header"
5	*/
6
7	+#include <machine/endian.h>
8	+
9	#define _MAGIC
10
11	/* Note: System files, such as "stdio.h" and "sys/types.h", should be
12	@@ -146,6 +148,12 @@
13	*
14	*/
15
16	+#if BYTE_ORDER == LITTLE_ENDIAN
17	+#define IS_LITTLE_ENDIAN
18	+#elif BYTE_ORDER == BIG_ENDIAN
19	+#define IS_BIG_ENDIAN
20	+#endif
21	+
22	#ifdef i386
23	#define IS_LITTLE_ENDIAN /* Intel x86 processors. */
24	#endif
25	@@ -224,7 +232,7 @@
26	#if defined(sun) && !defined(sparc)
27	# define NEED_MONCNTL
28	#endif
29	-#ifdef ALPHA
30	+#if defined(ALPHA) \|\| (defined(__alpha__) && defined(__FreeBSD__))
31	# define NEED_MONCNTL
32	#endif
33

Lines 1-13 Link Here

(-)cad/magic/files/patch-misc::magsgtty.h (-13 lines)
1	--- misc/magsgtty.h 2001-09-21 17:15:45.000000000 +0200
2	+++ misc/magsgtty.h 2008-02-04 19:28:46.000000000 +0100
3	@@ -20,7 +20,9 @@
4
5	#ifndef _MAGSGTTY
6
7	-#if !defined(SYSV) && !defined(CYGWIN)
8	+#ifdef __FreeBSD__
9	+#include <termios.h>
10	+#elif !defined(SYSV) && !defined(CYGWIN)
11	# ifdef ALPHA
12	# undef MAX
13	# undef MIN

Lines 1-42 Link Here

(-)cad/magic/files/patch-scmos::extract_template::scmosExt.tech (-42 lines)
1	--- scmos/extract_template/scmosExt.tech.orig Tue Dec 9 17:06:27 2003
2	+++ scmos/extract_template/scmosExt.tech Tue Dec 9 17:05:57 2003
3	@@ -10,9 +10,10 @@
4
5
6	/* Make sure local cap defs don't appear before regardless of what cpp does*/
7	-#ifdef M1ContactsAct\|M1Contacts\|PNplusCap\|PolyCap\|\
8	- M1Cap\|M2Cap\|M3Cap\|M1CapNoDiff\|NdRes\|PdRes\|M1Res\|\
9	- PolyRes\|M2Res\|M3Res\|nothing
10	+#if defined(M1ContactsAct) \|\| defined(M1Contacts) \|\| defined(PNplusCap) \|\|\
11	+ defined(PolyCap) \|\| defined(M1Cap) \|\| defined(M2Cap) \|\| defined(M3Cap) \|\|\
12	+ defined(M1CapNoDiff) \|\| defined(NdRes) \|\| defined(PdRes) \|\| defined(M1Res) \|\|\
13	+ defined(PolyRes) \|\| defined(M2Res) \|\| defined(M3Res) \|\| defined(nothing)
14	THERE_IS_AN_ERROR_SOME_LOCAL_CAPACITANCE_DEFINITIONS_HAVE_ALREADY_BEEN_DEFINED
15	#endif
16
17	@@ -43,14 +44,14 @@
18	#define sideOverlap(l1,sep,l2,cap,shield)\
19	sideoverlap l1 sep l2 cap shield
20
21	-#else /* V5 */
22	+#else
23
24	#define planeOrder(l,ord)
25	#define noplaneOrdering
26	#define sideOverlap(l1,sep,l2,cap,shield)\
27	sideoverlap l1 sep l2 cap
28
29	-#endif /* V5 */
30	+#endif
31
32
33	#define extForSpice
34	@@ -69,7 +70,7 @@
35	#include "scmosExt060_orb.tech"
36	#include "scmosExt34.tech"
37	#include "scmosExt26b.tech"
38	-#endif /* STANDARD */
39	+#endif
40
41	#if defined(TIGHTMETAL)
42	#include "scmosExt34.tech"

Lines 1-54 Link Here

(-)cad/magic/files/patch-tech::tech.c (-54 lines)
1	--- tech/tech.c.orig Tue Dec 9 16:40:02 2003
2	+++ tech/tech.c Tue Dec 9 16:40:18 2003
3	@@ -18,7 +18,7 @@
4
5	#ifndef lint
6	static char rcsid[] = "$Header: /ufs/repository/magic/tech/tech.c,v 1.3 2001/01/12 22:13:25 jsolomon Exp $";
7	-#endif not lint
8	+#endif
9
10	#include <stdio.h>
11	#include <ctype.h>
12	@@ -31,8 +31,8 @@
13	#include "utils/malloc.h"
14
15	#ifndef NO_VARARGS
16	-#include <varargs.h>
17	-#endif NO_VARARGS
18	+#include <stdarg.h>
19	+#endif
20
21	global char *TechDefault = NULL;
22
23	@@ -415,19 +415,16 @@
24	/VARARGS0/
25
26	void
27	-TechError(va_alist)
28	-va_dcl
29	+TechError(char *fmt, ...)
30	{
31	va_list args;
32	- char *fmt;
33
34	TechPrintLine();
35	- va_start(args);
36	- fmt = va_arg(args, char *);
37	+ va_start(args, fmt);
38	(void) GrVfprintf(stderr, fmt, args);
39	va_end(args);
40	}
41	-#else NO_VARARGS
42	+#else
43
44	/VARARGS0/
45
46	@@ -440,7 +437,7 @@
47	(void) GrFprintf(stderr, format, a1, a2, a3, a4, a5, a6, a7, a8, a9,
48	a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
49	}
50	-#endif NO_VARARGS
51	+#endif
52
53	/* ================== Functions local to this module ================== */
54

Lines 1-15 Link Here

(-)cad/magic/files/patch-textio::textio.h (-15 lines)
1	--- textio/textio.h.orig Tue Dec 9 16:44:37 2003
2	+++ textio/textio.h Tue Dec 9 16:56:52 2003
3	@@ -29,10 +29,10 @@
4	#endif
5
6	/* printing procedures */
7	-extern void TxPrintf();
8	+/* extern void TxPrintf(); */
9	extern bool TxPrintOn(); /* enables TxPrintf output */
10	extern bool TxPrintOff(); /* disables TxPrintf output */
11	-extern void TxError();
12	+/* extern void TxError(); */
13	extern void TxFlush();
14	extern void TxVisChar();
15	extern void TxUseMore();

Lines 1-17 Link Here

(-)cad/magic/files/patch-textio::textioInt.h (-17 lines)
1	--- textio/textioInt.h.orig Tue Dec 9 16:41:17 2003
2	+++ textio/textioInt.h Tue Dec 9 16:41:29 2003
3	@@ -48,7 +48,7 @@
4	#define TX_LONG_CMD2 ';' /* Alternate way of invoking a long command. */
5
6	/* all of the state associated with a tty terminal */
7	-#if !defined(SYSV) && !defined(CYGWIN)
8	+#if !defined(__FreeBSD__) && !defined(SYSV) && !defined(CYGWIN)
9	typedef struct {
10	struct sgttyb tx_i_sgtty;
11	struct tchars tx_i_tchars;
12	@@ -56,4 +56,4 @@
13	#endif SYSV
14
15	extern int TxGetInputEvent();
16	-extern void txFprintfBasic();
17	+extern void txFprintfBasic(FILE f, char fmt, ... );

Lines 1-96 Link Here

(-)cad/magic/files/patch-textio::txInput.c (-96 lines)
1	--- textio/txInput.c 2001-09-21 17:15:56.000000000 +0200
2	+++ textio/txInput.c 2008-02-04 19:26:44.000000000 +0100
3	@@ -1027,7 +1027,16 @@
4	* ----------------------------------------------------------------------------
5	*/
6
7	-#if defined(SYSV) \|\| defined(CYGWIN)
8	+#ifdef __FreeBSD__
9	+void
10	+txGetTermState(buf)
11	+ struct termios *buf;
12	+
13	+{
14	+ tcgetattr( fileno( stdin ), buf);
15	+}
16	+
17	+#elif defined(SYSV) \|\| defined(CYGWIN)
18	void
19	txGetTermState(buf)
20	struct termio *buf;
21	@@ -1066,13 +1075,17 @@
22
23	void
24	txSetTermState(buf)
25	-#if defined(SYSV) \|\| defined(CYGWIN)
26	+#ifdef __FreeBSD__
27	+ struct termios *buf;
28	+#elif defined(SYSV) \|\| defined(CYGWIN)
29	struct termio *buf;
30	#else
31	txTermState *buf;
32	#endif SYSV
33	{
34	-#if defined(SYSV) \|\| defined(CYGWIN)
35	+#ifdef __FreeBSD__
36	+ tcsetattr( fileno(stdin), TCSAFLUSH, buf );
37	+#elif defined(SYSV) \|\| defined(CYGWIN)
38	ioctl( fileno(stdin), TCSETAF, buf );
39	#else
40	/* set the current terminal characteristics */
41	@@ -1100,13 +1113,15 @@
42
43	void
44	txInitTermRec(buf)
45	-#if defined(SYSV) \|\| defined(CYGWIN)
46	+#ifdef __FreeBSD__
47	+ struct termios *buf;
48	+#elif defined(SYSV) \|\| defined(CYGWIN)
49	struct termio *buf;
50	#else
51	txTermState *buf;
52	#endif SYSV
53	{
54	-#if defined(SYSV) \|\| defined(CYGWIN)
55	+#if defined(__FreeBSD__) \|\| defined(SYSV) \|\| defined(CYGWIN)
56	buf->c_lflag = ISIG; /* raw: no echo and no processing, allow signals */
57	buf->c_cc[ VMIN ] = 1;
58	buf->c_cc[ VTIME ] = 0;
59	@@ -1124,7 +1139,9 @@
60
61
62
63	-#if defined(SYSV) \|\| defined(CYGWIN)
64	+#ifdef __FreeBSD__
65	+struct termios closeTermState;
66	+#elif defined(SYSV) \|\| defined(CYGWIN)
67	struct termio closeTermState;
68	#else
69	static txTermState closeTermState;
70	@@ -1151,7 +1168,14 @@
71	void
72	txSaveTerm()
73	{
74	-#if defined(SYSV) \|\| defined(CYGWIN)
75	+#ifdef __FreeBSD__
76	+ tcgetattr( fileno( stdin ), &closeTermState);
77	+ txEraseChar = closeTermState.c_cc[VERASE];
78	+ txKillChar = closeTermState.c_cc[VKILL];
79	+ TxEOFChar = closeTermState.c_cc[VEOF];
80	+ TxInterruptChar = closeTermState.c_cc[VINTR];
81	+ haveCloseState = TRUE;
82	+#elif defined(SYSV) \|\| defined(CYGWIN)
83	ioctl( fileno( stdin ), TCGETA, &closeTermState);
84	txEraseChar = closeTermState.c_cc[VERASE];
85	txKillChar = closeTermState.c_cc[VKILL];
86	@@ -1192,7 +1216,9 @@
87	void
88	TxSetTerminal()
89	{
90	-#if defined(SYSV) \|\| defined(CYGWIN)
91	+#ifdef __FreeBSD__
92	+ struct termios buf;
93	+#elif defined(SYSV) \|\| defined(CYGWIN)
94	struct termio buf;
95	#else
96	txTermState buf;

Lines 1-178 Link Here

(-)cad/magic/files/patch-textio::txOutput.c (-178 lines)
1	--- textio/txOutput.c.orig Tue Dec 9 16:38:35 2003
2	+++ textio/txOutput.c Tue Dec 9 16:39:01 2003
3	@@ -18,7 +18,7 @@
4
5	#ifndef lint
6	static char rcsid[] = "$Header: /ufs/repository/magic/textio/txOutput.c,v 1.4 2001/02/21 15:52:52 tim Exp $";
7	-#endif not lint
8	+#endif
9
10	#include <stdio.h>
11	#ifndef SYSV
12	@@ -26,7 +26,7 @@
13	#include <strings.h>
14	#else
15	#include <string.h>
16	-#endif SYSV
17	+#endif
18	#include <sys/stat.h>
19	#include <unistd.h>
20	#include "misc/magsgtty.h"
21	@@ -42,8 +42,8 @@
22	#include "utils/malloc.h"
23
24	#ifndef NO_VARARGS
25	-#include <varargs.h>
26	-#endif NO_VARARGS
27	+#include <stdarg.h>
28	+#endif
29
30	/* When a pipe has been opened to "more", the following variables
31	* keep track of the file and process. The "TxMoreFile" variable is
32	@@ -82,20 +82,15 @@
33	/VARARGS0/
34
35	void
36	-txFprintfBasic(va_alist)
37	-va_dcl
38	+txFprintfBasic(FILE f, char fmt, ...)
39	{
40	va_list args;
41	- char *fmt;
42	- FILE *f;
43
44	- va_start(args);
45	- f = va_arg(args, FILE *);
46	- fmt = va_arg(args, char *);
47	+ va_start(args, fmt);
48	(void) GrVfprintf(f, fmt, args);
49	va_end(args);
50	}
51	-#else NO_VARARGS
52	+#else
53
54	/VARARGS0/
55
56	@@ -107,7 +102,7 @@
57	(void) GrFprintf(f, format, a1, a2, a3, a4, a5, a6, a7, a8, a9,
58	a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
59	}
60	-#endif NO_VARARGS
61	+#endif
62
63
64	/*
65	@@ -135,11 +130,9 @@
66	/VARARGS0/
67
68	void
69	-TxPrintf(va_alist)
70	-va_dcl
71	+TxPrintf(char *fmt, ...)
72	{
73	va_list args;
74	- char *fmt;
75	FILE *f;
76
77	if (txPrintFlag)
78	@@ -156,16 +149,14 @@
79	if (txHavePrompt)
80	{
81	TxUnPrompt();
82	- va_start(args);
83	- fmt = va_arg(args, char *);
84	+ va_start(args, fmt);
85	(void) GrVfprintf(f, fmt, args);
86	va_end(args);
87	TxPrompt();
88	}
89	else
90	{
91	- va_start(args);
92	- fmt = va_arg(args, char *);
93	+ va_start(args, fmt);
94	(void) GrVfprintf(f, fmt, args);
95	va_end(args);
96	}
97	@@ -173,7 +164,7 @@
98	return;
99	}
100	}
101	-#else NO_VARARGS
102	+#else
103
104	/VARARGS1/
105
106	@@ -212,7 +203,7 @@
107	return;
108	}
109	}
110	-#endif NO_VARARGS
111	+#endif
112
113
114	/*
115	@@ -306,11 +297,9 @@
116	#ifndef NO_VARARGS
117
118	void
119	-TxError(va_alist)
120	-va_dcl
121	+TxError(char *fmt, ...)
122	{
123	va_list args;
124	- char *fmt;
125	FILE *f;
126
127	(void) fflush(stdout);
128	@@ -321,22 +310,20 @@
129	if (txHavePrompt)
130	{
131	TxUnPrompt();
132	- va_start(args);
133	- fmt = va_arg(args, char *);
134	+ va_start(args, fmt);
135	(void) GrVfprintf(f, fmt, args);
136	va_end(args);
137	TxPrompt();
138	}
139	else {
140	- va_start(args);
141	- fmt = va_arg(args, char *);
142	+ va_start(args, fmt);
143	(void) GrVfprintf(f, fmt, args);
144	va_end(args);
145	}
146	(void) fflush(stderr);
147	}
148
149	-#else NO_VARARGS
150	+#else
151
152	/VARARGS1/
153
154	@@ -364,7 +351,7 @@
155	}
156	(void) fflush(stderr);
157	}
158	-#endif NO_VARARGS
159	+#endif
160
161
162	/*
163	@@ -482,7 +469,7 @@
164	int status;
165	#else
166	union wait status;
167	-#endif SYSV
168	+#endif
169	*/
170	/* TxMoreFile may be NULL if the "more" executable was not found */
171	if (TxMoreFile == NULL) return;
172	@@ -532,5 +519,5 @@
173
174	return (ferror(iop) ? EOF : len);
175	}
176	-#endif NEED_VFPRINTF
177	+#endif
178

Lines 1-51 Link Here

(-)cad/magic/files/patch-utils::LIBtextio.c (-51 lines)
1	--- utils/LIBtextio.c.orig Tue Dec 9 16:52:38 2003
2	+++ utils/LIBtextio.c Tue Dec 9 16:52:53 2003
3	@@ -19,10 +19,10 @@
4
5	#ifndef lint
6	static char rcsid[] = "$Header: /ufs/repository/magic/utils/LIBtextio.c,v 1.1.1.1 2000/03/29 18:35:16 rajit Exp $";
7	-#endif not lint
8	+#endif
9
10	#include <stdio.h>
11	-#include <varargs.h>
12	+#include <stdarg.h>
13
14	/*
15	* ----------------------------------------------------------------------------
16	@@ -65,15 +65,13 @@
17	*/
18
19	/VARARGS/
20	-TxError(fmt, va_alist)
21	- char *fmt;
22	- va_dcl
23	+TxError(char *fmt, ... )
24	{
25	va_list ap;
26
27	(void) fflush(stdout);
28	(void) fflush(stderr);
29	- va_start(ap);
30	+ va_start(ap, fmt);
31	vfprintf(stderr, fmt, ap);
32	va_end(ap);
33	(void) fflush(stderr);
34	@@ -96,15 +94,13 @@
35	*/
36
37	/VARARGS/
38	-TxPrintf(fmt, va_alist)
39	- char *fmt;
40	- va_dcl
41	+TxPrintf(char *fmt, ... )
42	{
43	va_list ap;
44
45	(void) fflush(stderr);
46	(void) fflush(stdout);
47	- va_start(ap);
48	+ va_start(ap, fmt);
49	vfprintf(stdout, fmt, ap);
50	va_end(ap);
51	(void) fflush(stdout);

Lines 1-14 Link Here

(-)cad/magic/pkg-plist (-35 / +252 lines)
1	bin/XHelper7
2	bin/ext2sim	1	bin/ext2sim
3	bin/ext2spice	2	bin/ext2spice
4	bin/extcheck
5	bin/magic	3	bin/magic
6	bin/magicusage
7	bin/net2ir
8	bin/spice2sim	4	bin/spice2sim
9	lib/libmpack.a
10	lib/magic/doc/addendum6_5.ps	5	lib/magic/doc/addendum6_5.ps
11	lib/magic/doc/copyright.ps	6	lib/magic/doc/copyright.ps
		7	lib/magic/doc/html/Makefile
		8	lib/magic/doc/html/addcommandentry.html
		9	lib/magic/doc/html/addpath.html
		10	lib/magic/doc/html/array.html
		11	lib/magic/doc/html/box.html
		12	lib/magic/doc/html/calma.html
		13	lib/magic/doc/html/caption.html
		14	lib/magic/doc/html/cellmanager.html
		15	lib/magic/doc/html/cellname.html
		16	lib/magic/doc/html/cellsearch.html
		17	lib/magic/doc/html/center.html
		18	lib/magic/doc/html/changetool.html
		19	lib/magic/doc/html/channels.html
		20	lib/magic/doc/html/cif.html
		21	lib/magic/doc/html/clockwise.html
		22	lib/magic/doc/html/closewindow.html
		23	lib/magic/doc/html/closewrapper.html
		24	lib/magic/doc/html/color/color.html
		25	lib/magic/doc/html/color/load.html
		26	lib/magic/doc/html/color/pushbutton.html
		27	lib/magic/doc/html/color/save.html
		28	lib/magic/doc/html/commands.html
		29	lib/magic/doc/html/commands.list
		30	lib/magic/doc/html/contact.html
		31	lib/magic/doc/html/copy.html
		32	lib/magic/doc/html/corner.html
		33	lib/magic/doc/html/crash.html
		34	lib/magic/doc/html/crashbackups.html
		35	lib/magic/doc/html/crosshair.html
		36	lib/magic/doc/html/cursor.html
		37	lib/magic/doc/html/def.html
		38	lib/magic/doc/html/delete.html
		39	lib/magic/doc/html/deletecommandentry.html
		40	lib/magic/doc/html/direction.html
		41	lib/magic/doc/html/distance.html
		42	lib/magic/doc/html/down.html
		43	lib/magic/doc/html/drc.html
		44	lib/magic/doc/html/dump.html
		45	lib/magic/doc/html/edit.html
		46	lib/magic/doc/html/element.html
		47	lib/magic/doc/html/erase.html
		48	lib/magic/doc/html/expand.html
		49	lib/magic/doc/html/ext.html
		50	lib/magic/doc/html/ext2sim.html
		51	lib/magic/doc/html/ext2spice.html
		52	lib/magic/doc/html/extract.html
		53	lib/magic/doc/html/extresist.html
		54	lib/magic/doc/html/exttosim.html
		55	lib/magic/doc/html/exttospice.html
		56	lib/magic/doc/html/feedback.html
		57	lib/magic/doc/html/fill.html
		58	lib/magic/doc/html/findbox.html
		59	lib/magic/doc/html/findlabel.html
		60	lib/magic/doc/html/flatten.html
		61	lib/magic/doc/html/flush.html
		62	lib/magic/doc/html/garoute.html
		63	lib/magic/doc/html/gds.html
		64	lib/magic/doc/html/get.html
		65	lib/magic/doc/html/getcell.html
		66	lib/magic/doc/html/getnode.html
		67	lib/magic/doc/html/goto.html
		68	lib/magic/doc/html/graphics/blpaper.gif
		69	lib/magic/doc/html/graphics/cellmgr.gif
		70	lib/magic/doc/html/graphics/cif_see.gif
71	lib/magic/doc/html/graphics/corner1.gif
72	lib/magic/doc/html/graphics/corner2.gif
73	lib/magic/doc/html/graphics/email_address.png
74	lib/magic/doc/html/graphics/line1.gif
75	lib/magic/doc/html/graphics/magic_OGL_sm.gif
76	lib/magic/doc/html/graphics/magic_title2.gif
77	lib/magic/doc/html/graphics/techmgr.gif
78	lib/magic/doc/html/graphics/toolbar.gif
79	lib/magic/doc/html/graphics/writeall.gif
80	lib/magic/doc/html/grid.html
81	lib/magic/doc/html/help.html
82	lib/magic/doc/html/identify.html
83	lib/magic/doc/html/imacro.html
84	lib/magic/doc/html/initialize.html
85	lib/magic/doc/html/instance.html
86	lib/magic/doc/html/invoke.html
87	lib/magic/doc/html/iroute.html
88	lib/magic/doc/html/irsim.html
89	lib/magic/doc/html/label.html
90	lib/magic/doc/html/lef.html
91	lib/magic/doc/html/load.html
92	lib/magic/doc/html/logcommands.html
93	lib/magic/doc/html/macro.html
94	lib/magic/doc/html/maketoolbar.html
95	lib/magic/doc/html/measure.html
96	lib/magic/doc/html/move.html
97	lib/magic/doc/html/netlist/add.html
98	lib/magic/doc/html/netlist/cleanup.html
99	lib/magic/doc/html/netlist/cull.html
100	lib/magic/doc/html/netlist/dnet.html
101	lib/magic/doc/html/netlist/dterm.html
102	lib/magic/doc/html/netlist/extract.html
103	lib/magic/doc/html/netlist/find.html
104	lib/magic/doc/html/netlist/flush.html
105	lib/magic/doc/html/netlist/joinnets.html
106	lib/magic/doc/html/netlist/netlist.html
107	lib/magic/doc/html/netlist/print.html
108	lib/magic/doc/html/netlist/pushbutton.html
109	lib/magic/doc/html/netlist/ripup.html
110	lib/magic/doc/html/netlist/savenetlist.html
111	lib/magic/doc/html/netlist/shownet.html
112	lib/magic/doc/html/netlist/showterms.html
113	lib/magic/doc/html/netlist/trace.html
114	lib/magic/doc/html/netlist/verify.html
115	lib/magic/doc/html/netlist/writeall.html
116	lib/magic/doc/html/netlist.html
117	lib/magic/doc/html/openwindow.html
118	lib/magic/doc/html/openwrapper.html
119	lib/magic/doc/html/paint.html
120	lib/magic/doc/html/path.html
121	lib/magic/doc/html/peekbox.html
122	lib/magic/doc/html/plot.html
123	lib/magic/doc/html/plow.html
124	lib/magic/doc/html/polygon.html
125	lib/magic/doc/html/popbox.html
126	lib/magic/doc/html/popstack.html
127	lib/magic/doc/html/port.html
128	lib/magic/doc/html/promptload.html
129	lib/magic/doc/html/promptsave.html
130	lib/magic/doc/html/property.html
131	lib/magic/doc/html/pushbox.html
132	lib/magic/doc/html/pushbutton.html
133	lib/magic/doc/html/pushstack.html
134	lib/magic/doc/html/quit.html
135	lib/magic/doc/html/redo.html
136	lib/magic/doc/html/redraw.html
137	lib/magic/doc/html/render3d.html
138	lib/magic/doc/html/resumeall.html
139	lib/magic/doc/html/rotate.html
140	lib/magic/doc/html/route.html
141	lib/magic/doc/html/ruler.html
142	lib/magic/doc/html/save.html
143	lib/magic/doc/html/scalegrid.html
144	lib/magic/doc/html/scroll.html
145	lib/magic/doc/html/search.html
146	lib/magic/doc/html/see.html
147	lib/magic/doc/html/select.html
148	lib/magic/doc/html/setpoint.html
149	lib/magic/doc/html/shell.html
150	lib/magic/doc/html/sideways.html
151	lib/magic/doc/html/sleep.html
152	lib/magic/doc/html/snap.html
153	lib/magic/doc/html/specialopen.html
154	lib/magic/doc/html/spliterase.html
155	lib/magic/doc/html/splitpaint.html
156	lib/magic/doc/html/startup.html
157	lib/magic/doc/html/straighten.html
158	lib/magic/doc/html/stretch.html
159	lib/magic/doc/html/suspendall.html
160	lib/magic/doc/html/tag.html
161	lib/magic/doc/html/tech.html
162	lib/magic/doc/html/techmanager.html
163	lib/magic/doc/html/template.html
164	lib/magic/doc/html/tk_path_name.html
165	lib/magic/doc/html/tool.html
166	lib/magic/doc/html/undo.html
167	lib/magic/doc/html/unexpand.html
168	lib/magic/doc/html/unmeasure.html
169	lib/magic/doc/html/updatedisplay.html
170	lib/magic/doc/html/upsidedown.html
171	lib/magic/doc/html/version.html
172	lib/magic/doc/html/view.html
173	lib/magic/doc/html/what.html
174	lib/magic/doc/html/wind3d/cif.html
175	lib/magic/doc/html/wind3d/closewindow.html
176	lib/magic/doc/html/wind3d/cutbox.html
177	lib/magic/doc/html/wind3d/defaults.html
178	lib/magic/doc/html/wind3d/help.html
179	lib/magic/doc/html/wind3d/level.html
180	lib/magic/doc/html/wind3d/refresh.html
181	lib/magic/doc/html/wind3d/render.html
182	lib/magic/doc/html/wind3d/scroll.html
183	lib/magic/doc/html/wind3d/see.html
184	lib/magic/doc/html/wind3d/view.html
185	lib/magic/doc/html/wind3d/zoom.html
186	lib/magic/doc/html/windowborder.html
187	lib/magic/doc/html/windowcaption.html
188	lib/magic/doc/html/windownames.html
189	lib/magic/doc/html/windowscrollbars.html
190	lib/magic/doc/html/wire.html
191	lib/magic/doc/html/wizard/coord.html
192	lib/magic/doc/html/wizard/crash.html
193	lib/magic/doc/html/wizard/extract.html
194	lib/magic/doc/html/wizard/files.html
195	lib/magic/doc/html/wizard/grstats.html
196	lib/magic/doc/html/wizard/pause.html
197	lib/magic/doc/html/wizard/plow.html
198	lib/magic/doc/html/wizard/psearch.html
199	lib/magic/doc/html/wizard/showtech.html
200	lib/magic/doc/html/wizard/tilestats.html
201	lib/magic/doc/html/wizard/tsearch.html
202	lib/magic/doc/html/wizard/watch.html
203	lib/magic/doc/html/wizard/winddebug.html
204	lib/magic/doc/html/wizard/winddump.html
205	lib/magic/doc/html/writeall.html
206	lib/magic/doc/html/xload.html
207	lib/magic/doc/html/xview.html
208	lib/magic/doc/html/zoom.html
12	lib/magic/doc/introduction.ps	209	lib/magic/doc/introduction.ps
13	lib/magic/doc/maint1.ps	210	lib/magic/doc/maint1.ps
14	lib/magic/doc/maint2.ps	211	lib/magic/doc/maint2.ps
Lines 29-70 Link Here
29	lib/magic/doc/tutscm2.ps	226	lib/magic/doc/tutscm2.ps
30	lib/magic/doc/tutscm3.ps	227	lib/magic/doc/tutscm3.ps
31	lib/magic/doc/tutscm4.ps	228	lib/magic/doc/tutscm4.ps
		229	lib/magic/doc/tuttcl1.ps
		230	lib/magic/doc/tuttcl2.ps
		231	lib/magic/doc/tuttcl3.ps
		232	lib/magic/doc/tuttcl4.ps
		233	lib/magic/doc/tuttcl5.ps
32	lib/magic/doc/tutwrl1.ps	234	lib/magic/doc/tutwrl1.ps
33	lib/magic/scm/box.scm	235	lib/magic/sys/.magicrc
34	lib/magic/scm/default.scm
35	lib/magic/scm/draw.scm
36	lib/magic/scm/drc.scm
37	lib/magic/scm/gate.scm
38	lib/magic/scm/help.scm
39	lib/magic/scm/label.scm
40	lib/magic/scm/layout.scm
41	lib/magic/scm/prs.scm
42	lib/magic/scm/sel.scm
43	lib/magic/scm/stack.scm
44	lib/magic/sys/.magic
45	lib/magic/sys/bw.glyphs	236	lib/magic/sys/bw.glyphs
46	lib/magic/sys/color.glyphs	237	lib/magic/sys/color.glyphs
		238	lib/magic/sys/gdsquery.tech
47	lib/magic/sys/magicps.pro	239	lib/magic/sys/magicps.pro
48	lib/magic/sys/mos.24bit.dstyle5	240	lib/magic/sys/minimum.tech
49	lib/magic/sys/mos.7bit.dstyle5	241	lib/magic/sys/mos.24bit.dstyle
50	lib/magic/sys/mos.7bit.mraster.cmap1	242	lib/magic/sys/mos.24bit.std.cmap
51	lib/magic/sys/mos.7bit.mraster_dstyle5	243	lib/magic/sys/mos.7bit.dstyle
52	lib/magic/sys/mos.7bit.std.cmap1	244	lib/magic/sys/mos.7bit.mraster.cmap
53	lib/magic/sys/mos.OpenGL.dstyle5	245	lib/magic/sys/mos.7bit.mraster_dstyle
54	lib/magic/sys/mos.OpenGL.std.cmap1	246	lib/magic/sys/mos.7bit.std.cmap
55	lib/magic/sys/scmos-sub.tech26	247	lib/magic/sys/mos.OpenGL.dstyle
56	lib/magic/sys/scmos-sub.tech27	248	lib/magic/sys/mos.OpenGL.std.cmap
57	lib/magic/sys/scmos-tm.tech26	249	lib/magic/sys/scmos-sub.tech
58	lib/magic/sys/scmos-tm.tech27	250	lib/magic/sys/scmos-tm.tech
59	lib/magic/sys/scmos.tech	251	lib/magic/sys/scmos.tech
60	lib/magic/sys/scmos.tech26	252	lib/magic/sys/scmosWR.tech
61	lib/magic/sys/scmos.tech27	253	lib/magic/sys/vfont.B.12
62	lib/magic/sys/scmosWR.tech26	254	lib/magic/sys/vfont.I.12
63	lib/magic/sys/scmosWR.tech27	255	lib/magic/sys/vfont.R.8
64	lib/magic/sys/windows11.glyphs	256	lib/magic/sys/windows11.glyphs
65	lib/magic/sys/windows14.glyphs	257	lib/magic/sys/windows14.glyphs
66	lib/magic/sys/windows22.glyphs	258	lib/magic/sys/windows22.glyphs
67	lib/magic/sys/windows7.glyphs	259	lib/magic/sys/windows7.glyphs
		260	lib/magic/tcl/bitmaps/down.xbm
		261	lib/magic/tcl/bitmaps/left.xbm
		262	lib/magic/tcl/bitmaps/right.xbm
		263	lib/magic/tcl/bitmaps/up.xbm
		264	lib/magic/tcl/bitmaps/zoom.xbm
		265	lib/magic/tcl/console.tcl
		266	lib/magic/tcl/exttosim.so
		267	lib/magic/tcl/exttospice.so
		268	lib/magic/tcl/magic.tcl
		269	lib/magic/tcl/magicdnull
		270	lib/magic/tcl/magicexec
		271	lib/magic/tcl/mazeroute.tcl
		272	lib/magic/tcl/strip_reflibs.tcl
		273	lib/magic/tcl/tclmagic.so
		274	lib/magic/tcl/techbuilder.tcl
		275	lib/magic/tcl/tkcon.tcl
		276	lib/magic/tcl/tkshell.tcl
		277	lib/magic/tcl/toolkit.tcl
		278	lib/magic/tcl/tools.tcl
		279	lib/magic/tcl/wrapper.tcl
68	lib/magic/tutorial/m3a.mag	280	lib/magic/tutorial/m3a.mag
69	lib/magic/tutorial/maint2a.mag	281	lib/magic/tutorial/maint2a.mag
70	lib/magic/tutorial/tut1.mag	282	lib/magic/tutorial/tut1.mag
Lines 73-79 Link Here
73	lib/magic/tutorial/tut11a.ext	285	lib/magic/tutorial/tut11a.ext
74	lib/magic/tutorial/tut11a.mag	286	lib/magic/tutorial/tut11a.mag
75	lib/magic/tutorial/tut11a.nodes	287	lib/magic/tutorial/tut11a.nodes
76	lib/magic/tutorial/tut11a.rsm
77	lib/magic/tutorial/tut11a.sim	288	lib/magic/tutorial/tut11a.sim
78	lib/magic/tutorial/tut11b.ext	289	lib/magic/tutorial/tut11b.ext
79	lib/magic/tutorial/tut11b.mag	290	lib/magic/tutorial/tut11b.mag
Lines 129-137 Link Here
129	lib/magic/tutorial/tut9b.mag	340	lib/magic/tutorial/tut9b.mag
130	lib/magic/tutorial/tut9x.mag	341	lib/magic/tutorial/tut9x.mag
131	lib/magic/tutorial/tut9y.mag	342	lib/magic/tutorial/tut9y.mag
132	lib/mpack.h
133	@dirrm lib/magic/tutorial	343	@dirrm lib/magic/tutorial
		344	@dirrm lib/magic/tcl/bitmaps
		345	@dirrm lib/magic/tcl
134	@dirrm lib/magic/sys	346	@dirrm lib/magic/sys
135	@dirrm lib/magic/scm	347	@dirrm lib/magic/doc/html/wizard
		348	@dirrm lib/magic/doc/html/wind3d
		349	@dirrm lib/magic/doc/html/netlist
		350	@dirrm lib/magic/doc/html/graphics
		351	@dirrm lib/magic/doc/html/color
		352	@dirrm lib/magic/doc/html
136	@dirrm lib/magic/doc	353	@dirrm lib/magic/doc
137	@dirrm lib/magic	354	@dirrm lib/magic