Update to version 7.1, unbreak.

PR:		44106
Submitted by:	Ports Fury

9 files changed, 65 insertions, 89 deletions

diff --git a/cad/magic/files/defs.mak b/cad/magic/files/defs.mak
new file mode 100644
index 000000000000..fd1f5c37374c
--- /dev/null
+++ b/cad/magic/files/defs.mak
@@ -0,0 +1,40 @@
+# $FreeBSD$
+
+SHELL                  = /bin/sh
+
+CADDIR                 = ${PREFIX}
+BINDIR                 = ${CADDIR}/bin
+LIBDIR                 = ${CADDIR}/lib
+MANDIR                 = ${CADDIR}/man
+SYSDIR                 = ${CADDIR}/lib/magic/sys
+SCMDIR                 = ${CADDIR}/lib/magic/scm
+
+SCRIPTS                = ${MAGICDIR}/scripts
+
+RM                     = rm -f
+CP                     = cp
+AR                     = ar
+ARFLAGS                = crv
+LD                     = ld -r
+RANLIB                 = ranlib
+
+CPP                    = /usr/bin/cpp -P -traditional
+CPPFLAGS               = -I. -I${MAGICDIR}
+DFLAGS                 =  -DFILE_LOCKS -DHAVE_READLINE -DNONMANHATTAN -DUSE_NEW_MACROS
+
+READLINE_DEFS          = 
+READLINE_LIBS          =  -lreadline -ltermcap
+
+DEPEND_FLAG            = -MM
+DEPEND_FILE            = Depend
+
+GR_CFLAGS              =  -I${X11BASE}/include
+GR_DFLAGS              = -DX11 -DXLIB -DX11HELP_PROG=\"${X11HELP_PROG}\"
+GR_LIBS                = -L${X11BASE}/lib  -lX11
+GR_SRCS                =  ${X11_SRCS}
+GR_HELPER_SRCS         =  ${X11HELPER_SRCS}
+GR_HELPER_PROG         =  ${X11HELP_PROG}
+
+OBJS      = ${SRCS:.c=.o}
+LIB_OBJS  = ${LIB_SRCS:.c=.o}
+CLEANS    = ${OBJS} ${LIB_OBJS} lib${MODULE}.a lib${MODULE}.o ${MODULE}
diff --git a/cad/magic/files/patch-aa b/cad/magic/files/patch-aa
deleted file mode 100644
index 035d556112f4..000000000000
--- a/cad/magic/files/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.orig	Tue Jul 23 16:39:34 1996
-+++ Makefile	Sat Nov 29 11:18:28 1997
-@@ -39,8 +39,8 @@
- 		  :status Makefile READ_ME
- DIRS		= include cadlib
- CMD		= echo Need to define your command via 'make cmd CMD=command'
--CADDIR		= `./:findcad`
--CADDIR_SUB	= `../:findcad`
-+CADDIR		= `/bin/csh ./:findcad`
-+CADDIR_SUB	= `/bin/csh ../:findcad`
- 
- everything: ${MODULES} .config
- 	/bin/csh :makeall installhdrs ${MODULES}
-@@ -57,11 +57,11 @@
- 
- 
- directories:
--	./:mkdir ${CADDIR}/bin
--	./:mkdir ${CADDIR}/lib
--	./:mkdir ${CADDIR}/lib/magic
--	./:mkdir ${CADDIR}/lib/magic/sys
--	./:mkdir ${CADDIR}/man
-+	/bin/csh ./:mkdir ${CADDIR}/bin
-+	/bin/csh ./:mkdir ${CADDIR}/lib
-+	/bin/csh ./:mkdir ${CADDIR}/lib/magic
-+	/bin/csh ./:mkdir ${CADDIR}/lib/magic/sys
-+	/bin/csh ./:mkdir ${CADDIR}/man
- 
- # Remakes the binary in 'lib', if needed.  Used for recompiling on 
- # a remote machine.
diff --git a/cad/magic/files/patch-ab b/cad/magic/files/patch-ab
deleted file mode 100644
index d92594c3db7f..000000000000
--- a/cad/magic/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/Makefile.orig	Sun Sep 27 01:46:16 1998
-+++ utils/Makefile	Sun Sep 27 01:46:39 1998
-@@ -100,7 +100,7 @@
- utils.o: $(OBJS)
- 	rm -f utils.o
- 	rm -f LIBmain.o LIBtextio.o
--	./:ld -r ${OBJS} -lm -o utils.o
-+	./:ld -r ${OBJS} -L/usr/lib -lm -o utils.o
- 
- utils.po: ${POBJS}
- 	rm -f utils.po
diff --git a/cad/magic/files/patch-ae b/cad/magic/files/patch-ae
deleted file mode 100644
index e8a51e3f3f2e..000000000000
--- a/cad/magic/files/patch-ae
+++ /dev/null
@@ -1,29 +0,0 @@
---- resis/ResRex.c.orig	Tue Aug  2 15:40:24 1994
-+++ resis/ResRex.c	Sat Sep 28 22:51:44 2002
-@@ -11,7 +11,7 @@
- #ifdef	ibm032
- #define MAXFLOAT        ((float)3.40282346638528860e+38)
- #else
--#include <values.h>
-+#include <limits.h>
- #endif
- 
- #undef	MAXINT
-@@ -447,7 +447,7 @@
-      	  ResSortByGate(&node->firstTran);
- 	  /* Find largest SD transistor connected to node.	*/
- 	  
--	  minRes = MAXFLOAT;
-+	  minRes = FLOAT_MAX;
- 	  gparams.rg_tranloc = (Point *) NULL;
- 	  gparams.rg_status = FALSE;
- 	  gparams.rg_nodecap = node->capacitance;
-@@ -523,7 +523,7 @@
- 	  {
-     	       TxError("Node %s has force label but no drive point or driving transistor\n",node->name);
- 	  }
--	  if (minRes == MAXFLOAT || gparams.rg_tranloc == NULL)
-+	  if (minRes == FLOAT_MAX || gparams.rg_tranloc == NULL)
- 	  {
- 	       continue;
- 	  }
diff --git a/cad/magic/files/patch-b b/cad/magic/files/patch-b
deleted file mode 100644
index ea8b9090da24..000000000000
--- a/cad/magic/files/patch-b
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ext2spice/spice2sim.orig	Wed May 22 19:14:08 1996
---- ext2spice/spice2sim	Thu Dec  5 23:19:48 1996
-***************
-*** 1,4 ****
-! #!/bin/awk -f
-  # convert an ext2spice produced file to a .sim file for debugging
-  #
-  BEGIN {
---- 1,4 ----
-! #!/usr/bin/awk -f
-  # convert an ext2spice produced file to a .sim file for debugging
-  #
-  BEGIN {
diff --git a/cad/magic/files/patch-ext2spice::spice2sim b/cad/magic/files/patch-ext2spice::spice2sim
new file mode 100644
index 000000000000..0d9522d1dbfe
--- /dev/null
+++ b/cad/magic/files/patch-ext2spice::spice2sim
@@ -0,0 +1,8 @@
+--- ext2spice/spice2sim.orig	Thu Mar 30 03:34:59 2000
++++ ext2spice/spice2sim	Fri Oct 11 23:38:53 2002
+@@ -1,4 +1,4 @@
+-#!/bin/awk -f
++#!/usr/bin/awk -f
+ # convert an ext2spice produced file to a .sim file for debugging
+ #
+ BEGIN {
diff --git a/cad/magic/files/patch-ac b/cad/magic/files/patch-misc::magic.h
index 9ad58fbb17b2..b3b26607e64c 100644
--- a/cad/magic/files/patch-ac
+++ b/cad/magic/files/patch-misc::magic.h
@@ -1,6 +1,6 @@
---- misc/magic.h.orig	Wed Sep 11 15:23:25 1996
-+++ misc/magic.h	Sun Apr 25 22:32:12 1999
-@@ -166,7 +166,7 @@
+--- misc/magic.h.orig	Sat Sep 22 00:15:45 2001
++++ misc/magic.h	Fri Oct 11 23:38:53 2002
+@@ -146,7 +146,7 @@
   *
   */
  
@@ -9,7 +9,7 @@
  #define       IS_LITTLE_ENDIAN        /* Intel x86 processors. */
  #endif
  
-@@ -244,7 +244,7 @@
+@@ -224,7 +224,7 @@
  #if defined(sun) && !defined(sparc)
  # define NEED_MONCNTL
  #endif  
diff --git a/cad/magic/files/patch-ad b/cad/magic/files/patch-misc::nicebort.c
index 03a6d82e6e68..36fa83980a37 100644
--- a/cad/magic/files/patch-ad
+++ b/cad/magic/files/patch-misc::nicebort.c
@@ -1,5 +1,5 @@
---- misc/niceabort.c.orig	Thu Jan 27 21:59:20 2000
-+++ misc/niceabort.c	Thu Jan 27 21:59:33 2000
+--- misc/niceabort.c.orig	Sat Jan 13 07:13:00 2001
++++ misc/niceabort.c	Fri Oct 11 23:38:53 2002
 @@ -52,7 +52,7 @@
  bool AbortFatal = FALSE;
  
diff --git a/cad/magic/files/patch-resis::ResRex.c b/cad/magic/files/patch-resis::ResRex.c
new file mode 100644
index 000000000000..dcccd9d718dc
--- /dev/null
+++ b/cad/magic/files/patch-resis::ResRex.c
@@ -0,0 +1,11 @@
+--- resis/ResRex.c.orig	Sat Sep 22 00:15:50 2001
++++ resis/ResRex.c	Mon Oct 14 20:50:32 2002
+@@ -10,7 +10,7 @@
+ /* It is hard to get the value of MAXFLOAT in a portable manner. */
+ #if defined(ibm032) || defined(CYGWIN) 
+ #define MAXFLOAT        ((float)3.40282346638528860e+38)
+-#elif !defined(__NetBSD__)
++#elif !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <values.h>
+ #endif
+