Move cad/tnt to cad/tnt-mmtl and rename the tnt executible from

tnt to tnt-mmtl to avoid a conflict with ham/tnt.  Addresses PR27100
from Berndt Josef Wulf.

15 files changed, 38 insertions, 22 deletions

diff --git a/cad/Makefile b/cad/Makefile
index 531a07d22d4..1584bf99777 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2004/09/29 12:50:43 wulf Exp $
+# $NetBSD: Makefile,v 1.56 2004/10/01 22:56:10 dmcmahill Exp $
 #
 
 COMMENT=	CAD tools
@@ -47,7 +47,7 @@ SUBDIR+=	simian-docs
 SUBDIR+=	spice
 SUBDIR+=	spiceprm
 SUBDIR+=	tkgate
-SUBDIR+=	tnt
+SUBDIR+=	tnt-mmtl
 SUBDIR+=	transcalc
 SUBDIR+=	verilog
 SUBDIR+=	verilog-current
diff --git a/cad/tnt/DESCR b/cad/tnt-mmtl/DESCR
index 78b26964a84..78b26964a84 100644
--- a/cad/tnt/DESCR
+++ b/cad/tnt-mmtl/DESCR
diff --git a/cad/tnt/Makefile b/cad/tnt-mmtl/Makefile
index bd30feb0c67..cc4e549a007 100644
--- a/cad/tnt/Makefile
+++ b/cad/tnt-mmtl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/09/26 01:12:11 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.1 2004/10/01 22:56:10 dmcmahill Exp $
 #
 
 DISTNAME=	tnt-1.2.2
+PKGNAME=	${DISTNAME:S/tnt/tnt-mmtl/}
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mmtl/}
 
@@ -20,6 +21,9 @@ USE_GNU_TOOLS+=	make
 USE_LANGUAGES=	c c++ fortran
 USE_FORTRAN=	YES
 
+post-patch:
+	${MV} ${WRKSRC}/tnt ${WRKSRC}/tnt-mmtl
+
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../lang/tcl-itcl-current/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
diff --git a/cad/tnt/PLIST b/cad/tnt-mmtl/PLIST
index 9d315f0fb14..f079475d3a7 100644
--- a/cad/tnt/PLIST
+++ b/cad/tnt-mmtl/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/09/26 01:12:12 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.1 2004/10/01 22:56:10 dmcmahill Exp $
 bin/bem
 bin/calcCAP
 bin/calcRL
-bin/tnt
+bin/tnt-mmtl
 bin/tnt.tcl
 lib/bem1.0/bem.tcl
 lib/bem1.0/bem_gpge.itcl
diff --git a/cad/tnt/distinfo b/cad/tnt-mmtl/distinfo
index 35d1e7f07af..1e041aa8a90 100644
--- a/cad/tnt/distinfo
+++ b/cad/tnt-mmtl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/09/26 01:12:12 dmcmahill Exp $
+$NetBSD: distinfo,v 1.1 2004/10/01 22:56:10 dmcmahill Exp $
 
 SHA1 (tnt-1.2.2.tar.gz) = bd089863ca2cd939009253e83f4ab75317191047
 Size (tnt-1.2.2.tar.gz) = 2020099 bytes
@@ -6,8 +6,8 @@ SHA1 (patch-aa) = 779955877d1cec32b441c16d615a1e400888c0b1
 SHA1 (patch-ab) = 6a57255b994f0ea4063a2c256fe0ba689a210ba7
 SHA1 (patch-ac) = 32b2a6721a3c1790366c278816c2f188dfa38214
 SHA1 (patch-ad) = 8084532ba3a3387fddfbbfeee019c21e4e139be7
-SHA1 (patch-ae) = cc2992e557b95b9fe1b06c6c9ceb39ab6277cc88
-SHA1 (patch-af) = 429b8dde570ff68b47dd31029327efc4abc2426c
+SHA1 (patch-ae) = d2815e91be878cffbff0a124b1d33d48397c064c
+SHA1 (patch-af) = 084d830808a9394d646981f882a368b49a5c5441
 SHA1 (patch-ag) = a9afe4562b51b01b912ec72a70953820abb19467
 SHA1 (patch-ah) = ec3cb9822e8dd168e6b6d74bb14cd631717187c7
 SHA1 (patch-ai) = 2ab6aa6bd4cd0883725c66bb7d4fa59e9e3172a4
diff --git a/cad/tnt/patches/patch-aa b/cad/tnt-mmtl/patches/patch-aa
index 522b6c7e4c8..f033c8eeb3b 100644
--- a/cad/tnt/patches/patch-aa
+++ b/cad/tnt-mmtl/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/09/26 01:12:12 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.1 2004/10/01 22:56:11 dmcmahill Exp $
 
 --- bem/configure.ac.orig	Thu Apr 22 20:07:12 2004
 +++ bem/configure.ac
diff --git a/cad/tnt/patches/patch-ab b/cad/tnt-mmtl/patches/patch-ab
index 4efa1638475..6f7abc27a35 100644
--- a/cad/tnt/patches/patch-ab
+++ b/cad/tnt-mmtl/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/09/26 01:12:12 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.1 2004/10/01 22:56:11 dmcmahill Exp $
 
 --- bem/src/math_library.h.orig	Tue Aug 24 01:02:45 2004
 +++ bem/src/math_library.h
diff --git a/cad/tnt/patches/patch-ac b/cad/tnt-mmtl/patches/patch-ac
index 4a1ebdc671f..c38ff46a700 100644
--- a/cad/tnt/patches/patch-ac
+++ b/cad/tnt-mmtl/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/09/26 01:12:12 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.1 2004/10/01 22:56:11 dmcmahill Exp $
 
 --- bem/src/nmmtl_find_nu.cpp.orig	Wed Jul 28 14:45:38 2004
 +++ bem/src/nmmtl_find_nu.cpp
diff --git a/cad/tnt/patches/patch-ad b/cad/tnt-mmtl/patches/patch-ad
index 38c3f9a6385..214d9c85a9c 100644
--- a/cad/tnt/patches/patch-ad
+++ b/cad/tnt-mmtl/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/09/26 01:12:17 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.1 2004/10/01 22:56:11 dmcmahill Exp $
 
 --- bem/configure.orig	Fri Sep 10 22:15:44 2004
 +++ bem/configure
diff --git a/cad/tnt/patches/patch-ae b/cad/tnt-mmtl/patches/patch-ae
index 2871beffc92..b992346fd39 100644
--- a/cad/tnt/patches/patch-ae
+++ b/cad/tnt-mmtl/patches/patch-ae
@@ -1,8 +1,14 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/09/26 01:12:17 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.1 2004/10/01 22:56:11 dmcmahill Exp $
 
 --- Makefile.am.orig	Thu Jul 22 14:23:32 2004
 +++ Makefile.am
-@@ -32,7 +32,7 @@ bin_SCRIPTS = tnt.tcl tnt
+@@ -27,12 +27,12 @@
+ #---------------------------------------------------------------
+ #  tcl/tk scripts that need to be installed.
+ #---------------------------------------------------------------
+-bin_SCRIPTS = tnt.tcl tnt
++bin_SCRIPTS = tnt.tcl tnt-mmtl
+ 
  #---------------------------------------------------------------
  #  Examples to be installed
  #---------------------------------------------------------------
diff --git a/cad/tnt/patches/patch-af b/cad/tnt-mmtl/patches/patch-af
index 678202bb0ca..1897d202d0a 100644
--- a/cad/tnt/patches/patch-af
+++ b/cad/tnt-mmtl/patches/patch-af
@@ -1,8 +1,14 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/09/26 01:12:17 dmcmahill Exp $
+$NetBSD: patch-af,v 1.1 2004/10/01 22:56:11 dmcmahill Exp $
 
---- Makefile.in.orig	Thu Jul 29 16:58:46 2004
+--- Makefile.in.orig	Fri Sep 10 22:15:33 2004
 +++ Makefile.in
-@@ -176,7 +176,7 @@ bin_SCRIPTS = tnt.tcl tnt
+@@ -126,12 +126,12 @@ target_alias = @target_alias@
+ #---------------------------------------------------------------
+ #  tcl/tk scripts that need to be installed.
+ #---------------------------------------------------------------
+-bin_SCRIPTS = tnt.tcl tnt
++bin_SCRIPTS = tnt.tcl tnt-mmtl
+ 
  #---------------------------------------------------------------
  #  Examples to be installed
  #---------------------------------------------------------------
@@ -11,7 +17,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/09/26 01:12:17 dmcmahill Exp $
  examples_DATA = \
  	examples/9-7-00.xsctn \
  	examples/coplanar.xsctn \
-@@ -196,7 +196,7 @@ examples_DATA = \
+@@ -151,7 +151,7 @@ examples_DATA = \
  #  a prefix.  If not, then I suppose README will go into
  #  /usr.
  #---------------------------------------------------------------
diff --git a/cad/tnt/patches/patch-ag b/cad/tnt-mmtl/patches/patch-ag
index 4452f34ccd1..5c739f1055a 100644
--- a/cad/tnt/patches/patch-ag
+++ b/cad/tnt-mmtl/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/09/26 01:12:17 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.1 2004/10/01 22:56:11 dmcmahill Exp $
 
 --- doc/Makefile.am.orig	Wed Jul 21 15:45:26 2004
 +++ doc/Makefile.am
diff --git a/cad/tnt/patches/patch-ah b/cad/tnt-mmtl/patches/patch-ah
index 0bd875a7dd4..7b6d9aee223 100644
--- a/cad/tnt/patches/patch-ah
+++ b/cad/tnt-mmtl/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/09/26 01:12:17 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.1 2004/10/01 22:56:11 dmcmahill Exp $
 
 --- doc/Makefile.in.orig	Thu Jul 29 16:58:47 2004
 +++ doc/Makefile.in
diff --git a/cad/tnt/patches/patch-ai b/cad/tnt-mmtl/patches/patch-ai
index eccb6ed31f3..50b3559f196 100644
--- a/cad/tnt/patches/patch-ai
+++ b/cad/tnt-mmtl/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/09/26 01:12:17 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.1 2004/10/01 22:56:11 dmcmahill Exp $
 
 --- gui/splash.tcl.orig	Thu Jul 22 13:16:21 2004
 +++ gui/splash.tcl
diff --git a/cad/tnt/patches/patch-aj b/cad/tnt-mmtl/patches/patch-aj
index 9c425ca2ca2..015cb04912e 100644
--- a/cad/tnt/patches/patch-aj
+++ b/cad/tnt-mmtl/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2004/09/26 01:12:17 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.1 2004/10/01 22:56:11 dmcmahill Exp $
 
 --- gui/gui_help.tcl.orig	Mon Jul 26 13:37:52 2004
 +++ gui/gui_help.tcl