Rewrote the configuration scripts, makefiles, and some initialization

routines to use the Tcl and Tk stubs libraries.

defs.mak

@@ -57,19 +57,22 @@ RANLIB                 = ranlib
 SHDLIB_EXT             = .so
 LDDL_FLAGS             = ${LDFLAGS} -shared -Wl,-soname,$@ -Wl,--version-script=${MAGICDIR}/magic/symbol.map
 LD_RUN_PATH	       = 
-LIB_SPECS	       =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
+LIB_SPECS	       =  -L/usr/lib64 -ltkstub8.6 -L/usr/lib64 -ltclstub8.6
+LIB_SPECS_NOSTUB       =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
 WISH_EXE	       = /usr/bin/wish
 TCL_LIB_DIR	       = /usr/lib
 MAGIC_VERSION	       = 8.2
-MAGIC_REVISION	       = 30
+MAGIC_REVISION	       = 34
 
 CC                     = gcc
 CPP                    = gcc -E
 CXX		       = g++
 
 CPPFLAGS               = -I. -I${MAGICDIR} 
-DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"30\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\"
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\"  -DUSE_TCL_STUBS -DUSE_TK_STUBS -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"34\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DGCORE=\"/bin/gcore\"
-DFLAGS		      += -DSHDLIB_EXT=\".so\"
+DFLAGS		      += -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS_NOSTUB	       =  -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"34\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DGCORE=\"/bin/gcore\"
+DFLAGS_NOSTUB	      += -DSHDLIB_EXT=\".so\" -DNDEBUG
 CFLAGS                 = -g -m64 -fPIC -Wimplicit-int -fPIC 
 
 READLINE_DEFS          = 

ext2sim/ext2sim.c

@@ -204,7 +204,7 @@ Exttosim_Init(interp)
     if (interp == NULL) return TCL_ERROR;
     if (Tcl_PkgRequire(interp, "Tclmagic", MAGIC_VERSION, 0) == NULL)
 	return TCL_ERROR;
-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) return TCL_ERROR;
+    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
 
     TxPrintf("Auto-loading EXTTOSIM module\n");
     TxFlushOut();

ext2spice/ext2spice.c

@@ -169,7 +169,7 @@ Exttospice_Init(interp)
     if (interp == NULL) return TCL_ERROR;
     if (Tcl_PkgRequire(interp, "Tclmagic", MAGIC_VERSION, 0) == NULL)
 	return TCL_ERROR;
-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) return TCL_ERROR;
+    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
 
     TxPrintf("Auto-loading EXTTOSPICE module\n");
     TxFlushOut();

graphics/grTCairo1.c

@@ -257,6 +257,8 @@ GrTCairoInit ()
 {
 	bool rstatus;
 
+	if (Tk_InitStubs(magicinterp, "8.5", 0) == NULL) return FALSE;
+
 	tcairoCurrent.window = Tk_MainWindow(magicinterp);
 	if (tcairoCurrent.window == NULL)
 	{

graphics/grTOGL1.c

@@ -266,6 +266,8 @@ GrTOGLInit ()
     static int attributeList[] = { GLX_RGBA, None, None };
 #endif
 
+    if (Tk_InitStubs(magicinterp, "8.5", 0) == NULL) return FALSE;
+
     toglCurrent.window = Tk_MainWindow(magicinterp);
     if (toglCurrent.window == NULL)
     {

graphics/grTk1.c

@@ -369,6 +369,8 @@ GrTkInit(dispType)
     int color_base, color_reserved;
     int status;
 
+    if (Tk_InitStubs(magicinterp, "8.5", 0) == NULL) return FALSE;
+
     grCurrent.window = Tk_MainWindow(magicinterp);
 
     if (grCurrent.window == NULL)

install.log

@@ -0,0 +1,567 @@
+make[1]: Entering directory '/home/tim/gitsrc/magic-8.2'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/magic/sys /usr/local/lib/magic/tcl /usr/local/lib/magic/tcl/bitmaps
+for dir in windows doc scmos graphics tcltk magic net2ir tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/windows'
+--- installing glyphs to /usr/local/lib/magic/sys
+for i in windows7.glyphs windows11.glyphs windows14.glyphs windows22.glyphs  vfont.B.12 vfont.I.12 vfont.R.8; do \
+	(cd /usr/local/lib/magic/sys && rm -f $i); \
+	cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/windows'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/doc'
+cd latexfiles && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/latexfiles'
+../../scripts/mkdirs /usr/local/lib/magic/doc
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/latexfiles'
+cd man && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/man'
+make[3]: Nothing to be done for 'install'.
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/man'
+cd tutcells && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/tutcells'
+../../scripts/mkdirs /usr/local/lib/magic/tutorial
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/tutcells'
+cd html && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/html'
+tar cf - . | (cd /usr/local/lib/magic/doc/html; tar xf - )
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/html'
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/scmos'
+cd cif_template; make clean; make;
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/scmos/cif_template'
+rm -f objs/CIFin objs/CIFout objs/IBMCIFin objs/IBMCIFout objs/TMCIFin \
+objs/TMCIFout objs/SUBCIFin objs/SUBCIFout
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/scmos/cif_template'
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/scmos/cif_template'
+rm -f objs/CIFin
+gcc -E -DSTANDARD cifin.c | sed -e "s/\\\\/\\\\\\\\/" -e "/^#/D" -e "s/(gen )/(gen)/" -e "s/(nowell )/(nowell)/" -e "s/(nwell )/(nwell)/" -e "s/(pwell )/(pwell)/" > objs/CIFin
+rm -f objs/CIFout
+gcc -E -DSTANDARD cifout.c | sed -e "s/\\\\/\\\\\\\\/" -e "/^#/D" -e "s/(gen )/(gen)/" -e "s/(nowell )/(nowell)/" -e "s/(nwell )/(nwell)/" -e "s/(pwell )/(pwell)/" > objs/CIFout
+rm -f objs/IBMCIFin
+gcc -E -DIBM cifin.c | sed -e "s/\\\\/\\\\\\\\/" -e "/^#/D" -e "s/(gen )/(gen)/" -e "s/(nowell )/(nowell)/" -e "s/(nwell )/(nwell)/" -e "s/(pwell )/(pwell)/" > objs/IBMCIFin
+rm -f objs/IBMCIFout
+gcc -E -DIBM cifout.c | sed -e "s/\\\\/\\\\\\\\/" -e "/^#/D" -e "s/(gen )/(gen)/" -e "s/(nowell )/(nowell)/" -e "s/(nwell )/(nwell)/" -e "s/(pwell )/(pwell)/" > objs/IBMCIFout
+rm -f objs/TMCIFin
+gcc -E -DTIGHTMETAL cifin.c | sed -e "s/\\\\/\\\\\\\\/" -e "/^#/D" -e "s/(gen )/(gen)/" -e "s/(nowell )/(nowell)/" -e "s/(nwell )/(nwell)/" -e "s/(pwell )/(pwell)/" > objs/TMCIFin
+rm -f objs/TMCIFout
+gcc -E -DTIGHTMETAL cifout.c | sed -e "s/\\\\/\\\\\\\\/" -e "/^#/D" -e "s/(gen )/(gen)/" -e "s/(nowell )/(nowell)/" -e "s/(nwell )/(nwell)/" -e "s/(pwell )/(pwell)/" > objs/TMCIFout
+rm -f objs/SUBCIFin
+gcc -E -DSUBMICRON cifin.c | sed -e "s/\\\\/\\\\\\\\/" -e "/^#/D" -e "s/(gen )/(gen)/" -e "s/(nowell )/(nowell)/" -e "s/(nwell )/(nwell)/" -e "s/(pwell )/(pwell)/" > objs/SUBCIFin
+rm -f objs/SUBCIFout
+gcc -E -DSUBMICRON cifout.c | sed -e "s/\\\\/\\\\\\\\/" -e "/^#/D" -e "s/(gen )/(gen)/" -e "s/(nowell )/(nowell)/" -e "s/(nwell )/(nwell)/" -e "s/(pwell )/(pwell)/" > objs/SUBCIFout
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/scmos/cif_template'
+/bin/m4 minimum.tech.in > minimum.tech
+/bin/m4 gdsquery.tech.in > gdsquery.tech
+sed -e 's/\\/\\\\/' scmos.tech.in > scmos.tech.out
+gcc -E -x c -I./extract_template -DV5 -DSTANDARD scmos.tech.out > scmos.tech
+rm -f scmos.tech.out
+sed -e 's/\\/\\\\/' scmos.tech.in > scmos.tech.out
+gcc -E -x c -I./extract_template -DV5 -DHPTECH -DTIGHTMETAL scmos.tech.out > scmos-tm.tech
+rm -f scmos.tech.out
+sed -e 's/\\/\\\\/' scmos.tech.in > scmos.tech.out
+gcc -E -x c -I./extract_template -DV5 -DSUBMICRON scmos.tech.out > scmos-sub.tech
+rm -f scmos.tech.out
+sed -e 's/\\/\\\\/' scmos.tech.in > scmos.tech.out
+gcc -E -x c -I./extract_template -DV5 -DSTANDARD -DWELL_ROUTE_CHECK scmos.tech.out > scmosWR.tech
+rm -f scmos.tech.out
+for i in mos.7bit.dstyle mos.7bit.std.cmap mos.24bit.dstyle mos.24bit.std.cmap mos.7bit.mraster_dstyle mos.7bit.mraster.cmap mos.OpenGL.dstyle mos.OpenGL.std.cmap minimum.tech gdsquery.tech scmos.tech scmos-tm.tech scmos-sub.tech scmosWR.tech; do \
+	cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/scmos'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/graphics'
+for i in bw.glyphs color.glyphs; do \
+rm -f /usr/local/lib/magic/sys/$i; \
+cp $i /usr/local/lib/magic/sys; done
+for i in FreeSerif.pt3 FreeSans.pt3 FreeMono.pt3; do \
+rm -f /usr/local/lib/magic/sys/$i; \
+cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/graphics'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/tcltk'
+rm -f /usr/local/bin/magic.sh /usr/local/bin/magic
+cp magic.sh /usr/local/bin/magic
+(cd /usr/local/bin; chmod 0755 magic)
+rm -f /usr/local/bin/ext2spice
+cp ext2spice.sh /usr/local/bin/ext2spice
+(cd /usr/local/bin; chmod 0755 ext2spice)
+rm -f /usr/local/bin/ext2sim
+cp ext2sim.sh /usr/local/bin/ext2sim
+(cd /usr/local/bin; chmod 0755 ext2sim)
+rm -f /usr/local/lib/magic/tcl/magicexec
+cp magicexec /usr/local/lib/magic/tcl/magicexec
+rm -f /usr/local/lib/magic/tcl/magicdnull
+cp magicdnull /usr/local/lib/magic/tcl/magicdnull
+(cd /usr/local/lib/magic/tcl; rm -f tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl)
+for i in tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl; do \
+	cp $i /usr/local/lib/magic/tcl; done
+(cd /usr/local/lib/magic/tcl; chmod 0755 tkcon.tcl tkshell.tcl)
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/magic'
+rm -f /usr/local/lib/magic/tcl/tclmagic.so
+cp tclmagic.so /usr/local/lib/magic/tcl/tclmagic.so
+rm -f /usr/local/lib/magic/sys/.magicrc
+cp proto.magicrc /usr/local/lib/magic/sys/.magicrc
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/magic'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/net2ir'
+echo "Nothing to do here"
+Nothing to do here
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/net2ir'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/tcltk'
+rm -f /usr/local/bin/magic.sh /usr/local/bin/magic
+cp magic.sh /usr/local/bin/magic
+(cd /usr/local/bin; chmod 0755 magic)
+rm -f /usr/local/bin/ext2spice
+cp ext2spice.sh /usr/local/bin/ext2spice
+(cd /usr/local/bin; chmod 0755 ext2spice)
+rm -f /usr/local/bin/ext2sim
+cp ext2sim.sh /usr/local/bin/ext2sim
+(cd /usr/local/bin; chmod 0755 ext2sim)
+rm -f /usr/local/lib/magic/tcl/magicexec
+cp magicexec /usr/local/lib/magic/tcl/magicexec
+rm -f /usr/local/lib/magic/tcl/magicdnull
+cp magicdnull /usr/local/lib/magic/tcl/magicdnull
+(cd /usr/local/lib/magic/tcl; rm -f tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl)
+for i in tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl; do \
+	cp $i /usr/local/lib/magic/tcl; done
+(cd /usr/local/lib/magic/tcl; chmod 0755 tkcon.tcl tkshell.tcl)
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/magic-8.2'
+make[1]: Entering directory '/home/tim/gitsrc/magic-8.2'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/magic/sys /usr/local/lib/magic/tcl /usr/local/lib/magic/tcl/bitmaps
+for dir in windows doc scmos graphics tcltk magic net2ir tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/windows'
+--- installing glyphs to /usr/local/lib/magic/sys
+for i in windows7.glyphs windows11.glyphs windows14.glyphs windows22.glyphs  vfont.B.12 vfont.I.12 vfont.R.8; do \
+	(cd /usr/local/lib/magic/sys && rm -f $i); \
+	cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/windows'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/doc'
+cd latexfiles && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/latexfiles'
+../../scripts/mkdirs /usr/local/lib/magic/doc
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/latexfiles'
+cd man && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/man'
+make[3]: Nothing to be done for 'install'.
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/man'
+cd tutcells && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/tutcells'
+../../scripts/mkdirs /usr/local/lib/magic/tutorial
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/tutcells'
+cd html && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/html'
+tar cf - . | (cd /usr/local/lib/magic/doc/html; tar xf - )
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/html'
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/scmos'
+for i in mos.7bit.dstyle mos.7bit.std.cmap mos.24bit.dstyle mos.24bit.std.cmap mos.7bit.mraster_dstyle mos.7bit.mraster.cmap mos.OpenGL.dstyle mos.OpenGL.std.cmap minimum.tech gdsquery.tech scmos.tech scmos-tm.tech scmos-sub.tech scmosWR.tech; do \
+	cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/scmos'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/graphics'
+for i in bw.glyphs color.glyphs; do \
+rm -f /usr/local/lib/magic/sys/$i; \
+cp $i /usr/local/lib/magic/sys; done
+for i in FreeSerif.pt3 FreeSans.pt3 FreeMono.pt3; do \
+rm -f /usr/local/lib/magic/sys/$i; \
+cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/graphics'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/tcltk'
+rm -f /usr/local/bin/magic.sh /usr/local/bin/magic
+cp magic.sh /usr/local/bin/magic
+(cd /usr/local/bin; chmod 0755 magic)
+rm -f /usr/local/bin/ext2spice
+cp ext2spice.sh /usr/local/bin/ext2spice
+(cd /usr/local/bin; chmod 0755 ext2spice)
+rm -f /usr/local/bin/ext2sim
+cp ext2sim.sh /usr/local/bin/ext2sim
+(cd /usr/local/bin; chmod 0755 ext2sim)
+rm -f /usr/local/lib/magic/tcl/magicexec
+cp magicexec /usr/local/lib/magic/tcl/magicexec
+rm -f /usr/local/lib/magic/tcl/magicdnull
+cp magicdnull /usr/local/lib/magic/tcl/magicdnull
+(cd /usr/local/lib/magic/tcl; rm -f tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl)
+for i in tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl; do \
+	cp $i /usr/local/lib/magic/tcl; done
+(cd /usr/local/lib/magic/tcl; chmod 0755 tkcon.tcl tkshell.tcl)
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/magic'
+rm -f /usr/local/lib/magic/tcl/tclmagic.so
+cp tclmagic.so /usr/local/lib/magic/tcl/tclmagic.so
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/magic'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/net2ir'
+echo "Nothing to do here"
+Nothing to do here
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/net2ir'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/tcltk'
+rm -f /usr/local/bin/magic.sh /usr/local/bin/magic
+cp magic.sh /usr/local/bin/magic
+(cd /usr/local/bin; chmod 0755 magic)
+rm -f /usr/local/bin/ext2spice
+cp ext2spice.sh /usr/local/bin/ext2spice
+(cd /usr/local/bin; chmod 0755 ext2spice)
+rm -f /usr/local/bin/ext2sim
+cp ext2sim.sh /usr/local/bin/ext2sim
+(cd /usr/local/bin; chmod 0755 ext2sim)
+rm -f /usr/local/lib/magic/tcl/magicexec
+cp magicexec /usr/local/lib/magic/tcl/magicexec
+rm -f /usr/local/lib/magic/tcl/magicdnull
+cp magicdnull /usr/local/lib/magic/tcl/magicdnull
+(cd /usr/local/lib/magic/tcl; rm -f tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl)
+for i in tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl; do \
+	cp $i /usr/local/lib/magic/tcl; done
+(cd /usr/local/lib/magic/tcl; chmod 0755 tkcon.tcl tkshell.tcl)
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/magic-8.2'
+make[1]: Entering directory '/home/tim/gitsrc/magic-8.2'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/magic/sys /usr/local/lib/magic/tcl /usr/local/lib/magic/tcl/bitmaps
+for dir in windows doc scmos graphics tcltk magic net2ir tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/windows'
+--- installing glyphs to /usr/local/lib/magic/sys
+for i in windows7.glyphs windows11.glyphs windows14.glyphs windows22.glyphs  vfont.B.12 vfont.I.12 vfont.R.8; do \
+	(cd /usr/local/lib/magic/sys && rm -f $i); \
+	cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/windows'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/doc'
+cd latexfiles && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/latexfiles'
+../../scripts/mkdirs /usr/local/lib/magic/doc
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/latexfiles'
+cd man && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/man'
+make[3]: Nothing to be done for 'install'.
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/man'
+cd tutcells && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/tutcells'
+../../scripts/mkdirs /usr/local/lib/magic/tutorial
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/tutcells'
+cd html && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/html'
+tar cf - . | (cd /usr/local/lib/magic/doc/html; tar xf - )
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/html'
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/scmos'
+for i in mos.7bit.dstyle mos.7bit.std.cmap mos.24bit.dstyle mos.24bit.std.cmap mos.7bit.mraster_dstyle mos.7bit.mraster.cmap mos.OpenGL.dstyle mos.OpenGL.std.cmap minimum.tech gdsquery.tech scmos.tech scmos-tm.tech scmos-sub.tech scmosWR.tech; do \
+	cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/scmos'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/graphics'
+for i in bw.glyphs color.glyphs; do \
+rm -f /usr/local/lib/magic/sys/$i; \
+cp $i /usr/local/lib/magic/sys; done
+for i in FreeSerif.pt3 FreeSans.pt3 FreeMono.pt3; do \
+rm -f /usr/local/lib/magic/sys/$i; \
+cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/graphics'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/tcltk'
+rm -f /usr/local/bin/magic.sh /usr/local/bin/magic
+cp magic.sh /usr/local/bin/magic
+(cd /usr/local/bin; chmod 0755 magic)
+rm -f /usr/local/bin/ext2spice
+cp ext2spice.sh /usr/local/bin/ext2spice
+(cd /usr/local/bin; chmod 0755 ext2spice)
+rm -f /usr/local/bin/ext2sim
+cp ext2sim.sh /usr/local/bin/ext2sim
+(cd /usr/local/bin; chmod 0755 ext2sim)
+rm -f /usr/local/lib/magic/tcl/magicexec
+cp magicexec /usr/local/lib/magic/tcl/magicexec
+rm -f /usr/local/lib/magic/tcl/magicdnull
+cp magicdnull /usr/local/lib/magic/tcl/magicdnull
+(cd /usr/local/lib/magic/tcl; rm -f tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl)
+for i in tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl; do \
+	cp $i /usr/local/lib/magic/tcl; done
+(cd /usr/local/lib/magic/tcl; chmod 0755 tkcon.tcl tkshell.tcl)
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/magic'
+rm -f /usr/local/lib/magic/tcl/tclmagic.so
+cp tclmagic.so /usr/local/lib/magic/tcl/tclmagic.so
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/magic'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/net2ir'
+echo "Nothing to do here"
+Nothing to do here
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/net2ir'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/tcltk'
+rm -f /usr/local/bin/magic.sh /usr/local/bin/magic
+cp magic.sh /usr/local/bin/magic
+(cd /usr/local/bin; chmod 0755 magic)
+rm -f /usr/local/bin/ext2spice
+cp ext2spice.sh /usr/local/bin/ext2spice
+(cd /usr/local/bin; chmod 0755 ext2spice)
+rm -f /usr/local/bin/ext2sim
+cp ext2sim.sh /usr/local/bin/ext2sim
+(cd /usr/local/bin; chmod 0755 ext2sim)
+rm -f /usr/local/lib/magic/tcl/magicexec
+cp magicexec /usr/local/lib/magic/tcl/magicexec
+rm -f /usr/local/lib/magic/tcl/magicdnull
+cp magicdnull /usr/local/lib/magic/tcl/magicdnull
+(cd /usr/local/lib/magic/tcl; rm -f tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl)
+for i in tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl; do \
+	cp $i /usr/local/lib/magic/tcl; done
+(cd /usr/local/lib/magic/tcl; chmod 0755 tkcon.tcl tkshell.tcl)
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/magic-8.2'
+make[1]: Entering directory '/home/tim/gitsrc/magic-8.2'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/magic/sys /usr/local/lib/magic/tcl /usr/local/lib/magic/tcl/bitmaps
+for dir in windows doc scmos graphics tcltk magic net2ir tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/windows'
+--- installing glyphs to /usr/local/lib/magic/sys
+for i in windows7.glyphs windows11.glyphs windows14.glyphs windows22.glyphs  vfont.B.12 vfont.I.12 vfont.R.8; do \
+	(cd /usr/local/lib/magic/sys && rm -f $i); \
+	cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/windows'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/doc'
+cd latexfiles && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/latexfiles'
+../../scripts/mkdirs /usr/local/lib/magic/doc
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/latexfiles'
+cd man && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/man'
+make[3]: Nothing to be done for 'install'.
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/man'
+cd tutcells && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/tutcells'
+../../scripts/mkdirs /usr/local/lib/magic/tutorial
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/tutcells'
+cd html && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/html'
+tar cf - . | (cd /usr/local/lib/magic/doc/html; tar xf - )
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/html'
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/scmos'
+for i in mos.7bit.dstyle mos.7bit.std.cmap mos.24bit.dstyle mos.24bit.std.cmap mos.7bit.mraster_dstyle mos.7bit.mraster.cmap mos.OpenGL.dstyle mos.OpenGL.std.cmap minimum.tech gdsquery.tech scmos.tech scmos-tm.tech scmos-sub.tech scmosWR.tech; do \
+	cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/scmos'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/graphics'
+for i in bw.glyphs color.glyphs; do \
+rm -f /usr/local/lib/magic/sys/$i; \
+cp $i /usr/local/lib/magic/sys; done
+for i in FreeSerif.pt3 FreeSans.pt3 FreeMono.pt3; do \
+rm -f /usr/local/lib/magic/sys/$i; \
+cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/graphics'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/tcltk'
+rm -f /usr/local/bin/magic.sh /usr/local/bin/magic
+cp magic.sh /usr/local/bin/magic
+(cd /usr/local/bin; chmod 0755 magic)
+rm -f /usr/local/bin/ext2spice
+cp ext2spice.sh /usr/local/bin/ext2spice
+(cd /usr/local/bin; chmod 0755 ext2spice)
+rm -f /usr/local/bin/ext2sim
+cp ext2sim.sh /usr/local/bin/ext2sim
+(cd /usr/local/bin; chmod 0755 ext2sim)
+rm -f /usr/local/lib/magic/tcl/magicexec
+cp magicexec /usr/local/lib/magic/tcl/magicexec
+rm -f /usr/local/lib/magic/tcl/magicdnull
+cp magicdnull /usr/local/lib/magic/tcl/magicdnull
+(cd /usr/local/lib/magic/tcl; rm -f tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl)
+for i in tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl; do \
+	cp $i /usr/local/lib/magic/tcl; done
+(cd /usr/local/lib/magic/tcl; chmod 0755 tkcon.tcl tkshell.tcl)
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/magic'
+rm -f /usr/local/lib/magic/tcl/tclmagic.so
+cp tclmagic.so /usr/local/lib/magic/tcl/tclmagic.so
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/magic'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/net2ir'
+echo "Nothing to do here"
+Nothing to do here
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/net2ir'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/tcltk'
+rm -f /usr/local/bin/magic.sh /usr/local/bin/magic
+cp magic.sh /usr/local/bin/magic
+(cd /usr/local/bin; chmod 0755 magic)
+rm -f /usr/local/bin/ext2spice
+cp ext2spice.sh /usr/local/bin/ext2spice
+(cd /usr/local/bin; chmod 0755 ext2spice)
+rm -f /usr/local/bin/ext2sim
+cp ext2sim.sh /usr/local/bin/ext2sim
+(cd /usr/local/bin; chmod 0755 ext2sim)
+rm -f /usr/local/lib/magic/tcl/magicexec
+cp magicexec /usr/local/lib/magic/tcl/magicexec
+rm -f /usr/local/lib/magic/tcl/magicdnull
+cp magicdnull /usr/local/lib/magic/tcl/magicdnull
+(cd /usr/local/lib/magic/tcl; rm -f tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl)
+for i in tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl; do \
+	cp $i /usr/local/lib/magic/tcl; done
+(cd /usr/local/lib/magic/tcl; chmod 0755 tkcon.tcl tkshell.tcl)
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/magic-8.2'
+make[1]: Entering directory '/home/tim/gitsrc/magic-8.2'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/magic/sys /usr/local/lib/magic/tcl /usr/local/lib/magic/tcl/bitmaps
+for dir in windows doc scmos graphics tcltk magic net2ir tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/windows'
+--- installing glyphs to /usr/local/lib/magic/sys
+for i in windows7.glyphs windows11.glyphs windows14.glyphs windows22.glyphs  vfont.B.12 vfont.I.12 vfont.R.8; do \
+	(cd /usr/local/lib/magic/sys && rm -f $i); \
+	cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/windows'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/doc'
+cd latexfiles && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/latexfiles'
+../../scripts/mkdirs /usr/local/lib/magic/doc
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/latexfiles'
+cd man && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/man'
+make[3]: Nothing to be done for 'install'.
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/man'
+cd tutcells && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/tutcells'
+../../scripts/mkdirs /usr/local/lib/magic/tutorial
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/tutcells'
+cd html && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/html'
+tar cf - . | (cd /usr/local/lib/magic/doc/html; tar xf - )
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/html'
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/scmos'
+for i in mos.7bit.dstyle mos.7bit.std.cmap mos.24bit.dstyle mos.24bit.std.cmap mos.7bit.mraster_dstyle mos.7bit.mraster.cmap mos.OpenGL.dstyle mos.OpenGL.std.cmap minimum.tech gdsquery.tech scmos.tech scmos-tm.tech scmos-sub.tech scmosWR.tech; do \
+	cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/scmos'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/graphics'
+for i in bw.glyphs color.glyphs; do \
+rm -f /usr/local/lib/magic/sys/$i; \
+cp $i /usr/local/lib/magic/sys; done
+for i in FreeSerif.pt3 FreeSans.pt3 FreeMono.pt3; do \
+rm -f /usr/local/lib/magic/sys/$i; \
+cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/graphics'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/tcltk'
+rm -f /usr/local/bin/magic.sh /usr/local/bin/magic
+cp magic.sh /usr/local/bin/magic
+(cd /usr/local/bin; chmod 0755 magic)
+rm -f /usr/local/bin/ext2spice
+cp ext2spice.sh /usr/local/bin/ext2spice
+(cd /usr/local/bin; chmod 0755 ext2spice)
+rm -f /usr/local/bin/ext2sim
+cp ext2sim.sh /usr/local/bin/ext2sim
+(cd /usr/local/bin; chmod 0755 ext2sim)
+rm -f /usr/local/lib/magic/tcl/magicexec
+cp magicexec /usr/local/lib/magic/tcl/magicexec
+rm -f /usr/local/lib/magic/tcl/magicdnull
+cp magicdnull /usr/local/lib/magic/tcl/magicdnull
+(cd /usr/local/lib/magic/tcl; rm -f tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl)
+for i in tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl; do \
+	cp $i /usr/local/lib/magic/tcl; done
+(cd /usr/local/lib/magic/tcl; chmod 0755 tkcon.tcl tkshell.tcl)
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/magic'
+rm -f /usr/local/lib/magic/tcl/tclmagic.so
+cp tclmagic.so /usr/local/lib/magic/tcl/tclmagic.so
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/magic'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/net2ir'
+echo "Nothing to do here"
+Nothing to do here
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/net2ir'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/tcltk'
+rm -f /usr/local/bin/magic.sh /usr/local/bin/magic
+cp magic.sh /usr/local/bin/magic
+(cd /usr/local/bin; chmod 0755 magic)
+rm -f /usr/local/bin/ext2spice
+cp ext2spice.sh /usr/local/bin/ext2spice
+(cd /usr/local/bin; chmod 0755 ext2spice)
+rm -f /usr/local/bin/ext2sim
+cp ext2sim.sh /usr/local/bin/ext2sim
+(cd /usr/local/bin; chmod 0755 ext2sim)
+rm -f /usr/local/lib/magic/tcl/magicexec
+cp magicexec /usr/local/lib/magic/tcl/magicexec
+rm -f /usr/local/lib/magic/tcl/magicdnull
+cp magicdnull /usr/local/lib/magic/tcl/magicdnull
+(cd /usr/local/lib/magic/tcl; rm -f tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl)
+for i in tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl; do \
+	cp $i /usr/local/lib/magic/tcl; done
+(cd /usr/local/lib/magic/tcl; chmod 0755 tkcon.tcl tkshell.tcl)
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/magic-8.2'
+make[1]: Entering directory '/home/tim/gitsrc/magic-8.2'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/magic/sys /usr/local/lib/magic/tcl /usr/local/lib/magic/tcl/bitmaps
+for dir in windows doc scmos graphics tcltk magic net2ir tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/windows'
+--- installing glyphs to /usr/local/lib/magic/sys
+for i in windows7.glyphs windows11.glyphs windows14.glyphs windows22.glyphs  vfont.B.12 vfont.I.12 vfont.R.8; do \
+	(cd /usr/local/lib/magic/sys && rm -f $i); \
+	cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/windows'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/doc'
+cd latexfiles && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/latexfiles'
+../../scripts/mkdirs /usr/local/lib/magic/doc
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/latexfiles'
+cd man && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/man'
+make[3]: Nothing to be done for 'install'.
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/man'
+cd tutcells && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/tutcells'
+../../scripts/mkdirs /usr/local/lib/magic/tutorial
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/tutcells'
+cd html && make install
+make[3]: Entering directory '/home/tim/gitsrc/magic-8.2/doc/html'
+tar cf - . | (cd /usr/local/lib/magic/doc/html; tar xf - )
+make[3]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc/html'
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/doc'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/scmos'
+for i in mos.7bit.dstyle mos.7bit.std.cmap mos.24bit.dstyle mos.24bit.std.cmap mos.7bit.mraster_dstyle mos.7bit.mraster.cmap mos.OpenGL.dstyle mos.OpenGL.std.cmap minimum.tech gdsquery.tech scmos.tech scmos-tm.tech scmos-sub.tech scmosWR.tech; do \
+	cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/scmos'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/graphics'
+for i in bw.glyphs color.glyphs; do \
+rm -f /usr/local/lib/magic/sys/$i; \
+cp $i /usr/local/lib/magic/sys; done
+for i in FreeSerif.pt3 FreeSans.pt3 FreeMono.pt3; do \
+rm -f /usr/local/lib/magic/sys/$i; \
+cp $i /usr/local/lib/magic/sys; done
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/graphics'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/tcltk'
+rm -f /usr/local/bin/magic.sh /usr/local/bin/magic
+cp magic.sh /usr/local/bin/magic
+(cd /usr/local/bin; chmod 0755 magic)
+rm -f /usr/local/bin/ext2spice
+cp ext2spice.sh /usr/local/bin/ext2spice
+(cd /usr/local/bin; chmod 0755 ext2spice)
+rm -f /usr/local/bin/ext2sim
+cp ext2sim.sh /usr/local/bin/ext2sim
+(cd /usr/local/bin; chmod 0755 ext2sim)
+rm -f /usr/local/lib/magic/tcl/magicexec
+cp magicexec /usr/local/lib/magic/tcl/magicexec
+rm -f /usr/local/lib/magic/tcl/magicdnull
+cp magicdnull /usr/local/lib/magic/tcl/magicdnull
+(cd /usr/local/lib/magic/tcl; rm -f tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl)
+for i in tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl; do \
+	cp $i /usr/local/lib/magic/tcl; done
+(cd /usr/local/lib/magic/tcl; chmod 0755 tkcon.tcl tkshell.tcl)
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/magic'
+rm -f /usr/local/lib/magic/tcl/tclmagic.so
+cp tclmagic.so /usr/local/lib/magic/tcl/tclmagic.so
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/magic'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/net2ir'
+echo "Nothing to do here"
+Nothing to do here
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/net2ir'
+make[2]: Entering directory '/home/tim/gitsrc/magic-8.2/tcltk'
+rm -f /usr/local/bin/magic.sh /usr/local/bin/magic
+cp magic.sh /usr/local/bin/magic
+(cd /usr/local/bin; chmod 0755 magic)
+rm -f /usr/local/bin/ext2spice
+cp ext2spice.sh /usr/local/bin/ext2spice
+(cd /usr/local/bin; chmod 0755 ext2spice)
+rm -f /usr/local/bin/ext2sim
+cp ext2sim.sh /usr/local/bin/ext2sim
+(cd /usr/local/bin; chmod 0755 ext2sim)
+rm -f /usr/local/lib/magic/tcl/magicexec
+cp magicexec /usr/local/lib/magic/tcl/magicexec
+rm -f /usr/local/lib/magic/tcl/magicdnull
+cp magicdnull /usr/local/lib/magic/tcl/magicdnull
+(cd /usr/local/lib/magic/tcl; rm -f tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl)
+for i in tkcon.tcl tkshell.tcl wrapper.tcl console.tcl techbuilder.tcl cellmgr.tcl libmgr.tcl texthelper.tcl tools.tcl mazeroute.tcl strip_reflibs.tcl drc.tcl toolkit.tcl toolkit_rev0.tcl bsitools.tcl socketcmd.tcl magic.tcl; do \
+	cp $i /usr/local/lib/magic/tcl; done
+(cd /usr/local/lib/magic/tcl; chmod 0755 tkcon.tcl tkshell.tcl)
+make[2]: Leaving directory '/home/tim/gitsrc/magic-8.2/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/magic-8.2'

lef/tcllef.c

@@ -42,7 +42,7 @@ Magiclef_Init(interp)
     if (interp == NULL) return TCL_ERROR;
     if (Tcl_PkgRequire(interp, "Tclmagic", MAGIC_VERSION, 0) == NULL)
 	return TCL_ERROR;
-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) return TCL_ERROR;
+    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
 
     TxPrintf("Auto-loading LEF/DEF module\n");
     TxFlushOut();

magic/Makefile

@@ -35,7 +35,8 @@ tclmagic${SHDLIB_EXT}: ${EXTRA_LIBS}
 	@echo --- making magic Tcl library \(tclmagic${SHDLIB_EXT}\)
 	${RM} tclmagic${SHDLIB_EXT}
 	${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} ${LD_RUN_PATH} \
-		${EXTRA_LIBS} -lc ${LIBS}
+		${EXTRA_LIBS} ${LD_EXTRA_LIBS} \
+		-lc ${LIBS} ${LIB_SPECS} ${LDFLAGS}
 
 proto.magicrc: proto.magicrc.in
 	${SCPP} ${GR_DFLAGS} ${DFLAGS} proto.magicrc.in > proto.magicrc

magic/proto.magicrc

@@ -0,0 +1,248 @@
+# 1 "proto.magicrc.in"
+# 1 "<built-in>"
+# 1 "<command-line>"
+# 1 "/usr/include/stdc-predef.h" 1 3 4
+# 1 "<command-line>" 2
+# 1 "proto.magicrc.in"
+# 9 "proto.magicrc.in"
+puts stdout "Processing system .magicrc file"
+
+
+###############################################################################
+
+###############################################################################
+
+macro a "select visible"
+macro A "select more visible"
+macro ^A "select less visible"
+
+macro b "box"
+macro B "findbox"
+
+macro c "copy"
+
+macro d "delete"
+macro ^D "erase $"
+
+macro e "edit"
+
+macro f "sideways"
+macro F "upsidedown"
+
+macro g "grid"
+macro G "grid 2"
+
+macro i "select cell"
+macro I "select more cell"
+
+macro Control_XK_i "select less cell"
+
+
+
+
+
+
+imacro l "label "
+
+macro L "shell ls"
+macro ^L "redraw"
+
+macro m "move"
+macro M "stretch"
+
+macro ^N ""
+
+macro o "openwindow"
+macro O "closewindow"
+
+
+
+
+
+imacro p "paint "
+
+
+
+macro Control_Shift_XK_q "quit"
+
+
+macro r "clockwise"
+macro R "clockwise 270"
+macro ^R "clockwise 180"
+
+macro s "select"
+macro S "select more"
+macro ^S "select less"
+
+macro Control_Shift_XK_s "undo ; select"
+
+
+macro u "undo"
+macro U "redo"
+
+macro v "view"
+macro V "xview"
+
+macro w "writeall"
+macro W "writeall force"
+
+macro x "expand"
+macro X "unexpand"
+macro ^X "expand toggle"
+
+macro z "zoom .5"
+macro Z "zoom 2"
+macro ^Z "findbox zoom"
+
+macro Control_Shift_XK_z "center"
+
+
+macro ? "drc why"
+macro / "select area; what ; select clear"
+
+macro , "select clear"
+
+
+
+
+
+macro " " "tool"
+
+imacro XK_colon ":"
+imacro XK_semicolon ":"
+
+macro Shift_XK_space "tool box"
+macro Control_XK_space "tool wiring"
+
+macro XK_Left "scroll l .1 w"
+macro Shift_XK_Left "scroll l 1 w"
+macro Control_XK_Left "box grow w 1"
+macro Control_Shift_XK_Left "box shrink e 1"
+macro XK_Right "scroll r .1 w"
+macro Shift_XK_Right "scroll r 1 w"
+macro Control_XK_Right "box grow e 1"
+macro Control_Shift_XK_Right "box shrink w 1"
+macro XK_Up "scroll u .1 w"
+macro Shift_XK_Up "scroll u 1 w"
+macro Control_XK_Up "box grow n 1"
+macro Control_Shift_XK_Up "box shrink s 1"
+macro XK_Down "scroll d .1 w"
+macro Shift_XK_Down "scroll d 1 w"
+macro Control_XK_Down "box grow s 1"
+macro Control_Shift_XK_Down "box shrink n 1"
+
+
+macro XK_KP_Delete "box size 0 0"
+macro XK_KP_Insert "box size 4 4"
+macro XK_KP_0 "box size 7 2"
+macro Shift_XK_KP_0 "box size 7 2"
+macro XK_0 "box size 7 2"
+macro Control_XK_KP_0 "box size 2 7"
+macro Control_XK_KP_Insert "box size 2 7"
+macro XK_KP_End "move sw 1"
+macro XK_KP_Down "move d 1"
+macro XK_KP_2 "stretch d 1"
+macro Shift_XK_KP_2 "stretch d 1"
+macro XK_2 "stretch d 1"
+macro XK_KP_Next "move se 1"
+macro XK_KP_Left "move l 1"
+macro XK_KP_4 "stretch l 1"
+macro Shift_XK_KP_4 "stretch l 1"
+macro XK_4 "stretch l 1"
+macro XK_KP_Begin "findbox zoom"
+macro XK_KP_5 "findbox"
+macro Shift_XK_KP_5 "findbox"
+macro XK_5 "findbox"
+macro XK_KP_Right "move r 1"
+macro XK_KP_6 "stretch r 1"
+macro Shift_XK_KP_6 "stretch r 1"
+macro XK_6 "stretch r 1"
+macro XK_KP_Home "move nw 1"
+macro XK_KP_Up "move u 1"
+macro XK_KP_8 "stretch u 1"
+macro Shift_XK_KP_8 "stretch u 1"
+macro XK_8 "stretch u 1"
+macro XK_KP_Prior "move ne 1"
+
+macro XK_Pointer_Button4 "scroll u .05 w"
+macro XK_Pointer_Button5 "scroll d .05 w"
+
+macro XK_F1 "paint ndiff"
+macro XK_F2 "paint pdiff"
+macro XK_F3 "paint poly"
+macro XK_F4 "paint poly2"
+macro XK_F5 "paint m1"
+macro XK_F6 "paint m2"
+macro XK_F7 "paint m3"
+macro XK_F8 "paint m4"
+macro XK_F9 "paint ndc"
+macro XK_F10 "paint pdc"
+macro XK_F11 "paint pc"
+macro XK_F12 "paint via"
+# 235 "proto.magicrc.in"
+macro Control_Button1 "*bypass box move bl cursor"
+macro Control_Button2 "*bypass paint cursor"
+macro Control_Button3 "*bypass box corner ur cursor"
+
+macro Button1 "*bypass box move bl cursor"
+macro Shift_Button1 "*bypass box corner bl cursor"
+macro Button2 "*bypass paint cursor"
+macro Shift_Button2 "*bypass erase cursor"
+macro Button3 "*bypass box corner ur cursor"
+macro Shift_Button3 "*bypass box move ur cursor"
+# 258 "proto.magicrc.in"
+macro color Button1 "pushbutton left"
+macro color Button2 "pushbutton middle"
+macro color Button3 "pushbutton right"
+macro color u "undo"
+macro color U "redo"
+macro color plus "color next"
+macro color minus "color last"
+
+macro netlist Button1 "pushbutton left"
+macro netlist Button2 "pushbutton middle"
+macro netlist Button3 "pushbutton right"
+
+macro wind3d L "level up"
+macro wind3d l "level down"
+macro wind3d C "cif"
+macro wind3d " " "defaults"
+macro wind3d ^L "refresh"
+macro wind3d Z "zoom 2.0 1 rel"
+macro wind3d z "zoom 0.5 1 rel"
+macro wind3d 1 "view 0 10 0 rel"
+macro wind3d 2 "view 0 -10 0 rel"
+macro wind3d 3 "view 10 0 0 rel"
+macro wind3d 4 "view -10 0 0 rel"
+macro wind3d 5 "view 0 0 10 rel"
+macro wind3d 6 "view 0 0 -10 rel"
+macro wind3d 7 "view 0 1 0 rel"
+macro wind3d 8 "view 0 -1 0 rel"
+macro wind3d 9 "view 1 0 0 rel"
+macro wind3d 0 "view -1 0 0 rel"
+
+macro wind3d XK_Up "scroll 0 -0.25 0 rel"
+macro wind3d XK_Down "scroll 0 0.25 0 rel"
+macro wind3d XK_Left "scroll 0.25 0 0 rel"
+macro wind3d XK_Right "scroll -0.25 0 0 rel"
+macro wind3d XK_minus "view 0 0 1 rel"
+macro wind3d XK_equal "view 0 0 -1 rel"
+macro wind3d XK_greater "zoom 1 2.0 rel"
+macro wind3d XK_less "zoom 1 0.5 rel"
+
+
+
+
+setlabel font FreeSans.pt3 0.58
+setlabel font FreeSerif.pt3 0.58
+setlabel font FreeMono.pt3 0.6
+
+
+
+
+magic::suspendout
+if {![catch {set Opts(tools)}]} { magic::enable_tools }
+set GND "gnd!"
+set VDD "vdd!"
+magic::resumeout
+catch {source ${CAD_ROOT}/magic/sys/site.def}

oa/magicInit.cpp

@@ -296,7 +296,7 @@ int Magicoa_Init(Tcl_Interp *interp) {
 	Tcl_PkgProvide(interp, "magicOA", "0.1");
    
 #ifdef USE_TCL_STUBS
-    if(Tcl_InitStubs(interp, (char *)"8.1",0) == NULL)
+    if(Tcl_InitStubs(interp, (char *)"8.5",0) == NULL)
       return TCL_ERROR;
 #endif
 	try {

plot/tclplot.c

@@ -46,7 +46,7 @@ Tclplot_Init(interp)
     if (interp == NULL) return TCL_ERROR;
     if (Tcl_PkgRequire(interp, "Tclmagic", MAGIC_VERSION, 0) == NULL)
 	return TCL_ERROR;
-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) return TCL_ERROR;
+    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
 
     TxPrintf("Auto-loading PLOT module\n");
     TxFlushOut();

readline/readline

@@ -0,0 +1 @@
+readline-4.3

router/tclroute.c

@@ -53,7 +53,7 @@ Tclroute_Init(interp)
     if (interp == NULL) return TCL_ERROR;
     if (Tcl_PkgRequire(interp, "Tclmagic", MAGIC_VERSION, 0) == NULL)
 	return TCL_ERROR;
-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) return TCL_ERROR;
+    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
 
     TxPrintf("Auto-loading ROUTE module\n");
     TxFlushOut();

scmos/gdsquery.tech

@@ -0,0 +1,59 @@
+tech
+    format 28
+    gdsquery
+end
+
+version
+    version 0.1
+    description "Minimal technology file for querying an unknown GDS database"
+end
+
+planes
+end
+
+types
+end
+
+contact
+end
+
+styles
+    styletype	mos
+end
+
+compose
+end
+
+connect
+end
+
+cifoutput
+style generic
+  scalefactor 1
+end
+
+cifinput
+style generic
+  scalefactor 1
+end
+
+# mzrouter
+# end
+
+drc
+end
+
+extract
+end
+
+# wiring
+# end
+
+# router
+# end
+
+# plowing
+# end
+
+# plot
+# end

scmos/minimum.tech

@@ -0,0 +1,55 @@
+tech
+    format 28
+    minimum
+end
+
+version
+    version 0.0
+    description "Minimum technology file structure"
+end
+
+planes
+end
+
+types
+end
+
+contact
+end
+
+styles
+    styletype	mos
+end
+
+compose
+end
+
+connect
+end
+
+cifoutput
+end
+
+cifinput
+end
+
+# mzrouter
+# end
+
+drc
+end
+
+extract
+end
+
+# wiring
+# end
+
+# router
+# end
+
+# plowing
+# end
+
+# plot
+# end

scripts/config.log

@@ -39,24 +39,24 @@ PATH: /usr/local/bin
 ## Core tests. ##
 ## ----------- ##
 
-configure:2486: checking build system type
+configure:2488: checking build system type
-configure:2500: result: x86_64-unknown-linux-gnu
+configure:2502: result: x86_64-unknown-linux-gnu
-configure:2520: checking host system type
+configure:2522: checking host system type
-configure:2533: result: x86_64-unknown-linux-gnu
+configure:2535: result: x86_64-unknown-linux-gnu
-configure:2553: checking target system type
+configure:2555: checking target system type
-configure:2566: result: x86_64-unknown-linux-gnu
+configure:2568: result: x86_64-unknown-linux-gnu
-configure:2658: checking for gcc
+configure:2660: checking for gcc
-configure:2674: found /bin/gcc
+configure:2676: found /bin/gcc
-configure:2685: result: gcc
+configure:2687: result: gcc
-configure:2914: checking for C compiler version
+configure:2916: checking for C compiler version
-configure:2923: gcc --version >&5
+configure:2925: gcc --version >&5
 gcc (GCC) 4.9.2 20150212 (Red Hat 4.9.2-6)
 Copyright (C) 2014 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-configure:2934: $? = 0
+configure:2936: $? = 0
-configure:2923: gcc -v >&5
+configure:2925: gcc -v >&5
 Using built-in specs.
 COLLECT_GCC=gcc
 COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.9.2/lto-wrapper
@@ -64,58 +64,58 @@ Target: x86_64-redhat-linux
 Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,fortran,ada,go,lto --enable-plugin --enable-initfini-array --disable-libgcj --with-isl=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/cloog-install --enable-gnu-indirect-function --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
 Thread model: posix
 gcc version 4.9.2 20150212 (Red Hat 4.9.2-6) (GCC) 
-configure:2934: $? = 0
+configure:2936: $? = 0
-configure:2923: gcc -V >&5
+configure:2925: gcc -V >&5
 gcc: error: unrecognized command line option '-V'
 gcc: fatal error: no input files
 compilation terminated.
-configure:2934: $? = 4
+configure:2936: $? = 4
-configure:2923: gcc -qversion >&5
+configure:2925: gcc -qversion >&5
 gcc: error: unrecognized command line option '-qversion'
 gcc: fatal error: no input files
 compilation terminated.
-configure:2934: $? = 4
+configure:2936: $? = 4
-configure:2954: checking whether the C compiler works
+configure:2956: checking whether the C compiler works
-configure:2976: gcc -g   conftest.c  >&5
+configure:2978: gcc -g   conftest.c  >&5
-configure:2980: $? = 0
+configure:2982: $? = 0
-configure:3028: result: yes
+configure:3030: result: yes
-configure:3031: checking for C compiler default output file name
+configure:3033: checking for C compiler default output file name
-configure:3033: result: a.out
+configure:3035: result: a.out
-configure:3039: checking for suffix of executables
+configure:3041: checking for suffix of executables
-configure:3046: gcc -o conftest -g   conftest.c  >&5
+configure:3048: gcc -o conftest -g   conftest.c  >&5
-configure:3050: $? = 0
+configure:3052: $? = 0
-configure:3072: result: 
+configure:3074: result: 
-configure:3094: checking whether we are cross compiling
+configure:3096: checking whether we are cross compiling
-configure:3102: gcc -o conftest -g   conftest.c  >&5
+configure:3104: gcc -o conftest -g   conftest.c  >&5
-configure:3106: $? = 0
+configure:3108: $? = 0
-configure:3113: ./conftest
+configure:3115: ./conftest
-configure:3117: $? = 0
+configure:3119: $? = 0
-configure:3132: result: no
+configure:3134: result: no
-configure:3137: checking for suffix of object files
+configure:3139: checking for suffix of object files
-configure:3159: gcc -c -g  conftest.c >&5
+configure:3161: gcc -c -g  conftest.c >&5
-configure:3163: $? = 0
+configure:3165: $? = 0
-configure:3184: result: o
+configure:3186: result: o
-configure:3188: checking whether we are using the GNU C compiler
+configure:3190: checking whether we are using the GNU C compiler
-configure:3207: gcc -c -g  conftest.c >&5
+configure:3209: gcc -c -g  conftest.c >&5
-configure:3207: $? = 0
+configure:3209: $? = 0
-configure:3216: result: yes
+configure:3218: result: yes
-configure:3225: checking whether gcc accepts -g
+configure:3227: checking whether gcc accepts -g
-configure:3245: gcc -c -g  conftest.c >&5
+configure:3247: gcc -c -g  conftest.c >&5
-configure:3245: $? = 0
+configure:3247: $? = 0
-configure:3286: result: yes
+configure:3288: result: yes
-configure:3303: checking for gcc option to accept ISO C89
+configure:3305: checking for gcc option to accept ISO C89
-configure:3366: gcc  -c -g  conftest.c >&5
+configure:3368: gcc  -c -g  conftest.c >&5
-configure:3366: $? = 0
+configure:3368: $? = 0
-configure:3379: result: none needed
+configure:3381: result: none needed
-configure:3404: checking how to run the C preprocessor
+configure:3406: checking how to run the C preprocessor
-configure:3435: gcc -E  conftest.c
+configure:3437: gcc -E  conftest.c
-configure:3435: $? = 0
+configure:3437: $? = 0
-configure:3449: gcc -E  conftest.c
+configure:3451: gcc -E  conftest.c
 conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
                             ^
 compilation terminated.
-configure:3449: $? = 1
+configure:3451: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@@ -125,18 +125,18 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define MAGIC_VERSION "8.2"
-| #define MAGIC_REVISION "30"
+| #define MAGIC_REVISION "34"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3474: result: gcc -E
+configure:3476: result: gcc -E
-configure:3494: gcc -E  conftest.c
+configure:3496: gcc -E  conftest.c
-configure:3494: $? = 0
+configure:3496: $? = 0
-configure:3508: gcc -E  conftest.c
+configure:3510: gcc -E  conftest.c
 conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
                             ^
 compilation terminated.
-configure:3508: $? = 1
+configure:3510: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@@ -146,21 +146,21 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define MAGIC_VERSION "8.2"
-| #define MAGIC_REVISION "30"
+| #define MAGIC_REVISION "34"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3594: checking for g++
+configure:3596: checking for g++
-configure:3610: found /bin/g++
+configure:3612: found /bin/g++
-configure:3621: result: g++
+configure:3623: result: g++
-configure:3648: checking for C++ compiler version
+configure:3650: checking for C++ compiler version
-configure:3657: g++ --version >&5
+configure:3659: g++ --version >&5
 g++ (GCC) 4.9.2 20150212 (Red Hat 4.9.2-6)
 Copyright (C) 2014 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-configure:3668: $? = 0
+configure:3670: $? = 0
-configure:3657: g++ -v >&5
+configure:3659: g++ -v >&5
 Using built-in specs.
 COLLECT_GCC=g++
 COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.9.2/lto-wrapper
@@ -168,123 +168,123 @@ Target: x86_64-redhat-linux
 Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,fortran,ada,go,lto --enable-plugin --enable-initfini-array --disable-libgcj --with-isl=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/cloog-install --enable-gnu-indirect-function --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
 Thread model: posix
 gcc version 4.9.2 20150212 (Red Hat 4.9.2-6) (GCC) 
-configure:3668: $? = 0
+configure:3670: $? = 0
-configure:3657: g++ -V >&5
+configure:3659: g++ -V >&5
 g++: error: unrecognized command line option '-V'
 g++: fatal error: no input files
 compilation terminated.
-configure:3668: $? = 4
+configure:3670: $? = 4
-configure:3657: g++ -qversion >&5
+configure:3659: g++ -qversion >&5
 g++: error: unrecognized command line option '-qversion'
 g++: fatal error: no input files
 compilation terminated.
-configure:3668: $? = 4
+configure:3670: $? = 4
-configure:3672: checking whether we are using the GNU C++ compiler
+configure:3674: checking whether we are using the GNU C++ compiler
-configure:3691: g++ -c   conftest.cpp >&5
+configure:3693: g++ -c   conftest.cpp >&5
-configure:3691: $? = 0
+configure:3693: $? = 0
-configure:3700: result: yes
+configure:3702: result: yes
-configure:3709: checking whether g++ accepts -g
+configure:3711: checking whether g++ accepts -g
-configure:3729: g++ -c -g  conftest.cpp >&5
+configure:3731: g++ -c -g  conftest.cpp >&5
-configure:3729: $? = 0
+configure:3731: $? = 0
-configure:3770: result: yes
+configure:3772: result: yes
-configure:3794: checking for library containing strerror
+configure:3796: checking for library containing strerror
-configure:3825: gcc -o conftest -g   conftest.c  >&5
+configure:3827: gcc -o conftest -g   conftest.c  >&5
-configure:3825: $? = 0
+configure:3827: $? = 0
-configure:3842: result: none required
+configure:3844: result: none required
-configure:3864: checking for a BSD-compatible install
+configure:3866: checking for a BSD-compatible install
-configure:3932: result: /bin/install -c
+configure:3934: result: /bin/install -c
-configure:3986: checking for ranlib
+configure:3988: checking for ranlib
-configure:4002: found /bin/ranlib
+configure:4004: found /bin/ranlib
-configure:4013: result: ranlib
+configure:4015: result: ranlib
-configure:4040: checking for gm4
+configure:4042: checking for gm4
-configure:4073: result: no
+configure:4075: result: no
-configure:4040: checking for gnum4
+configure:4042: checking for gnum4
-configure:4073: result: no
+configure:4075: result: no
-configure:4040: checking for m4
+configure:4042: checking for m4
-configure:4058: found /bin/m4
+configure:4060: found /bin/m4
-configure:4070: result: /bin/m4
+configure:4072: result: /bin/m4
-configure:4088: checking for python3
+configure:4090: checking for python3
-configure:4106: found /bin/python3
+configure:4108: found /bin/python3
-configure:4119: result: /bin/python3
+configure:4121: result: /bin/python3
-configure:4164: checking for ld used by GCC
+configure:4166: checking for ld used by GCC
-configure:4227: result: /bin/ld
+configure:4229: result: /bin/ld
-configure:4234: checking if the linker (/bin/ld) is GNU ld
+configure:4236: checking if the linker (/bin/ld) is GNU ld
 GNU ld version 2.24
-configure:4246: result: yes
+configure:4248: result: yes
-configure:4253: checking for grep that handles long lines and -e
+configure:4255: checking for grep that handles long lines and -e
-configure:4311: result: /bin/grep
+configure:4313: result: /bin/grep
-configure:4316: checking for egrep
+configure:4318: checking for egrep
-configure:4378: result: /bin/grep -E
+configure:4380: result: /bin/grep -E
-configure:4383: checking for ANSI C header files
+configure:4385: checking for ANSI C header files
-configure:4403: gcc -c -g  conftest.c >&5
+configure:4405: gcc -c -g  conftest.c >&5
-configure:4403: $? = 0
+configure:4405: $? = 0
-configure:4476: gcc -o conftest -g   conftest.c  >&5
+configure:4478: gcc -o conftest -g   conftest.c  >&5
-configure:4476: $? = 0
+configure:4478: $? = 0
-configure:4476: ./conftest
+configure:4478: ./conftest
-configure:4476: $? = 0
+configure:4478: $? = 0
-configure:4487: result: yes
+configure:4489: result: yes
-configure:4500: checking for sys/types.h
+configure:4502: checking for sys/types.h
-configure:4500: gcc -c -g  conftest.c >&5
+configure:4502: gcc -c -g  conftest.c >&5
-configure:4500: $? = 0
+configure:4502: $? = 0
-configure:4500: result: yes
+configure:4502: result: yes
-configure:4500: checking for sys/stat.h
+configure:4502: checking for sys/stat.h
-configure:4500: gcc -c -g  conftest.c >&5
+configure:4502: gcc -c -g  conftest.c >&5
-configure:4500: $? = 0
+configure:4502: $? = 0
-configure:4500: result: yes
+configure:4502: result: yes
-configure:4500: checking for stdlib.h
+configure:4502: checking for stdlib.h
-configure:4500: gcc -c -g  conftest.c >&5
+configure:4502: gcc -c -g  conftest.c >&5
-configure:4500: $? = 0
+configure:4502: $? = 0
-configure:4500: result: yes
+configure:4502: result: yes
-configure:4500: checking for string.h
+configure:4502: checking for string.h
-configure:4500: gcc -c -g  conftest.c >&5
+configure:4502: gcc -c -g  conftest.c >&5
-configure:4500: $? = 0
+configure:4502: $? = 0
-configure:4500: result: yes
+configure:4502: result: yes
-configure:4500: checking for memory.h
+configure:4502: checking for memory.h
-configure:4500: gcc -c -g  conftest.c >&5
+configure:4502: gcc -c -g  conftest.c >&5
-configure:4500: $? = 0
+configure:4502: $? = 0
-configure:4500: result: yes
+configure:4502: result: yes
-configure:4500: checking for strings.h
+configure:4502: checking for strings.h
-configure:4500: gcc -c -g  conftest.c >&5
+configure:4502: gcc -c -g  conftest.c >&5
-configure:4500: $? = 0
+configure:4502: $? = 0
-configure:4500: result: yes
+configure:4502: result: yes
-configure:4500: checking for inttypes.h
+configure:4502: checking for inttypes.h
-configure:4500: gcc -c -g  conftest.c >&5
+configure:4502: gcc -c -g  conftest.c >&5
-configure:4500: $? = 0
+configure:4502: $? = 0
-configure:4500: result: yes
+configure:4502: result: yes
-configure:4500: checking for stdint.h
+configure:4502: checking for stdint.h
-configure:4500: gcc -c -g  conftest.c >&5
+configure:4502: gcc -c -g  conftest.c >&5
-configure:4500: $? = 0
+configure:4502: $? = 0
-configure:4500: result: yes
+configure:4502: result: yes
-configure:4500: checking for unistd.h
+configure:4502: checking for unistd.h
-configure:4500: gcc -c -g  conftest.c >&5
+configure:4502: gcc -c -g  conftest.c >&5
-configure:4500: $? = 0
+configure:4502: $? = 0
-configure:4500: result: yes
+configure:4502: result: yes
-configure:4516: checking size of void *
+configure:4518: checking size of void *
-configure:4521: gcc -o conftest -g   conftest.c  >&5
+configure:4523: gcc -o conftest -g   conftest.c  >&5
-configure:4521: $? = 0
+configure:4523: $? = 0
-configure:4521: ./conftest
+configure:4523: ./conftest
-configure:4521: $? = 0
+configure:4523: $? = 0
-configure:4535: result: 8
+configure:4537: result: 8
-configure:4549: checking size of unsigned int
+configure:4551: checking size of unsigned int
-configure:4554: gcc -o conftest -g   conftest.c  >&5
+configure:4556: gcc -o conftest -g   conftest.c  >&5
-configure:4554: $? = 0
+configure:4556: $? = 0
-configure:4554: ./conftest
+configure:4556: ./conftest
-configure:4554: $? = 0
+configure:4556: $? = 0
-configure:4568: result: 4
+configure:4570: result: 4
-configure:4582: checking size of unsigned long
+configure:4584: checking size of unsigned long
-configure:4587: gcc -o conftest -g   conftest.c  >&5
+configure:4589: gcc -o conftest -g   conftest.c  >&5
-configure:4587: $? = 0
+configure:4589: $? = 0
-configure:4587: ./conftest
+configure:4589: ./conftest
-configure:4587: $? = 0
+configure:4589: $? = 0
-configure:4601: result: 8
+configure:4603: result: 8
-configure:4615: checking size of unsigned long long
+configure:4617: checking size of unsigned long long
-configure:4620: gcc -o conftest -g   conftest.c  >&5
+configure:4622: gcc -o conftest -g   conftest.c  >&5
-configure:4620: $? = 0
+configure:4622: $? = 0
-configure:4620: ./conftest
+configure:4622: ./conftest
-configure:4620: $? = 0
+configure:4622: $? = 0
-configure:4634: result: 8
+configure:4636: result: 8
-configure:4645: checking whether byte ordering is bigendian
+configure:4647: checking whether byte ordering is bigendian
-configure:4660: gcc -c -g  conftest.c >&5
+configure:4662: gcc -c -g  conftest.c >&5
 conftest.c:26:9: error: unknown type name 'not'
          not a universal capable compiler
          ^
@@ -292,7 +292,7 @@ conftest.c:26:15: error: expected '=', ',', ';', 'asm' or '__attribute__' before
          not a universal capable compiler
                ^
 conftest.c:26:15: error: unknown type name 'universal'
-configure:4660: $? = 1
+configure:4662: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@@ -302,7 +302,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define MAGIC_VERSION "8.2"
-| #define MAGIC_REVISION "30"
+| #define MAGIC_REVISION "34"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -323,9 +323,9 @@ configure: failed program was:
 | 	     #endif
 | 	     typedef int dummy;
 | 
-configure:4705: gcc -c -g  conftest.c >&5
+configure:4707: gcc -c -g  conftest.c >&5
-configure:4705: $? = 0
+configure:4707: $? = 0
-configure:4723: gcc -c -g  conftest.c >&5
+configure:4725: gcc -c -g  conftest.c >&5
 conftest.c: In function 'main':
 conftest.c:32:4: error: unknown type name 'not'
     not big endian
@@ -333,7 +333,7 @@ conftest.c:32:4: error: unknown type name 'not'
 conftest.c:32:12: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'endian'
     not big endian
             ^
-configure:4723: $? = 1
+configure:4725: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@@ -343,7 +343,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define MAGIC_VERSION "8.2"
-| #define MAGIC_REVISION "30"
+| #define MAGIC_REVISION "34"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -372,58 +372,58 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:4851: result: no
+configure:4853: result: no
-configure:4870: checking for ANSI C header files
+configure:4872: checking for ANSI C header files
-configure:4974: result: yes
+configure:4976: result: yes
-configure:4986: checking for setenv
+configure:4988: checking for setenv
-configure:4986: gcc -o conftest -g   conftest.c  >&5
+configure:4988: gcc -o conftest -g   conftest.c  >&5
-configure:4986: $? = 0
+configure:4988: $? = 0
-configure:4986: result: yes
+configure:4988: result: yes
-configure:4986: checking for putenv
+configure:4988: checking for putenv
-configure:4986: gcc -o conftest -g   conftest.c  >&5
+configure:4988: gcc -o conftest -g   conftest.c  >&5
-configure:4986: $? = 0
+configure:4988: $? = 0
-configure:4986: result: yes
+configure:4988: result: yes
-configure:4996: checking for vfork
+configure:4998: checking for vfork
-configure:4996: gcc -o conftest -g   conftest.c  >&5
+configure:4998: gcc -o conftest -g   conftest.c  >&5
-configure:4996: $? = 0
+configure:4998: $? = 0
-configure:4996: result: yes
+configure:4998: result: yes
-configure:5004: checking sys/mman.h usability
+configure:5006: checking sys/mman.h usability
-configure:5004: gcc -c -g  conftest.c >&5
+configure:5006: gcc -c -g  conftest.c >&5
-configure:5004: $? = 0
+configure:5006: $? = 0
-configure:5004: result: yes
+configure:5006: result: yes
-configure:5004: checking sys/mman.h presence
+configure:5006: checking sys/mman.h presence
-configure:5004: gcc -E  conftest.c
+configure:5006: gcc -E  conftest.c
-configure:5004: $? = 0
+configure:5006: $? = 0
-configure:5004: result: yes
+configure:5006: result: yes
-configure:5004: checking for sys/mman.h
+configure:5006: checking for sys/mman.h
-configure:5004: result: yes
+configure:5006: result: yes
-configure:5017: checking dirent.h usability
+configure:5019: checking dirent.h usability
-configure:5017: gcc -c -g  conftest.c >&5
+configure:5019: gcc -c -g  conftest.c >&5
-configure:5017: $? = 0
+configure:5019: $? = 0
-configure:5017: result: yes
+configure:5019: result: yes
-configure:5017: checking dirent.h presence
+configure:5019: checking dirent.h presence
-configure:5017: gcc -E  conftest.c
+configure:5019: gcc -E  conftest.c
-configure:5017: $? = 0
+configure:5019: $? = 0
-configure:5017: result: yes
+configure:5019: result: yes
-configure:5017: checking for dirent.h
+configure:5019: checking for dirent.h
-configure:5017: result: yes
+configure:5019: result: yes
-configure:5030: checking limits.h usability
+configure:5032: checking limits.h usability
-configure:5030: gcc -c -g  conftest.c >&5
+configure:5032: gcc -c -g  conftest.c >&5
-configure:5030: $? = 0
+configure:5032: $? = 0
-configure:5030: result: yes
+configure:5032: result: yes
-configure:5030: checking limits.h presence
+configure:5032: checking limits.h presence
-configure:5030: gcc -E  conftest.c
+configure:5032: gcc -E  conftest.c
-configure:5030: $? = 0
+configure:5032: $? = 0
-configure:5030: result: yes
+configure:5032: result: yes
-configure:5030: checking for limits.h
+configure:5032: checking for limits.h
-configure:5030: result: yes
+configure:5032: result: yes
-configure:5043: checking param.h usability
+configure:5045: checking param.h usability
-configure:5043: gcc -c -g  conftest.c >&5
+configure:5045: gcc -c -g  conftest.c >&5
 conftest.c:64:19: fatal error: param.h: No such file or directory
  #include <param.h>
                    ^
 compilation terminated.
-configure:5043: $? = 1
+configure:5045: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@@ -433,7 +433,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define MAGIC_VERSION "8.2"
-| #define MAGIC_REVISION "30"
+| #define MAGIC_REVISION "34"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -489,14 +489,14 @@ configure: failed program was:
 | # include <unistd.h>
 | #endif
 | #include <param.h>
-configure:5043: result: no
+configure:5045: result: no
-configure:5043: checking param.h presence
+configure:5045: checking param.h presence
-configure:5043: gcc -E  conftest.c
+configure:5045: gcc -E  conftest.c
 conftest.c:31:19: fatal error: param.h: No such file or directory
  #include <param.h>
                    ^
 compilation terminated.
-configure:5043: $? = 1
+configure:5045: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@@ -506,7 +506,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define MAGIC_VERSION "8.2"
-| #define MAGIC_REVISION "30"
+| #define MAGIC_REVISION "34"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -529,112 +529,112 @@ configure: failed program was:
 | #define HAVE_LIMITS_H 1
 | /* end confdefs.h.  */
 | #include <param.h>
-configure:5043: result: no
+configure:5045: result: no
-configure:5043: checking for param.h
+configure:5045: checking for param.h
-configure:5043: result: no
+configure:5045: result: no
-configure:5056: checking paths.h usability
+configure:5058: checking paths.h usability
-configure:5056: gcc -c -g  conftest.c >&5
+configure:5058: gcc -c -g  conftest.c >&5
-configure:5056: $? = 0
+configure:5058: $? = 0
-configure:5056: result: yes
+configure:5058: result: yes
-configure:5056: checking paths.h presence
+configure:5058: checking paths.h presence
-configure:5056: gcc -E  conftest.c
+configure:5058: gcc -E  conftest.c
-configure:5056: $? = 0
+configure:5058: $? = 0
-configure:5056: result: yes
+configure:5058: result: yes
-configure:5056: checking for paths.h
+configure:5058: checking for paths.h
-configure:5056: result: yes
+configure:5058: result: yes
-configure:5067: checking for va_copy
+configure:5069: checking for va_copy
-configure:5085: gcc -o conftest -g   conftest.c  >&5
+configure:5087: gcc -o conftest -g   conftest.c  >&5
-configure:5085: $? = 0
+configure:5087: $? = 0
-configure:5094: result: yes
+configure:5096: result: yes
-configure:5102: checking for __va_copy
+configure:5104: checking for __va_copy
-configure:5120: gcc -o conftest -g   conftest.c  >&5
+configure:5122: gcc -o conftest -g   conftest.c  >&5
-configure:5120: $? = 0
+configure:5122: $? = 0
-configure:5129: result: yes
+configure:5131: result: yes
-configure:5344: checking for gcore
+configure:5347: checking for gcore
-configure:5362: found /bin/gcore
+configure:5365: found /bin/gcore
-configure:5375: result: /bin/gcore
+configure:5378: result: /bin/gcore
-configure:5387: checking for csh
+configure:5390: checking for csh
-configure:5405: found /bin/csh
+configure:5408: found /bin/csh
-configure:5418: result: /bin/csh
+configure:5421: result: /bin/csh
-configure:5432: checking for X
+configure:5435: checking for X
-configure:5571: gcc -o conftest -g   conftest.c -lX11  >&5
+configure:5574: gcc -o conftest -g   conftest.c -lX11  >&5
-configure:5571: $? = 0
+configure:5574: $? = 0
-configure:5621: result: libraries , headers 
+configure:5624: result: libraries , headers 
-configure:5720: gcc -o conftest -g   conftest.c   -lX11 >&5
+configure:5723: gcc -o conftest -g   conftest.c   -lX11 >&5
-configure:5720: $? = 0
+configure:5723: $? = 0
-configure:5818: checking for gethostbyname
+configure:5821: checking for gethostbyname
-configure:5818: gcc -o conftest -g   conftest.c  >&5
+configure:5821: gcc -o conftest -g   conftest.c  >&5
-configure:5818: $? = 0
+configure:5821: $? = 0
-configure:5818: result: yes
+configure:5821: result: yes
-configure:5915: checking for connect
+configure:5918: checking for connect
-configure:5915: gcc -o conftest -g   conftest.c  >&5
+configure:5918: gcc -o conftest -g   conftest.c  >&5
-configure:5915: $? = 0
+configure:5918: $? = 0
-configure:5915: result: yes
+configure:5918: result: yes
-configure:5964: checking for remove
+configure:5967: checking for remove
-configure:5964: gcc -o conftest -g   conftest.c  >&5
+configure:5967: gcc -o conftest -g   conftest.c  >&5
-configure:5964: $? = 0
+configure:5967: $? = 0
-configure:5964: result: yes
+configure:5967: result: yes
-configure:6013: checking for shmat
+configure:6016: checking for shmat
-configure:6013: gcc -o conftest -g   conftest.c  >&5
+configure:6016: gcc -o conftest -g   conftest.c  >&5
-configure:6013: $? = 0
+configure:6016: $? = 0
-configure:6013: result: yes
+configure:6016: result: yes
-configure:6071: checking for IceConnectionNumber in -lICE
+configure:6074: checking for IceConnectionNumber in -lICE
-configure:6096: gcc -o conftest -g   conftest.c -lICE   >&5
+configure:6099: gcc -o conftest -g   conftest.c -lICE   >&5
-configure:6096: $? = 0
+configure:6099: $? = 0
-configure:6105: result: yes
+configure:6108: result: yes
-configure:6141: checking for XOpenDevice in -lXi
+configure:6144: checking for XOpenDevice in -lXi
-configure:6166: gcc -o conftest -g   conftest.c -lXi   >&5
+configure:6169: gcc -o conftest -g   conftest.c -lXi   >&5
-configure:6166: $? = 0
+configure:6169: $? = 0
-configure:6175: result: yes
+configure:6178: result: yes
-configure:6181: checking for XmuInternAtom in -lXmu
+configure:6184: checking for XmuInternAtom in -lXmu
-configure:6206: gcc -o conftest -g   conftest.c -lXmu   >&5
+configure:6209: gcc -o conftest -g   conftest.c -lXmu   >&5
-configure:6206: $? = 0
+configure:6209: $? = 0
-configure:6215: result: yes
+configure:6218: result: yes
-configure:6221: checking for XextFindDisplay in -lXext
+configure:6224: checking for XextFindDisplay in -lXext
-configure:6246: gcc -o conftest -g   conftest.c -lXext   >&5
+configure:6249: gcc -o conftest -g   conftest.c -lXext   >&5
-configure:6246: $? = 0
+configure:6249: $? = 0
-configure:6255: result: yes
+configure:6258: result: yes
-configure:6335: checking for tclConfig.sh
+configure:6338: checking for tclConfig.sh
-configure:6409: result: /usr/lib64/tclConfig.sh
+configure:6412: result: /usr/lib64/tclConfig.sh
-configure:6425: checking for tkConfig.sh
+configure:6428: checking for tkConfig.sh
-configure:6498: result: /usr/lib64/tkConfig.sh
+configure:6501: result: /usr/lib64/tkConfig.sh
-configure:6632: checking for wish executable
+configure:6635: checking for wish executable
-configure:6660: result: /usr/bin/wish
+configure:6663: result: /usr/bin/wish
-configure:6666: checking for tclsh executable
+configure:6669: checking for tclsh executable
-configure:6692: result: /usr/bin/tclsh
+configure:6695: result: /usr/bin/tclsh
-configure:7397: checking GL/gl.h usability
+configure:7404: checking GL/gl.h usability
-configure:7397: gcc -c -g   conftest.c >&5
+configure:7404: gcc -c -g   conftest.c >&5
-configure:7397: $? = 0
+configure:7404: $? = 0
-configure:7397: result: yes
+configure:7404: result: yes
-configure:7397: checking GL/gl.h presence
+configure:7404: checking GL/gl.h presence
-configure:7397: gcc -E   conftest.c
+configure:7404: gcc -E   conftest.c
-configure:7397: $? = 0
+configure:7404: $? = 0
-configure:7397: result: yes
+configure:7404: result: yes
-configure:7397: checking for GL/gl.h
+configure:7404: checking for GL/gl.h
-configure:7397: result: yes
+configure:7404: result: yes
-configure:7415: checking for glXCreateContext in -lGL
+configure:7422: checking for glXCreateContext in -lGL
-configure:7440: gcc -o conftest -g     -lm conftest.c -lGL   >&5
+configure:7447: gcc -o conftest -g     -lm conftest.c -lGL   >&5
-configure:7440: $? = 0
+configure:7447: $? = 0
-configure:7449: result: yes
+configure:7456: result: yes
-configure:7465: checking for gluNewTess in -lGLU
+configure:7472: checking for gluNewTess in -lGLU
-configure:7490: gcc -o conftest -g     -lm conftest.c -lGLU  -lGL  >&5
+configure:7497: gcc -o conftest -g     -lm conftest.c -lGLU  -lGL  >&5
-configure:7490: $? = 0
+configure:7497: $? = 0
-configure:7499: result: yes
+configure:7506: result: yes
-configure:7550: checking cairo/cairo.h usability
+configure:7557: checking cairo/cairo.h usability
-configure:7550: gcc -c -g   conftest.c >&5
+configure:7557: gcc -c -g   conftest.c >&5
-configure:7550: $? = 0
+configure:7557: $? = 0
-configure:7550: result: yes
+configure:7557: result: yes
-configure:7550: checking cairo/cairo.h presence
+configure:7557: checking cairo/cairo.h presence
-configure:7550: gcc -E   conftest.c
+configure:7557: gcc -E   conftest.c
-configure:7550: $? = 0
+configure:7557: $? = 0
-configure:7550: result: yes
+configure:7557: result: yes
-configure:7550: checking for cairo/cairo.h
+configure:7557: checking for cairo/cairo.h
-configure:7550: result: yes
+configure:7557: result: yes
-configure:7568: checking for cairo_user_to_device in -lcairo
+configure:7575: checking for cairo_user_to_device in -lcairo
-configure:7593: gcc -o conftest -g     -lm conftest.c -lcairo  -lGLU -lGL  >&5
+configure:7600: gcc -o conftest -g     -lm conftest.c -lcairo  -lGLU -lGL  >&5
-configure:7593: $? = 0
+configure:7600: $? = 0
-configure:7602: result: yes
+configure:7609: result: yes
-configure:8399: creating ./config.status
+configure:8416: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
@@ -651,8 +651,8 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 
 on stravinsky
 
-config.status:799: creating defs.mak
+config.status:801: creating defs.mak
-config.status:902: WARNING:  'defs.mak.in' seems to ignore the --datarootdir setting
+config.status:904: WARNING:  'defs.mak.in' seems to ignore the --datarootdir setting
 
 ## ---------------- ##
 ## Cache variables. ##
@@ -759,7 +759,7 @@ CPPFLAGS=''
 CSH='/bin/csh'
 CXX='g++'
 CXXFLAGS='-g -O2'
-DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"30\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1'
+DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"34\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1'
 DEPEND_FLAG='-MM'
 ECHO_C=''
 ECHO_N='printf'
@@ -780,10 +780,11 @@ LDFLAGS=''
 LD_RUN_PATH=''
 LIBOBJS=''
 LIBS='-lcairo -lGLU -lGL '
-LIB_SPECS=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6'
+LIB_SPECS=' -L/usr/lib64 -ltkstub8.6 -L/usr/lib64 -ltclstub8.6'
+LIB_SPECS_NOSTUB=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6'
 LTLIBOBJS=''
 M4='/bin/m4'
-MAGIC_REVISION='30'
+MAGIC_REVISION='34'
 MAGIC_VERSION='8.2'
 MCPP='${MAGICDIR}/scripts/preproc.py'
 OA=''
@@ -862,6 +863,7 @@ rl_defs=''
 rl_libs=''
 sbindir='${exec_prefix}/sbin'
 sharedstatedir='${prefix}/com'
+stub_defs=' -DUSE_TCL_STUBS -DUSE_TK_STUBS'
 sub_extra_libs=''
 sysconfdir='${prefix}/etc'
 target='x86_64-unknown-linux-gnu'
@@ -884,7 +886,7 @@ unused=' readline lisp'
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_URL ""
 #define MAGIC_VERSION "8.2"
-#define MAGIC_REVISION "30"
+#define MAGIC_REVISION "34"
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1

scripts/config.status

@@ -588,7 +588,7 @@ S["INSTALL_TARGET"]="install-tcl"
 S["ALL_TARGET"]="tcl"
 S["OA_LIBS"]=""
 S["OA"]=""
-S["MAGIC_REVISION"]="30"
+S["MAGIC_REVISION"]="34"
 S["MAGIC_VERSION"]="8.2"
 S["SCPP"]="gcc -E -x c"
 S["MCPP"]="${MAGICDIR}/scripts/preproc.py"
@@ -610,6 +610,7 @@ S["sub_extra_libs"]=""
 S["top_extra_libs"]=""
 S["ld_extra_objs"]=""
 S["ld_extra_libs"]=""
+S["stub_defs"]=" -DUSE_TCL_STUBS -DUSE_TK_STUBS"
 S["extra_defs"]=" -DCAD_DIR=\\\"${LIBDIR}\\\" -DBIN_DIR=\\\"${BINDIR}\\\" -DTCL_DIR=\\\"${TCLDIR}\\\""
 S["extra_libs"]=" ${MAGICDIR}/ext2sim/libext2sim.o ${MAGICDIR}/ext2spice/libext2spice.o ${MAGICDIR}/calma/libcalma.o ${MAGICDIR}/cif/libcif.o ${MAGICDIR}/plot/libplo"\
 "t.o ${MAGICDIR}/lef/liblef.o ${MAGICDIR}/extflat/libextflat.o ${MAGICDIR}/garouter/libgarouter.o 	${MAGICDIR}/mzrouter/libmzrouter.o ${MAGICDIR}/rou"\
@@ -620,7 +621,8 @@ S["gr_libs"]=" -lX11 -lGL -lGLU -lXi -lXmu -lXext -lm -lcairo -lfontconfig -lfre
 S["TCL_LIB_DIR"]="/usr/lib"
 S["TCLSH_EXE"]="/usr/bin/tclsh"
 S["WISH_EXE"]="/usr/bin/wish"
-S["LIB_SPECS"]=" -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6"
+S["LIB_SPECS_NOSTUB"]=" -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6"
+S["LIB_SPECS"]=" -L/usr/lib64 -ltkstub8.6 -L/usr/lib64 -ltclstub8.6"
 S["INC_SPECS"]=""
 S["EXTRA_LIB_SPECS"]="-ldl"
 S["SHLIB_LIB_SPECS"]=""
@@ -674,7 +676,7 @@ S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=\\\"\\\" -DPACKAGE_STRING=\\\"\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\" -DMAGIC_VERSION="\
-"\\\"8.2\\\" -DMAGIC_REVISION=\\\"30\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHA"\
+"\\\"8.2\\\" -DMAGIC_REVISION=\\\"34\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHA"\
 "VE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_U"\
 "NSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE"\
 "_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHA"\

scripts/configure

@@ -648,6 +648,7 @@ sub_extra_libs
 top_extra_libs
 ld_extra_objs
 ld_extra_libs
+stub_defs
 extra_defs
 extra_libs
 SCRIPTS
@@ -656,6 +657,7 @@ gr_libs
 TCL_LIB_DIR
 TCLSH_EXE
 WISH_EXE
+LIB_SPECS_NOSTUB
 LIB_SPECS
 INC_SPECS
 EXTRA_LIB_SPECS
@@ -5295,6 +5297,7 @@ fi
     ;;
 esac
 
+stub_defs=""
 extra_defs="$extra_defs -DCAD_DIR=\\\"\${LIBDIR}\\\" -DBIN_DIR=\\\"\${BINDIR}\\\""
 X_LIBS=
 X_CFLAGS=
@@ -6716,6 +6719,7 @@ $as_echo "${TCLSH_EXE}" >&6; }
   if test "x${magic_with_tcl_libraries}" != "x" ; then
     for libname in \
      "${magic_with_tcl_libraries}/${TCL_LIB_FILE}" \
+     "${magic_with_tcl_libraries}/lib${TCL_LIB_FILE}" \
      "${magic_with_tcl_libraries}/lib${TCL_LIB_NAME}${SHDLIB_EXT}" \
      "${magic_with_tcl_libraries}/lib${TCL_LIB_NAME}${SHDLIB_EXT_ALT}"
     do
@@ -6733,7 +6737,8 @@ $as_echo "${TCLSH_EXE}" >&6; }
   else
     for libname in \
      "${loclib:=${TCL_EXEC_PREFIX}/lib}/lib${TCL_LIB_NAME}${SHDLIB_EXT}" \
-     "${loclib:=${TCL_EXEC_PREFIX}/lib}/lib${TCL_LIB_NAME}${SHDLIB_EXT_ALT}"
+     "${loclib:=${TCL_EXEC_PREFIX}/lib}/lib${TCL_LIB_NAME}${SHDLIB_EXT_ALT}" \
+     "${loclib:=${TCL_EXEC_PREFIX}/lib64}/lib${TCL_LIB_NAME}${SHDLIB_EXT}"
     do
       if test -r "$libname" ; then
         TCL_LIB_DIR="${TCL_EXEC_PREFIX}/lib"
@@ -6752,6 +6757,7 @@ if test $usingTcl ; then
   if test "x${magic_with_tk_libraries}" != "x" ; then
     for libname in \
      "${magic_with_tk_libraries}/${TCL_LIB_FILE}" \
+     "${magic_with_tk_libraries}/lib${TCL_LIB_FILE}" \
      "${magic_with_tk_libraries}/lib${TK_LIB_NAME}${SHDLIB_EXT}" \
      "${magic_with_tk_libraries}/lib${TK_LIB_NAME}${SHDLIB_EXT_ALT}"
     do
@@ -6768,7 +6774,8 @@ if test $usingTcl ; then
   else
     for libname in \
      "${loclib:=${TK_EXEC_PREFIX}/lib}/lib${TK_LIB_NAME}${SHDLIB_EXT}" \
-     "${loclib:=${TK_EXEC_PREFIX}/lib}/lib${TK_LIB_NAME}${SHDLIB_EXT_ALT}"
+     "${loclib:=${TK_EXEC_PREFIX}/lib}/lib${TK_LIB_NAME}${SHDLIB_EXT_ALT}" \
+     "${loclib:=${TK_EXEC_PREFIX}/lib64}/lib${TK_LIB_NAME}${SHDLIB_EXT}"
     do
       if test -r "$libname" ; then
         TK_LIB_DIR="${TK_EXEC_PREFIX}/lib"
@@ -7654,6 +7661,7 @@ if test $usingTcl ; then
 
   extra_libs="$extra_libs \${MAGICDIR}/tcltk/libtcltk.o"
   extra_defs="$extra_defs -DTCL_DIR=\\\"\${TCLDIR}\\\""
+  stub_defs="$stub_defs -DUSE_TCL_STUBS -DUSE_TK_STUBS"
 elif test $usingScheme ; then
   modules="$modules lisp"
   unused="$unused tcltk"
@@ -7768,6 +7776,8 @@ case $target in
 
     ;;
   *darwin*)
+    $as_echo "#define macosx 1" >>confdefs.h
+
     if test "$CPP" = "cc -E" ; then
        CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
     fi
@@ -7779,6 +7789,7 @@ esac
 # -----------------------------------------------------------------------
 
 if test $usingTcl ; then
+    LIB_SPECS_NOSTUB="${LIB_SPECS}"
 
 # -----------------------------------------------------------------------
 #
@@ -7790,9 +7801,11 @@ if test $usingTcl ; then
   fi
   if test "${TK_LIB_DIR}" = "/usr/lib" -o \
         "${TK_LIB_DIR}" = "/usr/lib64" ; then
-    LIB_SPECS="${LIB_SPECS} ${TK_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} ${TK_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} ${TK_STUB_LIB_SPEC}"
   else
-    LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} -L${TK_LIB_DIR} ${TK_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_STUB_LIB_SPEC}"
     if test "x${loader_run_path}" = "x" ; then
       loader_run_path="${TK_LIB_DIR}"
     else
@@ -7817,9 +7830,11 @@ if test $usingTcl ; then
   if test "${TCL_LIB_DIR}" = "/usr/lib" -o \
         "${TCL_LIB_DIR}" = "/usr/lib64" -o \
         "${TCL_LIB_DIR}" = "${TK_LIB_DIR}" ; then
-    LIB_SPECS="${LIB_SPECS} ${TCL_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} ${TCL_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} ${TCL_STUB_LIB_SPEC}"
   else
-    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_STUB_LIB_SPEC}"
     if test "x${loader_run_path}" = "x" ; then
       loader_run_path="${TCL_LIB_DIR}"
     else
@@ -7909,7 +7924,7 @@ if test $usingTcl ; then
       SHDLIB_EXT=".dylib"
       LDDL_FLAGS="-dynamiclib -flat_namespace -undefined suppress -noprebind"
       LDFLAGS="${LDFLAGS} ${LIB_SPECS}"
-      CFLAGS="${CFLAGS} ${X_CFLAGS} ${INC_SPECS} -fno-common"
+      CFLAGS="${CFLAGS} ${X_CFLAGS} ${INC_SPECS} -I/sw/include -fno-common"
       ;;
 
     *cygwin*)
@@ -8192,6 +8207,7 @@ fi
 
 
 
+
 fi
 
 if test "$GCC" = "yes" ; then
@@ -8241,6 +8257,7 @@ fi
 
 
 
+
 
 
 ac_config_files="$ac_config_files defs.mak"

scripts/configure.in

@@ -257,6 +257,7 @@ case $target in
     ;;
 esac
 
+stub_defs=""
 extra_defs="$extra_defs -DCAD_DIR=\\\"\${LIBDIR}\\\" -DBIN_DIR=\\\"\${BINDIR}\\\""
 X_LIBS=
 X_CFLAGS=
@@ -779,6 +780,7 @@ if test $usingTcl ; then
   if test "x${magic_with_tcl_libraries}" != "x" ; then
     for libname in \
      "${magic_with_tcl_libraries}/${TCL_LIB_FILE}" \
+     "${magic_with_tcl_libraries}/lib${TCL_LIB_FILE}" \
      "${magic_with_tcl_libraries}/lib${TCL_LIB_NAME}${SHDLIB_EXT}" \
      "${magic_with_tcl_libraries}/lib${TCL_LIB_NAME}${SHDLIB_EXT_ALT}"
     do
@@ -796,7 +798,8 @@ if test $usingTcl ; then
   else
     for libname in \
      "${loclib:=${TCL_EXEC_PREFIX}/lib}/lib${TCL_LIB_NAME}${SHDLIB_EXT}" \
-     "${loclib:=${TCL_EXEC_PREFIX}/lib}/lib${TCL_LIB_NAME}${SHDLIB_EXT_ALT}"
+     "${loclib:=${TCL_EXEC_PREFIX}/lib}/lib${TCL_LIB_NAME}${SHDLIB_EXT_ALT}" \
+     "${loclib:=${TCL_EXEC_PREFIX}/lib64}/lib${TCL_LIB_NAME}${SHDLIB_EXT}"
     do
       if test -r "$libname" ; then
         TCL_LIB_DIR="${TCL_EXEC_PREFIX}/lib"
@@ -815,6 +818,7 @@ if test $usingTcl ; then
   if test "x${magic_with_tk_libraries}" != "x" ; then
     for libname in \
      "${magic_with_tk_libraries}/${TCL_LIB_FILE}" \
+     "${magic_with_tk_libraries}/lib${TCL_LIB_FILE}" \
      "${magic_with_tk_libraries}/lib${TK_LIB_NAME}${SHDLIB_EXT}" \
      "${magic_with_tk_libraries}/lib${TK_LIB_NAME}${SHDLIB_EXT_ALT}"
     do
@@ -831,7 +835,8 @@ if test $usingTcl ; then
   else
     for libname in \
      "${loclib:=${TK_EXEC_PREFIX}/lib}/lib${TK_LIB_NAME}${SHDLIB_EXT}" \
-     "${loclib:=${TK_EXEC_PREFIX}/lib}/lib${TK_LIB_NAME}${SHDLIB_EXT_ALT}"
+     "${loclib:=${TK_EXEC_PREFIX}/lib}/lib${TK_LIB_NAME}${SHDLIB_EXT_ALT}" \
+     "${loclib:=${TK_EXEC_PREFIX}/lib64}/lib${TK_LIB_NAME}${SHDLIB_EXT}"
     do
       if test -r "$libname" ; then
         TK_LIB_DIR="${TK_EXEC_PREFIX}/lib"
@@ -1247,6 +1252,7 @@ if test $usingTcl ; then
   AC_DEFINE(MAGIC_WRAPPER)
   extra_libs="$extra_libs \${MAGICDIR}/tcltk/libtcltk.o"
   extra_defs="$extra_defs -DTCL_DIR=\\\"\${TCLDIR}\\\""
+  stub_defs="$stub_defs -DUSE_TCL_STUBS -DUSE_TK_STUBS"
 elif test $usingScheme ; then
   modules="$modules lisp"
   unused="$unused tcltk"
@@ -1358,6 +1364,7 @@ case $target in
     AC_DEFINE(i386)
     ;;
   *darwin*)
+    AC_DEFINE(macosx)
     if test "$CPP" = "cc -E" ; then
        CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
     fi
@@ -1369,6 +1376,7 @@ esac
 # -----------------------------------------------------------------------
 
 if test $usingTcl ; then
+    LIB_SPECS_NOSTUB="${LIB_SPECS}"
 
 # -----------------------------------------------------------------------
 #
@@ -1380,9 +1388,11 @@ if test $usingTcl ; then
   fi
   if test "${TK_LIB_DIR}" = "/usr/lib" -o \
         "${TK_LIB_DIR}" = "/usr/lib64" ; then
-    LIB_SPECS="${LIB_SPECS} ${TK_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} ${TK_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} ${TK_STUB_LIB_SPEC}"
   else
-    LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} -L${TK_LIB_DIR} ${TK_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_STUB_LIB_SPEC}"
     if test "x${loader_run_path}" = "x" ; then
       loader_run_path="${TK_LIB_DIR}"
     else
@@ -1407,9 +1417,11 @@ if test $usingTcl ; then
   if test "${TCL_LIB_DIR}" = "/usr/lib" -o \
         "${TCL_LIB_DIR}" = "/usr/lib64" -o \
         "${TCL_LIB_DIR}" = "${TK_LIB_DIR}" ; then
-    LIB_SPECS="${LIB_SPECS} ${TCL_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} ${TCL_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} ${TCL_STUB_LIB_SPEC}"
   else
-    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_STUB_LIB_SPEC}"
     if test "x${loader_run_path}" = "x" ; then
       loader_run_path="${TCL_LIB_DIR}"
     else
@@ -1499,7 +1511,7 @@ if test $usingTcl ; then
       SHDLIB_EXT=".dylib"
       LDDL_FLAGS="-dynamiclib -flat_namespace -undefined suppress -noprebind"
       LDFLAGS="${LDFLAGS} ${LIB_SPECS}"
-      CFLAGS="${CFLAGS} ${X_CFLAGS} ${INC_SPECS} -fno-common"
+      CFLAGS="${CFLAGS} ${X_CFLAGS} ${INC_SPECS} -I/sw/include -fno-common"
       ;;
 
     *cygwin*)
@@ -1728,6 +1740,7 @@ if test $usingTcl ; then
   AC_SUBST(LDFLAGS)
   AC_SUBST(INC_SPECS)
   AC_SUBST(LIB_SPECS)
+  AC_SUBST(LIB_SPECS_NOSTUB)
   AC_SUBST(WISH_EXE)
   AC_SUBST(TCLSH_EXE)
   AC_SUBST(TCL_LIB_DIR)
@@ -1746,6 +1759,7 @@ AC_SUBST(PACKAGE)
 AC_SUBST(SCRIPTS)
 AC_SUBST(extra_libs)
 AC_SUBST(extra_defs)
+AC_SUBST(stub_defs)
 AC_SUBST(ld_extra_libs)
 AC_SUBST(ld_extra_objs)
 AC_SUBST(top_extra_libs)

scripts/defs.mak

@@ -57,19 +57,22 @@ RANLIB                 = ranlib
 SHDLIB_EXT             = .so
 LDDL_FLAGS             = ${LDFLAGS} -shared -Wl,-soname,$@ -Wl,--version-script=${MAGICDIR}/magic/symbol.map
 LD_RUN_PATH	       = 
-LIB_SPECS	       =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
+LIB_SPECS	       =  -L/usr/lib64 -ltkstub8.6 -L/usr/lib64 -ltclstub8.6
+LIB_SPECS_NOSTUB       =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
 WISH_EXE	       = /usr/bin/wish
 TCL_LIB_DIR	       = /usr/lib
 MAGIC_VERSION	       = 8.2
-MAGIC_REVISION	       = 30
+MAGIC_REVISION	       = 34
 
 CC                     = gcc
 CPP                    = gcc -E
 CXX		       = g++
 
 CPPFLAGS               = -I. -I${MAGICDIR} 
-DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"30\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\"
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\"  -DUSE_TCL_STUBS -DUSE_TK_STUBS -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"34\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DGCORE=\"/bin/gcore\"
-DFLAGS		      += -DSHDLIB_EXT=\".so\"
+DFLAGS		      += -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS_NOSTUB	       =  -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"34\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DGCORE=\"/bin/gcore\"
+DFLAGS_NOSTUB	      += -DSHDLIB_EXT=\".so\" -DNDEBUG
 CFLAGS                 = -g -m64 -fPIC -Wimplicit-int -fPIC 
 
 READLINE_DEFS          = 

scripts/defs.mak.in

@@ -58,6 +58,7 @@ SHDLIB_EXT             = @SHDLIB_EXT@
 LDDL_FLAGS             = ${LDFLAGS} @LDDL_FLAGS@
 LD_RUN_PATH	       = @LD_RUN_PATH@
 LIB_SPECS	       = @LIB_SPECS@
+LIB_SPECS_NOSTUB       = @LIB_SPECS_NOSTUB@
 WISH_EXE	       = @WISH_EXE@
 TCL_LIB_DIR	       = @TCL_LIB_DIR@
 MAGIC_VERSION	       = @MAGIC_VERSION@
@@ -68,8 +69,10 @@ CPP                    = @CPP@
 CXX		       = @CXX@
 
 CPPFLAGS               = -I. -I${MAGICDIR} @CPPFLAGS@
-DFLAGS                 = @extra_defs@ @DEFS@ -DNDEBUG -DGCORE=\"@GCORE@\"
+DFLAGS                 = @extra_defs@ @stub_defs@ @DEFS@ -DGCORE=\"@GCORE@\"
-DFLAGS		      += -DSHDLIB_EXT=\"@SHDLIB_EXT@\"
+DFLAGS		      += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
+DFLAGS_NOSTUB	       = @extra_defs@ @DEFS@ -DGCORE=\"@GCORE@\"
+DFLAGS_NOSTUB	      += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
 CFLAGS                 = @CFLAGS@ @SHLIB_CFLAGS@ @INC_SPECS@
 
 READLINE_DEFS          = @rl_defs@

tcltk/Makefile

@@ -48,12 +48,12 @@ install-tcl: magicexec magicdnull ${BIN_FILES} ${TCL_FILES}
 	(cd $(DESTDIR)${TCLDIR}; chmod 0755 tkcon.tcl tkshell.tcl)
 
 magicexec: magicexec.c ${MAGICDIR}/defs.mak
-	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicexec.c \
+	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS_NOSTUB} ${LDFLAGS} magicexec.c \
-		-o magicexec ${LD_RUN_PATH} ${LIBS} ${LIB_SPECS}
+		-o magicexec ${LD_RUN_PATH} ${LIBS} ${LIB_SPECS_NOSTUB}
 
 magicdnull: magicdnull.c ${MAGICDIR}/defs.mak
-	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicdnull.c \
+	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS_NOSTUB} ${LDFLAGS} magicdnull.c \
-		-o magicdnull ${LD_RUN_PATH} ${LIBS} ${LIB_SPECS}
+		-o magicdnull ${LD_RUN_PATH} ${LIBS} ${LIB_SPECS_NOSTUB}
 
 magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak
 	sed -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g  \

tcltk/magic.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+#
+# For installation, put this file (magic.sh) in a known executable path.
+# Put startup script "magic.tcl", shared library "tclmagic.so", and
+# "wish" replacement "magicexec" in ${CAD_ROOT}/magic/tcl/.
+#
+# This script starts magic under the Tcl interpreter,
+# reading commands from a special startup script which
+# launches magic and retains the Tcl interactive interpreter.
+
+# Parse for the argument "-c[onsole]".  If it exists, run magic
+# with the TkCon console.  Strip this argument from the argument list.
+
+TKCON=true
+DNULL=
+MAGIC_WISH=/usr/bin/wish
+export MAGIC_WISH
+
+# Hacks for Cygwin
+if [ "`uname | cut -d_ -f1`" = "CYGWIN" ]; then
+   export PATH="$PATH:/usr/lib"
+   export DISPLAY=${DISPLAY:=":0"}
+fi
+
+# Preserve quotes in arguments
+arglist=''
+for i in "$@" ; do
+   case $i in
+      -noc*) TKCON=;;
+      -dnull) DNULL=true;;
+      --version) TKCON=; DNULL=true;;
+      --prefix) TKCON=; DNULL=true;;
+      *) arglist="$arglist${arglist:+ }\"${i//\"/\\\"}\"";;
+   esac
+done
+
+if [ $TKCON ]; then
+
+   if [ $DNULL ]; then
+      exec /usr/local/lib/magic/tcl/tkcon.tcl -eval "source /usr/local/lib/magic/tcl/console.tcl" \
+	   -slave "set argc $#; set argv [list $*]; source /usr/local/lib/magic/tcl/magic.tcl"
+   else
+      exec /usr/local/lib/magic/tcl/tkcon.tcl -eval "source /usr/local/lib/magic/tcl/console.tcl" \
+	   -slave "package require Tk; set argc $#; set argv [list $arglist]; \
+	   source /usr/local/lib/magic/tcl/magic.tcl"
+   fi
+
+else
+
+#
+# Run the stand-in for wish (magicexec), which acts exactly like "wish"
+# except that it replaces ~/.wishrc with magic.tcl.  This executable is
+# *only* needed when running without the console; the console itself is
+# capable of sourcing the startup script.
+#
+# With option "-dnull" we set up for operation without Tk (simple interpreter
+# only, efficient for running in batch mode).
+#
+   if [ $DNULL ]; then
+      exec /usr/local/lib/magic/tcl/magicdnull -nowrapper "$@"
+   else
+      exec /usr/local/lib/magic/tcl/magicexec -- "$@"
+   fi
+fi

tcltk/magic.tcl

@@ -0,0 +1,406 @@
+# Wishrc startup for ToolScript (magic)
+#
+# For installation:  Put this file and also magicwrap.so into
+# directory /usr/local/lib/magic/tcl, and set the "load" line below
+# to point to the location of magicwrap.so.  Also see comments
+# in shell script "magic.sh".
+
+global Opts
+  
+# If we called magic via the non-console script, then we want to reset
+# the environment variable HOME to its original value.
+   
+if {${tcl_version} >= 8.6} {
+   load -lazy /usr/local/lib/magic/tcl/tclmagic.so
+} else {
+   load /usr/local/lib/magic/tcl/tclmagic.so
+}
+
+# It is important to make sure no magic commands overlap with Tcl built-in
+# commands, because otherwise the namespace import will fail.
+
+proc pushnamespace { name } {
+
+   set y [namespace eval ${name} info commands ::${name}::*]
+   set z [info commands]
+
+# Watch especially for magic "wizard" commands, as we don't want to confuse
+# the literal "*" with a regular expression *.  "regsub" below takes care of it.
+
+   foreach v $y {
+      regsub -all {\*} $v {\\*} i
+      set x [namespace tail $i]
+      if {[lsearch $z $x] < 0} { 
+         namespace import $i                       
+      }
+   }
+}
+
+proc popnamespace { name } {
+   set z [info commands]
+   set l [expr [string length ${name}] + 5]
+
+   while {[set v [lsearch $z ${name}_tcl_*]] >= 0} {
+      set y [lindex $z $v]
+      set w [string range $y $l end]
+      interp alias {} ::$w {}
+      rename ::$y ::$w
+      puts "Info: replacing ::$w with ::$y"
+   }
+   namespace forget ::${name}::*
+}
+
+#----------------------------------------------------------------------
+# Define the drcstate procedure expected by the background DRC code.
+
+proc magic::drcstate {option} {
+   # (Null proc---see wrapper.tcl for a useful version)
+}
+
+#-----------------------------------------------------------------
+# Define these console routines so that they don't produce errors
+# when Magic is run in batch mode
+
+if {[catch {tkcon title}]} {
+   proc magic::suspendout {} {}
+   proc magic::resumeout {} {}
+   proc magic::dialog {} {}
+   proc magic::consolegeometry {} {}
+   proc magic::consolefocus {} {}
+}
+
+#----------------------------------------------------------------------
+# Cross-Application section
+#----------------------------------------------------------------------
+
+# Check namespaces for existence of other applications
+set UsingIRSIM 0
+set UsingXCircuit 0
+set UsingNetgen 0
+set nlist [namespace children]
+foreach i $nlist {
+   switch $i {
+      ::irsim { set UsingIRSIM 1 }
+      ::xcircuit { set UsingXCircuit 1 }
+      ::netgen { set UsingNetgen 1 }
+   }
+}
+
+# Setup IRSIM assuming that the Tcl version is installed.
+# We do not need to rename procedure irsim to NULL because it is
+# redefined in a script, which simply overwrites the original.
+
+proc irsim { args } {
+   global CAD_ROOT
+   set irsimscript [glob -nocomplain ${CAD_ROOT}/irsim/tcl/irsim.tcl]
+   if { ${irsimscript} == {} } {
+      puts stderr "\"irsim\" requires Tcl-based IRSIM version 9.6 or newer."
+      puts stderr "Could not find script \"irsim.tcl\".  If IRSIM is installed in a"
+      puts stderr "place other than CAD_ROOT (=${CAD_ROOT}), use the command"
+      puts stderr "\"source <path>/irsim.tcl\" before doing \"irsim\"."
+   } else {
+      source $irsimscript
+      eval {irsim} $args
+   }
+}
+
+# Setup Xcircuit assuming that the Tcl version is installed.
+
+proc xcircuit { args } {
+   global CAD_ROOT
+   global argc
+   global argv
+   set xcircscript [glob -nocomplain ${CAD_ROOT}/xcircuit*/xcircuit.tcl]
+   if { ${xcircscript} == {} } {
+      puts stderr "\"xcircuit\" requires Tcl-based XCircuit version 3.1 or newer."
+      puts stderr "Could not find script \"xcircuit.tcl\".  If XCircuit is installed in a"
+      puts stderr "place other than CAD_ROOT (=${CAD_ROOT}), use the command"
+      puts stderr "\"source <path>/xcircuit.tcl\"."
+   } else {
+      # if there are multiple installed versions, choose the highest version.
+      if {[llength $xcircscript] > 1} {
+	set xcircscript [lindex [lsort -decreasing -dictionary $xcircscript] 0]
+      }
+      # execute script in the scope of magic, because its variable space is
+      # not modularized.
+      set argv $args
+      set argc [llength $args] 
+      uplevel #0 source $xcircscript
+   }
+}
+
+# Setup Netgen assuming that the Tcl version is installed.
+
+proc netgen { args } {
+   global CAD_ROOT
+   global argc
+   global argv
+   set netgenscript [glob -nocomplain ${CAD_ROOT}/netgen/tcl/netgen.tcl]
+   if { ${netgenscript} == {} } {
+      puts stderr "\"netgen\" requires Tcl-based Netgen version 1.2 or newer."
+      puts stderr "Could not find script \"netgen.tcl\".  If Netgen is installed in a"
+      puts stderr "place other than CAD_ROOT (=${CAD_ROOT}), use the command"
+      puts stderr "\"source <path>/netgen.tcl\"."
+   } else {
+      set argv $args
+      set argc [llength $args] 
+      uplevel #0 source $netgenscript
+   }
+}
+
+# Add the "echo" command
+
+proc echo {args} {
+   puts stdout $args  
+}
+
+# Parse argument list for "-c[onsole]" and "-now[rapper]".
+
+set celllist {}
+set do_wrapper true
+set do_recover false
+set argafter {magic::initialize}
+set x {}
+for {set i 0} {$i < $argc} {incr i 1} {
+   set x [lindex $argv $i]
+#
+# Command-line argument handling goes here
+# We have to handle all of magic's command line arguments so we can
+# figure out if a cell has been named for preloading.
+#
+   switch -regexp -- $x {
+      ^-now(rap)?(per)?$ {	  ;# This regexp accepts -now, -nowrap, and -nowrapper
+	 set do_wrapper false
+      }
+      ^-dnull {
+	 set do_wrapper false
+         lappend argafter $x
+      }
+      ^-r(e)?(cover)?$ {
+	 set do_recover true
+      }
+      ^-rc(file)?$ {
+         lappend argafter $x
+         incr i 1
+         lappend argafter [lindex $argv $i]
+      }
+      ^-d -
+      ^-g -
+      ^-m -
+      ^-i -
+      ^-T {
+         lappend argafter $x
+         incr i 1
+         lappend argafter [lindex $argv $i]
+      }
+      ^-F {
+         lappend argafter $x
+         incr i 1
+         lappend argafter [lindex $argv $i]
+         incr i 1
+         lappend argafter [lindex $argv $i]
+      }
+      ^--version {
+	 puts stdout "8.2.34"
+	 exit 0
+      }
+      ^--prefix {
+	 puts stdout $CAD_ROOT
+	 exit 0
+      }
+      ^-D -
+      ^-n* {
+         lappend argafter $x
+      }
+      default {
+         lappend celllist $x
+         lappend argafter $x
+      }
+   }
+}
+
+if {$do_wrapper} {
+  source ${CAD_ROOT}/magic/tcl/wrapper.tcl
+  lappend argafter "-nowindow" ;# Set no-initial-window option in magic.
+}
+unset x i do_wrapper
+if {[catch {eval $argafter}]}  {		;# magic::initialize ${argv}
+   exit 1
+}
+
+#----------------------------------------------------------------------
+# Check for presence of padlist manager script and include it
+
+if {[file exists ${CAD_ROOT}/magic/tcl/padlist.tcl]} {
+   source ${CAD_ROOT}/magic/tcl/padlist.tcl
+   set Opts(padlist) 0
+}
+
+#----------------------------------------------------------------------
+# Check for presence of the miscellaneous tools script and include it
+
+if {[file exists ${CAD_ROOT}/magic/tcl/tools.tcl]} {
+   source ${CAD_ROOT}/magic/tcl/tools.tcl
+   set Opts(tools) 0
+}
+
+#----------------------------------------------------------------------
+# Check for presence of the mazerouter script and include it
+
+if {[file exists ${CAD_ROOT}/magic/tcl/mazeroute.tcl]} {
+   source ${CAD_ROOT}/magic/tcl/mazeroute.tcl
+   set Opts(mazeroute) 0
+}
+
+#----------------------------------------------------------------------
+# Check for presence of the toolkit script and include it
+# NOTE:  This supercedes the older toolkit which is now
+# named toolkit_rev0.tcl, and the intermediate bsitools.tcl,
+# which are folded into the newer toolkit.tcl.
+
+if {[file exists ${CAD_ROOT}/magic/tcl/toolkit.tcl]} {
+   source ${CAD_ROOT}/magic/tcl/toolkit.tcl
+   set Opts(toolkit) 0
+}
+
+#----------------------------------------------------------------------
+# Magic start function drops back to interpreter after initialization & setup
+
+set auto_noexec 1	;# don't EVER call UNIX commands w/o "shell" in front
+
+# Have we called magic from tkcon or a clone thereof?  If so, set MagicConsole
+
+if {[lsearch [interp aliases] tkcon] != -1} {
+   set MagicConsole tkcon
+   catch {wm withdraw .}
+
+   # Get rid of some overlapping tkcon commands which are not needed.
+
+   if {[lsearch [info commands] orig_edit] < 0} {rename edit orig_edit}
+   if {[lsearch [info commands] orig_dump] < 0} {rename dump orig_dump}
+   if {[lsearch [info commands] orig_what] < 0} {rename what orig_what}
+} else {
+   rename unknown tcl_unknown
+   proc unknown { args } {
+      # CAD tools special:
+      # Check for commands which were renamed to tcl_(command)
+
+      set cmd [lindex $args 0]
+      if {[lsearch [info commands] tcl_$cmd] >= 0} {
+         set arglist [concat tcl_$cmd [lrange $args 1 end]]
+         set ret [catch {eval $arglist} result]
+         if {$ret == 0} {
+            return $result
+         } else {
+            return -code $ret -errorcode $errorCode $result
+         }
+      }
+      return [eval [concat tcl_unknown $args]]
+   }
+}
+
+# Set up certain commands to act like they do in non-Tcl-based magic;
+# These are the commands whose names have been extended so they don't
+# conflict with existing Tcl/Tk commands.  This renaming & importing
+# *requires* the special code in the magic Tcl command dispatcher to
+# find and deal with each of these renamed commands!
+
+if {[lsearch [info commands] orig_clock] < 0} {rename clock orig_clock}
+if {[lsearch [info commands] tcl_flush] < 0} {rename flush tcl_flush}
+if {[lsearch [info commands] tcl_load] < 0} {rename load  tcl_load}
+if {[lsearch [info commands] tcl_array] < 0} {rename array tcl_array}
+if {[lsearch [info commands] tcl_label] < 0} {catch {rename label tcl_label}}
+if {[lsearch [info commands] tcl_grid] < 0} {catch {rename grid tcl_grid}}
+
+namespace eval magic namespace export *
+pushnamespace magic
+
+#----------------------------------------------------------------------
+# Read system startup files (mostly macro definitions)
+# Read user startup file, if any
+# Load initial cell, if any
+
+magic::startup
+
+if {![catch {set toptitle [wm title .]}]} {
+   if {[string range $toptitle 0 3] == "wish"} {
+      wm withdraw .
+   }
+   if {[string range $toptitle 0 8] == "magicexec"} {
+      wm withdraw .
+   }
+   unset toptitle
+}
+
+# After loading, magic will wander off and do a complete DRC check
+# before executing the rest of the script unless we temporarily
+# disable the DRC checker.
+
+set drcstate [drc status]
+drc off
+
+# Initial window for wrapper, if defined.
+# empty string is equivalent to passing NULL cell name.
+#
+# If a startup file has created a window, then don't make another one.
+
+if {[info commands magic::openwrapper] != {}} {
+   if {[windownames layout] == {}} {
+      set winname [magic::openwrapper]
+      magic::techmanager initall
+      magic::scrollupdate $winname
+
+      foreach cellname $celllist {
+	 set fext [file extension $cellname]
+         puts stdout "handling file entry $cellname extension $fext"
+	 switch $fext {
+	     .lef -
+	     .LEF {lef read $cellname}
+	     .def -
+	     .DEF {def read $cellname}
+	     .gds -
+	     .GDS -
+	     .gds2 -
+	     .GDS2 -
+	     .gdsii -
+	     .GDSII {gds read $cellname}
+	     .cif -
+	     .CIF {cif read $cellname}
+	     .tcl {source $cellname}
+	     .mag -
+	     "" {magic::load $cellname}
+	     default {puts stderr "don't know how to load file $cellname"}
+	 }
+      }
+   }
+} else {
+   # Initial geometry handler for the default window, non-wrapper version
+   catch {wm geometry .magic1 ${Opts(geometry)}}
+}
+
+# Print the technology name and description
+puts stdout "Using technology \"[tech name]\", version [lindex [tech version] 0]"
+
+# Set a box, and set the view; if no cell has been loaded, choose a default
+# view.
+if {![box exists]} {
+   box 0 0 1 1		;# create a unit box
+}
+if {[llength $celllist] > 0} {
+   view
+} else {
+   view -9 -9 10 10
+}
+
+# The Tcl version handles the "-r" on the command line by calling
+# command crash recover.
+
+if {$do_recover} {crash recover}
+
+# Unset global TCL variables so they don't conflict with magic nodes.
+unset celllist nlist do_recover
+
+if {$drcstate == 1} {
+   drc on
+}
+unset drcstate

tcltk/magicdnull.c

@@ -24,6 +24,7 @@ magic_AppInit(interp)
     if (Tcl_Init(interp) == TCL_ERROR) {
 	return TCL_ERROR;
     }
+    Tcl_StaticPackage(interp, "Tcl", Tcl_Init, Tcl_Init);
 
     /* This is where we replace the home ".tclshrc" file with	*/
     /* magic's startup script.					*/

tcltk/magicexec.c

@@ -54,7 +54,8 @@ magic_AppInit(interp)
     if (Tk_Init(interp) == TCL_ERROR) {
 	return TCL_ERROR;
     }
-    Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
+    // Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
+    Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_Init);
 
     /* This is where we replace the home ".wishrc" file with	*/
     /* magic's startup script.					*/

tcltk/tclmagic.c

@@ -1199,7 +1199,7 @@ Tclmagic_Init(interp)
     /* Remember the interpreter */
     magicinterp = interp;
 
-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) return TCL_ERROR;
+    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
 
     /* Initialization and Startup commands */
     Tcl_CreateCommand(interp, "magic::initialize", (Tcl_CmdProc *)_magic_initialize,