Fix errno. Fix implicit prototype mismatches. Add DragnFly support.

On DragonFly, just fetch using the macros, e.g. using the slow path.

Use pkgsrc readline instead of local version. Bump revision.

12 files changed, 175 insertions, 17 deletions

diff --git a/cad/magic/patches/patch-aa b/cad/magic/patches/patch-aa
index 6e43dadf1b3..d5c38bad397 100644
--- a/cad/magic/patches/patch-aa
+++ b/cad/magic/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2005/09/22 15:28:35 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/06 18:14:06 joerg Exp $
 
---- misc/magic.h.orig	2001-09-21 08:15:45.000000000 -0700
+--- misc/magic.h.orig	2001-09-21 15:15:45.000000000 +0000
 +++ misc/magic.h
 @@ -99,7 +99,7 @@ extern char *SysLibPath;	/* Path for fin
  	: FALSE)
@@ -83,3 +83,12 @@ $NetBSD: patch-aa,v 1.3 2005/09/22 15:28:35 minskim Exp $
  
      /* ------- Configuration:  Handle Missing Routines/Definitions ------- */
  
+@@ -285,7 +220,7 @@ extern char AbortMessage[];
+ #include <errno.h>
+ #define sys_errlist _sys_errlist
+ #define sys_nerr _sys_nerr
+-#elif !defined(__FreeBSD__) && !defined(__NetBSD__)
++#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ extern int errno;
+ /* extern char *sys_errlist[]; */
+ extern int sys_nerr;
diff --git a/cad/magic/patches/patch-ab b/cad/magic/patches/patch-ab
index de69fddc7e3..24cac62a8aa 100644
--- a/cad/magic/patches/patch-ab
+++ b/cad/magic/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2005/09/24 02:09:42 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.6 2006/01/06 18:14:06 joerg Exp $
 
---- scripts/config.orig	2005-09-22 08:13:16.000000000 -0700
+--- scripts/config.orig	2005-12-20 16:59:05.000000000 +0000
 +++ scripts/config
 @@ -52,7 +52,7 @@ Magic works with the following window co
  CAT_EOF
@@ -36,3 +36,24 @@ $NetBSD: patch-ab,v 1.5 2005/09/24 02:09:42 dmcmahill Exp $
      endif
      breaksw
  case "3":
+@@ -453,16 +459,10 @@ endif
+ set have_readline="no"
+ if ($readline == "y" || $readline == "yes") then
+     set dflags=("$dflags" -DUSE_READLINE)
+-    if ( -f /usr/lib/libreadline.so ) then
+-	if ( `nm /usr/lib/libreadline.so | grep pre_input | wc -l` > 0 ) then
+-	    set have_readline="yes"
+-	    set dflags=($dflags -DHAVE_READLINE)
+-	    set rl_libs=($rl_libs -lreadline -ltermcap)
+-	    if ( `nm /usr/lib/libreadline.so | grep rl_filename_completion_function | wc -l` > 0) then
+-		set dflags=($dflags -DREADLINE_4_DOT_2_PLUS)
+-	    endif
+-	endif
+-    endif
++    set have_readline="yes"
++    set dflags=($dflags -DHAVE_READLINE)
++    set rl_libs=($rl_libs -lreadline -ltermcap)
++    set dflags=($dflags -DREADLINE_4_DOT_2_PLUS)
+     if ($?compileIRIX) then
+        echo "NOTE:  Must compile with GNU make (gmake), not the IRIX make"
+     endif
diff --git a/cad/magic/patches/patch-ai b/cad/magic/patches/patch-ai
index 76da088a510..60f65a2ed6f 100644
--- a/cad/magic/patches/patch-ai
+++ b/cad/magic/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1 2004/01/23 11:43:33 agc Exp $
+$NetBSD: patch-ai,v 1.2 2006/01/06 18:14:06 joerg Exp $
 
---- extflat/EFread.c	2004/01/23 09:58:12	1.1
-+++ extflat/EFread.c	2004/01/23 09:59:29
-@@ -24,7 +24,7 @@
+--- extflat/EFread.c.orig	2001-01-12 22:12:35.000000000 +0000
++++ extflat/EFread.c
+@@ -24,7 +24,7 @@ static char rcsid[] = "$Header: /ufs/rep
  #include <stdio.h>
  #include <ctype.h>
  #include <stdlib.h>
@@ -11,7 +11,17 @@ $NetBSD: patch-ai,v 1.1 2004/01/23 11:43:33 agc Exp $
  #include "misc/magic.h"
  #include "utils/geometry.h"
  #include "utils/hash.h"
-@@ -534,14 +534,12 @@
+@@ -33,6 +33,9 @@ static char rcsid[] = "$Header: /ufs/rep
+ #include "extflat/EFint.h"
+ #include "misc/paths.h"
+ 
++int efReadError(char *, ...);
++
++
+ /*
+  * The following table describes the kinds of lines
+  * that may be read in a .ext file.
+@@ -534,14 +537,12 @@ start:
   */
  
      /*VARARGS1*/
diff --git a/cad/magic/patches/patch-aj b/cad/magic/patches/patch-aj
index 83055fd13de..1f2dbeaf469 100644
--- a/cad/magic/patches/patch-aj
+++ b/cad/magic/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1 2004/01/23 11:43:33 agc Exp $
+$NetBSD: patch-aj,v 1.2 2006/01/06 18:14:06 joerg Exp $
 
---- graphics/grMain.c	2004/01/23 10:00:55	1.1
-+++ graphics/grMain.c	2004/01/23 10:02:35
-@@ -117,11 +117,7 @@
+--- graphics/grMain.c.orig	2001-04-16 14:43:40.000000000 +0000
++++ graphics/grMain.c
+@@ -117,14 +117,7 @@ static char rcsid[]="$Header: /ufs/repos
  #ifdef SUNVIEW
  #include <pixrect/pixrect.h>
  #endif
@@ -11,11 +11,14 @@ $NetBSD: patch-aj,v 1.1 2004/01/23 11:43:33 agc Exp $
 -#ifndef	NO_VARARGS
 -#include <varargs.h>
 -#endif	NO_VARARGS
+-
+-extern char *getenv();
+-extern int errno;
 +#endif	/* sun */
  
- extern char *getenv();
- extern int errno;
-@@ -153,21 +149,21 @@
+ #define FAVORITE_DISPLAY	"NULL"	/* Default display type */
+ 
+@@ -153,21 +146,21 @@ static char *grDisplayTypes[] = {
      "SUN110",
      "SUN160",
      "SUNBW",
@@ -41,7 +44,7 @@ $NetBSD: patch-aj,v 1.1 2004/01/23 11:43:33 agc Exp $
  #ifdef	X11
      "XWIND",
      "X11", 	
-@@ -194,25 +190,25 @@
+@@ -194,25 +187,25 @@ static (*(grInitProcs[]))() = {
      sunWSetDisplay,
      sunWSetDisplay,
      sunWSetDisplay,
@@ -72,3 +75,11 @@ $NetBSD: patch-aj,v 1.1 2004/01/23 11:43:33 agc Exp $
  #ifdef  OGL
      oglSetDisplay,
      oglSetDisplay,
+@@ -581,7 +574,6 @@ grFgets(str, n, stream, name)
+     fd_set fn;
+     char *newstr;
+     struct timeval threeSec, twentySecs;
+-    extern int errno;
+ 
+     threeSec.tv_sec = 3;	
+     threeSec.tv_usec = 0;
diff --git a/cad/magic/patches/patch-ar b/cad/magic/patches/patch-ar
new file mode 100644
index 00000000000..6a433b44f30
--- /dev/null
+++ b/cad/magic/patches/patch-ar
@@ -0,0 +1,12 @@
+$NetBSD: patch-ar,v 1.1 2006/01/06 18:14:06 joerg Exp $
+
+--- database/DBio.c.orig	2005-12-20 16:39:18.000000000 +0000
++++ database/DBio.c
+@@ -46,7 +46,6 @@ static char rcsid[] = "$Header: /ufs/rep
+ #include "utils/malloc.h"
+ #include "signals/signals.h"
+ 
+-extern int errno;
+ extern char *Path;
+ 
+ /* Suffix for all Magic files */
diff --git a/cad/magic/patches/patch-as b/cad/magic/patches/patch-as
new file mode 100644
index 00000000000..980178c7bab
--- /dev/null
+++ b/cad/magic/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2006/01/06 18:14:06 joerg Exp $
+
+--- drc/DRCmain.c.orig	2005-12-20 16:40:25.000000000 +0000
++++ drc/DRCmain.c
+@@ -35,8 +35,6 @@ static char rcsid[] = "$Header: /ufs/rep
+ #include "drc/drc.h"
+ #include "undo/undo.h"
+ 
+-extern void TxPrintf(), TxError();
+-
+ /* The global variables defined below are parameters between
+  * the DRC error routines (drcPaintError and drcPrintError)
+  * and the higher-level routines that start up DRC error checks.
diff --git a/cad/magic/patches/patch-at b/cad/magic/patches/patch-at
new file mode 100644
index 00000000000..cff921fca29
--- /dev/null
+++ b/cad/magic/patches/patch-at
@@ -0,0 +1,21 @@
+$NetBSD: patch-at,v 1.1 2006/01/06 18:14:06 joerg Exp $
+
+--- utils/getrect.c.orig	2005-12-20 16:47:57.000000000 +0000
++++ utils/getrect.c
+@@ -92,6 +92,7 @@ GetRect(fin, skip, rect)
+     register dir = 0x1;
+ #endif
+ 
++#if !defined(__DragonFly__)
+     if (FILE_CNT(fin) < RECTBUFTHRESHOLD) goto slow;
+     /*
+      * Fast version of GetRect -- read directly from buffer.
+@@ -158,6 +159,8 @@ fastbad:
+ 
+     /* Slow version of GetRect -- read via getc */
+ slow:
++
++#endif /* __DragonFly__ */
+     while (skip-- > 0)
+ 	(void) getc(fin);
+ 
diff --git a/cad/magic/patches/patch-au b/cad/magic/patches/patch-au
new file mode 100644
index 00000000000..3668c06ff11
--- /dev/null
+++ b/cad/magic/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1 2006/01/06 18:14:06 joerg Exp $
+
+--- textio/txCommands.c.orig	2005-12-20 16:51:34.000000000 +0000
++++ textio/txCommands.c
+@@ -46,8 +46,6 @@ static char rcsid[]="$Header: /ufs/repos
+ #include "utils/utils.h"
+ #include "lisp/lisp.h"
+ 
+-extern int errno;
+-
+ /* Turning this flag on prints out input events and commands as they
+  * are processed.
+  */
diff --git a/cad/magic/patches/patch-av b/cad/magic/patches/patch-av
new file mode 100644
index 00000000000..eaa29f7dfb3
--- /dev/null
+++ b/cad/magic/patches/patch-av
@@ -0,0 +1,10 @@
+$NetBSD: patch-av,v 1.1 2006/01/06 18:14:06 joerg Exp $
+
+--- textio/txMain.c.orig	2001-04-16 14:43:50.000000000 +0000
++++ textio/txMain.c
+@@ -22,4 +22,5 @@ static char rcsid[]="$Header: /ufs/repos
+ #endif  not lint
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #ifdef SYSV
diff --git a/cad/magic/patches/patch-aw b/cad/magic/patches/patch-aw
new file mode 100644
index 00000000000..a0ca154bbce
--- /dev/null
+++ b/cad/magic/patches/patch-aw
@@ -0,0 +1,12 @@
+$NetBSD: patch-aw,v 1.1 2006/01/06 18:14:06 joerg Exp $
+
+--- sim/SimRsim.c.orig	2005-12-20 16:53:40.000000000 +0000
++++ sim/SimRsim.c
+@@ -41,7 +41,6 @@
+ #include "sim/sim.h"
+ #include <errno.h>
+ 
+-extern int errno;
+ static bool InitRsim();
+ 
+ #define BUF_SIZE	1024
diff --git a/cad/magic/patches/patch-ax b/cad/magic/patches/patch-ax
new file mode 100644
index 00000000000..23983d78daa
--- /dev/null
+++ b/cad/magic/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1 2006/01/06 18:14:06 joerg Exp $
+
+--- plot/plotInt.h.orig	2005-12-20 17:17:26.000000000 +0000
++++ plot/plotInt.h
+@@ -27,7 +27,7 @@ int err1 = Need_to_include_utils/geometr
+ #endif	_GEOMETRY
+ 
+ /* system V machines lack vfont.h, so include the defs below. */
+-#if  !defined(SYSV) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(CYGWIN)
++#if  !defined(SYSV) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(CYGWIN) && !defined(__DragonFly__)
+ #include <vfont.h>
+ #else
+ struct header {
diff --git a/cad/magic/patches/patch-ay b/cad/magic/patches/patch-ay
new file mode 100644
index 00000000000..9f01f82c64f
--- /dev/null
+++ b/cad/magic/patches/patch-ay
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.1 2006/01/06 18:14:06 joerg Exp $
+
+--- resis/ResRex.c.orig	2005-12-20 17:21:13.000000000 +0000
++++ resis/ResRex.c
+@@ -10,7 +10,7 @@ static char rcsid[] = "$Header: /ufs/rep
+ /* 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(__DragonFly__)
+ #include <values.h>
+ #endif
+