Corrected an error in the name-matching of cells. This

comparison would look for matching names from the "equate
classes" command.  However, it failed to do the reverse
check, which is to make sure that if no forced match was
found for a cell, but there was a name match, that the
name-matched cell found is not being forcibly matched to
something else.

VERSION

@@ -1 +1 @@
-1.5.40
+1.5.45

base/netcmp.c

@@ -2395,7 +2395,7 @@ struct nlist *LookupClassEquivalent(char *model, int file1, int file2)
 struct nlist *LookupPrematchedClass(struct nlist *tc1, int file2)
 {
    struct Correspond *crec;
-   struct nlist *tc2;
+   struct nlist *tc2 = NULL;
 
    for (crec = ClassCorrespondence; crec != NULL; crec = crec->next) {
       if (crec->file1 == tc1->file) {
@@ -2719,7 +2719,7 @@ void DescendCountQueue(struct nlist *tc, int *level, int loclevel)
 void DescendCompareQueue(struct nlist *tc, struct nlist *tctop, int stoplevel,
 		int loclevel, int flip)
 {
-   struct nlist *tcsub, *tc2;
+   struct nlist *tcsub, *tc2, *tctest;
    struct objlist *ob;
    struct Correspond *scomp, *newcomp;
 
@@ -2728,12 +2728,24 @@ void DescendCompareQueue(struct nlist *tc, struct nlist *tctop, int stoplevel,
       // Find exact-name equivalents or cells that have been specified
       // as equivalent using the "equate class" command.
 
-      tc2 = LookupClassEquivalent(tc->name, tc->file, tctop->file);
+      // Check if cell names were forced to be matched using the
+      // "equate classes" command.  This takes precedence over any
+      // name matching.
+
+      tc2 = LookupPrematchedClass(tc, tctop->file);
       if (tc2 == NULL) {
-	 // Check if cell names were forced to be matched using the
-	 // "equate classes" command.
-	 tc2 = LookupPrematchedClass(tc, tctop->file);
+	 tc2 = LookupClassEquivalent(tc->name, tc->file, tctop->file);
+
+	 // If there is a name equivalent, then make sure that
+	 // the matching entry does not exist in the prematched
+	 // class list with a match to something else.
+
+         if (tc2 != NULL) {
+	    tctest = LookupPrematchedClass(tc2, tc->file);
+	    if (tctest != NULL && tctest != tc) return;
+         }
       }
+
       if (tc2 != NULL) {
 	 newcomp = (struct Correspond *)CALLOC(1, sizeof(struct Correspond));
 	 newcomp->next = NULL;

base/netfile.c

@@ -204,8 +204,15 @@ static struct filestack *OpenFiles = NULL;
 int GetNextLineNoNewline()
 {
   char *newbuf;
+  int testc;
 
   if (feof(infile)) return -1;
+
+  // This is more reliable than feof() ...
+  testc = getc(infile);
+  if (testc == -1) return -1;
+  ungetc(testc, infile); 
+
   if (linesize == 0) {
 	/* Allocate memory for line */
 	linesize = 500;
@@ -295,7 +302,7 @@ void SpiceTokNoNewline(void)
 	    ungetc(contline, infile);
 	    return;
 	}
-	GetNextLineNoNewline();
+	if (GetNextLineNoNewline() == -1) break;
     }
 }
 

base/objlist.c

@@ -344,6 +344,9 @@ void CellRehash(char *name, char *newname, int file)
   ptr = HashIntPtrInstall(newname, file, (void *)tp, cell_hashtab, CELLHASHSIZE);
   if (ptr != NULL)
      HashIntDelete(name, file, cell_hashtab, CELLHASHSIZE);
+
+  // Change the classhash to reflect the new name
+  tp->classhash = (*hashfunc)(newname, 0);
 }
 
 struct nlist *OldCell;

base/spice.c

@@ -373,6 +373,53 @@ int renamepins(struct hashlist *p, int file)
    }
 }
 
+/* If any pins are marked unconnected, see if there are	*/
+/* other pins of the same name that have connections.	*/
+/* Also remove any unconnected globals (just for cleanup) */
+
+void CleanupSubcell() {
+   int maxnode = 0;
+   struct objlist *sobj, *nobj, *lobj, *pobj;
+
+   if (CurrentCell == NULL) return;
+
+   for (sobj = CurrentCell->cell; sobj; sobj = sobj->next)
+      if (sobj->node > maxnode)
+	 maxnode = sobj->node + 1;
+
+   lobj = NULL;
+   for (sobj = CurrentCell->cell; sobj != NULL;) {
+      nobj = sobj->next;
+      if (sobj->node < 0) {
+         if (IsGlobal(sobj)) {
+ 	    if (lobj != NULL)
+	       lobj->next = sobj->next;
+	    else
+	       CurrentCell->cell = sobj->next;
+	    FreeObjectAndHash(sobj, CurrentCell);
+	 }
+	 else if (IsPort(sobj) && sobj->model.port == PROXY)
+	    sobj->node = maxnode++;
+	 else if (IsPort(sobj)) {
+	    for (pobj = CurrentCell->cell; pobj && (pobj->type == PORT);
+			pobj = pobj->next) {
+	       if (pobj == sobj) continue;
+	       if (matchnocase(pobj->name, sobj->name) && pobj->node >= 0) {
+		  sobj->node = pobj->node;
+		  break;
+	       }
+	    }
+	    lobj = sobj;
+	 }
+	 else
+	    lobj = sobj;
+      }
+      else
+         lobj = sobj;
+      sobj = nobj;
+   }
+}
+
 /*------------------------------------------------------*/
 /* Structure for stacking nested subcircuit definitions */
 /*------------------------------------------------------*/
@@ -422,7 +469,7 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
 {
   int cdnum = 1, rdnum = 1, ndev, multi;
   int warnings = 0, update = 0, hasports = 0;
-  char *eqptr, devtype;
+  char *eqptr, devtype, in_subckt;
   struct keyvalue *kvlist = NULL;
   char inst[256], model[256], instname[256];
   struct nlist *tp;
@@ -431,10 +478,12 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
   inst[255] = '\0';
   model[255] = '\0';
   instname[255] = '\0';
+  in_subckt = (char)0;
   
   while (!EndParseFile()) {
+
     SkipTok(); /* get the next token */
-    if (EndParseFile()) break;
+    if ((EndParseFile()) && (nexttok == NULL)) break;
 
     if (nexttok[0] == '*') SkipNewLine();
 
@@ -445,6 +494,12 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
 	 goto skip_ends;
       }
 
+      if (in_subckt == (char)1) {
+	  Fprintf(stderr, "Missing .ENDS statement on subcircuit.\n");
+          InputParseError(stderr);
+      }
+      in_subckt = (char)1;
+
       /* Save pointer to current cell */
       if (CurrentCell != NULL)
          parent = CurrentCell->cell;
@@ -474,13 +529,14 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
 	    n = -1;
 	 }
 
-	 Printf("Duplicate cell %s in file; renaming.\n", nexttok);
+	 Printf("Duplicate cell %s in file\n", nexttok);
          while (tp != NULL) {
 	    n++;
 	    /* Append "[[n]]" to the preexisting model name to force uniqueness */
 	    sprintf(ds, "[[%d]]", n);
             tp = LookupCellFile(model, filenum);
 	 }
+	 Printf("Renaming original cell to %s\n", model);
 	 InstanceRename(nexttok, model, filenum);
 	 CellRehash(nexttok, model, filenum);
          CellDefNoCase(nexttok, filenum);
@@ -562,61 +618,23 @@ skip_ends:
 	    SpiceSkipNewLine();
 	    SkipTok();
 	    if (EndParseFile()) break;
-	    if (matchnocase(nexttok, ".ENDS")) break;
+	    if (matchnocase(nexttok, ".ENDS")) {
+	       in_subckt = 0;
+	       break;
+	    }
 	 }
       }
     }
     else if (matchnocase(nexttok, ".ENDS")) {
-      /* If any pins are marked unconnected, see if there are	*/
-      /* other pins of the same name that have connections.	*/
-      /* Also remove any unconnected globals (just for cleanup) */
-
-      int maxnode = 0;
-      for (sobj = CurrentCell->cell; sobj; sobj = sobj->next)
-	 if (sobj->node > maxnode)
-	    maxnode = sobj->node + 1;
-
-      lobj = NULL;
-      for (sobj = CurrentCell->cell; sobj != NULL;) {
-	 nobj = sobj->next;
-	 if (sobj->node < 0) {
-	    if (IsGlobal(sobj)) {
-	       if (lobj != NULL)
-	          lobj->next = sobj->next;
-	       else
-	          CurrentCell->cell = sobj->next;
-	       FreeObjectAndHash(sobj, CurrentCell);
-	    }
-	    else if (IsPort(sobj) && sobj->model.port == PROXY)
-		sobj->node = maxnode++;
-	    else if (IsPort(sobj)) {
-		for (pobj = CurrentCell->cell; pobj && (pobj->type == PORT);
-			pobj = pobj->next) {
-		    if (pobj == sobj) continue;
-		    if (matchnocase(pobj->name, sobj->name) && pobj->node >= 0) {
-			sobj->node = pobj->node;
-			break;
-		    }
-		}
-		lobj = sobj;
-	    }
-	    else
-		lobj = sobj;
-	 }
-	 else
-	    lobj = sobj;
-	 sobj = nobj;
-      }
 
+      CleanupSubcell();
       EndCell();
 
-      // This condition will be true if no nodes or components were
-      // created in the top-level cell before the first subcircuit
-      // definition, so it is not necessarily an error. . .
-
-      // if (*(CellStackPtr) && ((*CellStackPtr)->next == NULL))
-      //    Printf(".ENDS encountered outside of a subcell.\n");
-      // else
+      if (in_subckt == (char)0) {
+	  Fprintf(stderr, ".ENDS occurred outside of a subcircuit!\n");
+          InputParseError(stderr);
+      }
+      in_subckt = (char)0;
 
       if (*CellStackPtr) PopStack(CellStackPtr);
       if (*CellStackPtr) ReopenCellDef((*CellStackPtr)->cellname, filenum);
@@ -1770,6 +1788,21 @@ skip_ends:
 baddevice:
     Fprintf(stderr, "Badly formed line in input.\n");
   }
+
+  /* Watch for bad ending syntax */
+
+  if (in_subckt == (char)1) {
+     Fprintf(stderr, "Missing .ENDS statement on subcircuit.\n");
+     InputParseError(stderr);
+  }
+
+  if (*(CellStackPtr)) {
+     CleanupSubcell();
+     EndCell();
+     if (*CellStackPtr) PopStack(CellStackPtr);
+     if (*CellStackPtr) ReopenCellDef((*CellStackPtr)->cellname, filenum);
+  }
+
   if (update != 0) RecurseCellFileHashTable(renamepins, filenum);
 
   if (warnings)

install.log

@@ -4,32 +4,393 @@ make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
 for dir in lib doc tcltk netgen tcltk; do \
 	(cd $dir && make install-tcl); done
 make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
-../scripts/mkdirs /usr/local/lib/netgen
-rm -f /usr/local/lib/netgen/ntk2adl.sh
-cp ntk2adl.sh /usr/local/lib/netgen/ntk2adl.sh
-../scripts/mkdirs /usr/local/lib/netgen
-rm -f /usr/local/lib/netgen/spice
-cp spice /usr/local/lib/netgen/spice
-../scripts/mkdirs /usr/local/lib/netgen
-rm -f /usr/local/lib/netgen/spice.bot
-cp spice.bot /usr/local/lib/netgen/spice.bot
-../scripts/mkdirs /usr/local/lib/netgen
-rm -f /usr/local/lib/netgen/spice.top
-cp spice.top /usr/local/lib/netgen/spice.top
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
 make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
 make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
 ../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
 ../scripts/mkdirs /usr/local/lib/netgen/doc
-cp netgen.doc /usr/local/lib/netgen/doc/netgen.doc
 make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
 make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
 rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
 cp netgen.sh /usr/local/bin/netgen
 (cd /usr/local/bin; chmod 0755 netgen)
-rm -f /usr/local/lib/netgen/tcl/tkcon.tcl
-cp tkcon.tcl /usr/local/lib/netgen/tcl/tkcon.tcl
-rm -f /usr/local/lib/netgen/tcl/console.tcl
-cp console.tcl /usr/local/lib/netgen/tcl/console.tcl
 rm -f /usr/local/lib/netgen/tcl/netgen.tcl
 cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
 rm -f /usr/local/lib/netgen/tcl/netgenexec
@@ -96,6 +457,37 @@ make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
 rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
 cp netgen.sh /usr/local/bin/netgen
 (cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
 rm -f /usr/local/lib/netgen/tcl/netgen.tcl
 cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
 rm -f /usr/local/lib/netgen/tcl/netgenexec
@@ -208,3 +600,69 @@ rm -f /usr/local/lib/netgen/tcl/netgenexec
 cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
 make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
 make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'

tcltk/tclnetgen.c

@@ -146,7 +146,7 @@ Command netgen_cmds[] = {
 		"<cell>\n   "
 		"describe the cell"},
 	{"cells",		_netgen_cells,
-		"[list|-all|-top] [filename]\n   "
+		"[list] [-all | -top | filename]\n   "
 		"print known cells, optionally from filename only\n   "
 		"-all:  print all cells, including primitives\n   "
 		"-top:  print all top-level cells"},
@@ -257,6 +257,25 @@ Command netcmp_cmds[] = {
 	NULL
 };
  
+/*------------------------------------------------------*/
+/* Given a file number, need to find the top-level cell */
+/*------------------------------------------------------*/
+
+struct nlist *
+GetTopCell(int fnum)
+{
+    struct nlist *tp;
+
+    tp = FirstCell();
+    while (tp != NULL) {
+	if (tp->flags & CELL_TOP)
+	    if (tp->file == fnum)
+		break;
+	tp = NextCell();
+    }
+    return tp;
+}
+
 /*------------------------------------------------------*/
 /* Common function to parse a Tcl object as either a	*/
 /* netlist file name or a file number.			*/
@@ -617,13 +636,7 @@ CommonParseCell(Tcl_Interp *interp, Tcl_Obj *objv,
 	    }
 	    else {
 		/* Given a file number, need to find the top-level cell */
-		tp = FirstCell();
-		while (tp != NULL) {
-		    if (tp->flags & CELL_TOP)
-			if (tp->file == fnum)
-			    break;
-		    tp = NextCell();
-		}
+		tp = GetTopCell(fnum);
 		if (tp == NULL) {
 		    Tcl_SetResult(interp, "No such file number!\n", NULL);
 		    return TCL_ERROR;
@@ -1005,15 +1018,20 @@ _netgen_flatten(ClientData clientData,
 
    if (objc == 3) {
       char *argv = Tcl_GetString(objv[1]);
-      if (!strcmp(argv, "class"))
+      if (!strcmp(argv, "class")) {
+	 tp = GetTopCell(filenum);
+	 Printf("Flattening instances of %s in file %s\n", repstr, tp->name);
          FlattenInstancesOf(repstr, filenum);
+      }
       else {
 	 Tcl_WrongNumArgs(interp, 1, objv, "class valid_cellname");
 	 return TCL_ERROR;
       }
    }
-   else
+   else {
+      Printf("Flattening contents of cell %s\n", repstr);
       Flatten(repstr, filenum);
+   }
    return TCL_OK;
 }
 
@@ -1420,7 +1438,7 @@ _netgen_cells(ClientData clientData,
       PrintCellHashTable((dolist) ? 2 : 0, -1);
    }
    else if (objc != 2) {
-      Tcl_WrongNumArgs(interp, 1, objv, "[-all|-top|valid_filename]");
+      Tcl_WrongNumArgs(interp, 1, objv, "[list] [-all|-top|valid_filename]");
       return TCL_ERROR;
    }
    else {
@@ -2322,9 +2340,10 @@ _netcmp_verify(ClientData clientData,
    }
 
    if (ElementClasses == NULL || NodeClasses == NULL) {
-      Fprintf(stderr, "Cell has no elements and/or nodes.\n");
-      Tcl_SetObjResult(interp, Tcl_NewIntObj(-1));
-      // return TCL_ERROR;
+      if (index == EQUIV_IDX || index == UNIQUE_IDX)
+	 Tcl_SetObjResult(interp, Tcl_NewIntObj(-1));
+      else
+	 Fprintf(stdout, "Cell has no elements and/or nodes.  Not checked.\n");
       return TCL_OK;
    }
    else {