- Update to 7.5.213

PR:		ports/160086
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

23 files changed, 307 insertions, 926 deletions

diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 5b0e758ddece..2d90d6fc83f1 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -6,69 +6,55 @@
 #
 
 PORTNAME=	magic
-PORTVERSION=	7.1
-PORTREVISION=	4
+PORTVERSION=	7.5.213
 CATEGORIES=	cad
-MASTER_SITES=	http://vlsi.cornell.edu/magic/
+MASTER_SITES=	http://opencircuitdesign.com/magic/archive/ \
+		http://fossies.org/linux/misc/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An interactive editor for VLSI layouts
 
-USE_XORG=	x11
+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
-MAKE_ENV=	CADDIR="${PREFIX}"
-ALL_TARGET=	mains
+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
 
-BINS=	XHelper7 ext2sim ext2spice extcheck magic magicusage net2ir
-MAN1=	ext2sim.1 ext2spice.1 extcheck.1 magic.1 magicusage.1
-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
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${EGREP} -lr '^#endif[^$$]' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\(^#endif\).*|\1|g; \
-		 s|\(^#else\).*|\1|g; \
-		 s|include.*<varargs\.h>|include <stdarg\.h>|'
-	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|make |\$$\{MAKE\} |g'
-
-do-configure:
-	@cd ${WRKSRC} && ${WRKSRC}/scripts/makedbh \
-		database/database.h.in database/database.h
-	@${CP} ${FILESDIR}/defs.mak ${WRKSRC}/defs.mak
-
-post-install:
-	@${CHMOD} ${BINMODE} ${PREFIX}/bin/spice2sim
-	@${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
+	@${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
 
 .include <bsd.port.post.mk>
diff --git a/cad/magic/distinfo b/cad/magic/distinfo
index 3037e196b3f3..4ca3e77f6a4b 100644
--- a/cad/magic/distinfo
+++ b/cad/magic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (magic-7.1.tar.gz) = 9c4dc1f05c3a55ab57e4919807e233bb750736ebc10854263b08a54eb3376aba
-SIZE (magic-7.1.tar.gz) = 3860487
+SHA256 (magic-7.5.213.tgz) = cacd14275ec13a008cb2dd0455e3bd5ff288be9060de0a805bb15b890ea42bf0
+SIZE (magic-7.5.213.tgz) = 3694855
diff --git a/cad/magic/files/defs.mak b/cad/magic/files/defs.mak
deleted file mode 100644
index 3082889957a4..000000000000
--- a/cad/magic/files/defs.mak
+++ /dev/null
@@ -1,40 +0,0 @@
-# $FreeBSD$
-
-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}
diff --git a/cad/magic/files/patch-ext2spice::ext2spice.c b/cad/magic/files/patch-ext2spice::ext2spice.c
deleted file mode 100644
index 60a74a6979f3..000000000000
--- a/cad/magic/files/patch-ext2spice::ext2spice.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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 );
- 
diff --git a/cad/magic/files/patch-ext2spice::spice2sim b/cad/magic/files/patch-ext2spice::spice2sim
deleted file mode 100644
index 0d9522d1dbfe..000000000000
--- a/cad/magic/files/patch-ext2spice::spice2sim
+++ /dev/null
@@ -1,8 +0,0 @@
---- ext2spice/spice2sim.orig	Thu Mar 30 03:34:59 2000
-+++ ext2spice/spice2sim	Fri Oct 11 23:38:53 2002
-@@ -1,4 +1,4 @@
--#!/bin/awk -f
-+#!/usr/bin/awk -f
- # convert an ext2spice produced file to a .sim file for debugging
- #
- BEGIN {
diff --git a/cad/magic/files/patch-extflat::EFint.h b/cad/magic/files/patch-extflat::EFint.h
deleted file mode 100644
index 546c12c32efa..000000000000
--- a/cad/magic/files/patch-extflat::EFint.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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, ...);
diff --git a/cad/magic/files/patch-extflat::EFread.c b/cad/magic/files/patch-extflat::EFread.c
deleted file mode 100644
index 0db5c40fd29f..000000000000
--- a/cad/magic/files/patch-extflat::EFread.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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);
diff --git a/cad/magic/files/patch-magic::proto.magic b/cad/magic/files/patch-magic::proto.magic
deleted file mode 100644
index 806b3da3b56b..000000000000
--- a/cad/magic/files/patch-magic::proto.magic
+++ /dev/null
@@ -1,161 +0,0 @@
---- 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
diff --git a/cad/magic/files/patch-misc::magic.h b/cad/magic/files/patch-misc::magic.h
deleted file mode 100644
index 85d969d4dac1..000000000000
--- a/cad/magic/files/patch-misc::magic.h
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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  
- 
diff --git a/cad/magic/files/patch-misc::magsgtty.h b/cad/magic/files/patch-misc::magsgtty.h
deleted file mode 100644
index aea392548047..000000000000
--- a/cad/magic/files/patch-misc::magsgtty.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
diff --git a/cad/magic/files/patch-misc::nicebort.c b/cad/magic/files/patch-misc::nicebort.c
deleted file mode 100644
index 36fa83980a37..000000000000
--- a/cad/magic/files/patch-misc::nicebort.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/niceabort.c.orig	Sat Jan 13 07:13:00 2001
-+++ misc/niceabort.c	Fri Oct 11 23:38:53 2002
-@@ -52,7 +52,7 @@
- bool AbortFatal = FALSE;
- 
- /* For lint */
--long time();
-+time_t time();
- char *ctime();
- 
- void
diff --git a/cad/magic/files/patch-resis::ResRex.c b/cad/magic/files/patch-resis::ResRex.c
deleted file mode 100644
index dcccd9d718dc..000000000000
--- a/cad/magic/files/patch-resis::ResRex.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- resis/ResRex.c.orig	Sat Sep 22 00:15:50 2001
-+++ resis/ResRex.c	Mon Oct 14 20:50:32 2002
-@@ -10,7 +10,7 @@
- /* It is hard to get the value of MAXFLOAT in a portable manner. */
- #if defined(ibm032) || defined(CYGWIN) 
- #define MAXFLOAT        ((float)3.40282346638528860e+38)
--#elif !defined(__NetBSD__)
-+#elif !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <values.h>
- #endif
- 
diff --git a/cad/magic/files/patch-scmos::extract_template::scmosExt.tech b/cad/magic/files/patch-scmos::extract_template::scmosExt.tech
deleted file mode 100644
index 366ceb9768d0..000000000000
--- a/cad/magic/files/patch-scmos::extract_template::scmosExt.tech
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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"
diff --git a/cad/magic/files/patch-tech::tech.c b/cad/magic/files/patch-tech::tech.c
deleted file mode 100644
index 445f8eaf4e7d..000000000000
--- a/cad/magic/files/patch-tech::tech.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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 ================== */
- 
diff --git a/cad/magic/files/patch-tech::tech.h b/cad/magic/files/patch-tech::tech.h
deleted file mode 100644
index 27155e4d1788..000000000000
--- a/cad/magic/files/patch-tech::tech.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- tech/tech.h.orig	Tue Dec  9 16:42:58 2003
-+++ tech/tech.h	Tue Dec  9 16:43:01 2003
-@@ -23,4 +23,4 @@
- /* ----------------- Exported variables and procedures ---------------- */
- 
- extern char *TechDefault;	/* Name of default technology */
--extern void TechError();
-+extern void TechError(char *fmt, ...);
diff --git a/cad/magic/files/patch-textio::textio.h b/cad/magic/files/patch-textio::textio.h
deleted file mode 100644
index 2c835c7f45a6..000000000000
--- a/cad/magic/files/patch-textio::textio.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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();
diff --git a/cad/magic/files/patch-textio::textioInt.h b/cad/magic/files/patch-textio::textioInt.h
deleted file mode 100644
index 8fca49f3396f..000000000000
--- a/cad/magic/files/patch-textio::textioInt.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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, ... );
diff --git a/cad/magic/files/patch-textio::txInput.c b/cad/magic/files/patch-textio::txInput.c
deleted file mode 100644
index c0c8d2c0e9f8..000000000000
--- a/cad/magic/files/patch-textio::txInput.c
+++ /dev/null
@@ -1,96 +0,0 @@
---- 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;
diff --git a/cad/magic/files/patch-textio::txOutput.c b/cad/magic/files/patch-textio::txOutput.c
deleted file mode 100644
index d6ba3477c1e2..000000000000
--- a/cad/magic/files/patch-textio::txOutput.c
+++ /dev/null
@@ -1,178 +0,0 @@
---- 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
- 
diff --git a/cad/magic/files/patch-utils::LIBtextio.c b/cad/magic/files/patch-utils::LIBtextio.c
deleted file mode 100644
index b04ee561a209..000000000000
--- a/cad/magic/files/patch-utils::LIBtextio.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- 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);
diff --git a/cad/magic/files/patch-utils__magsgtty.h b/cad/magic/files/patch-utils__magsgtty.h
new file mode 100644
index 000000000000..8fad15254376
--- /dev/null
+++ b/cad/magic/files/patch-utils__magsgtty.h
@@ -0,0 +1,20 @@
+--- ./utils/magsgtty.h.orig	2011-09-02 12:36:19.000000000 +0200
++++ ./utils/magsgtty.h	2011-09-02 12:39:00.000000000 +0200
+@@ -21,14 +21,10 @@
+ #ifndef	_MAGSGTTY_H
+ #define _MAGSGTTY_H
+ 
+-#if !defined(SYSV) && !defined(CYGWIN)
+-# ifdef	ALPHA
+-# undef MAX
+-# undef MIN
+-# endif
+-#include <sgtty.h>
++#if defined(__FreeBSD__)
++#include <termios.h>
+ #else
+-#include <termio.h>
++#include <sgtty.h>
+ #endif
+ 
+ #endif	/* _MAGSGTTY_H */
diff --git a/cad/magic/pkg-descr b/cad/magic/pkg-descr
index 03c882a0daa2..26e20f2d1fe5 100644
--- a/cad/magic/pkg-descr
+++ b/cad/magic/pkg-descr
@@ -5,4 +5,4 @@ where magic was installed, e.g. /usr/local.  Alternatively, the system
 administrator can create a dummy user named 'cad' with its home
 directory set to the installation directory.
 
-WWW: http://vlsi.cornell.edu/magic/
+WWW: http://opencircuitdesign.com/magic/
diff --git a/cad/magic/pkg-plist b/cad/magic/pkg-plist
index 6f99374c54de..90dcd7d81f5b 100644
--- a/cad/magic/pkg-plist
+++ b/cad/magic/pkg-plist
@@ -1,14 +1,211 @@
-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
@@ -29,42 +226,49 @@ lib/magic/doc/tutscm1.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/scm/box.scm
-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/magicps.pro
-lib/magic/sys/mos.24bit.dstyle5
-lib/magic/sys/mos.7bit.dstyle5
-lib/magic/sys/mos.7bit.mraster.cmap1
-lib/magic/sys/mos.7bit.mraster_dstyle5
-lib/magic/sys/mos.7bit.std.cmap1
-lib/magic/sys/mos.OpenGL.dstyle5
-lib/magic/sys/mos.OpenGL.std.cmap1
-lib/magic/sys/scmos-sub.tech26
-lib/magic/sys/scmos-sub.tech27
-lib/magic/sys/scmos-tm.tech26
-lib/magic/sys/scmos-tm.tech27
+lib/magic/sys/gdsquery.tech
+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/scmos.tech26
-lib/magic/sys/scmos.tech27
-lib/magic/sys/scmosWR.tech26
-lib/magic/sys/scmosWR.tech27
+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/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/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
@@ -73,7 +277,6 @@ lib/magic/tutorial/tut11a.cmd
 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
@@ -129,9 +332,15 @@ lib/magic/tutorial/tut9a.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/scm
+@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