[pkgsrc/trunk]: pkgsrc/cad/magic Fix errno. Fix implicit prototype mismatches...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/57e72e26ac14
branches:  trunk
changeset: 505736:57e72e26ac14
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jan 06 18:14:06 2006 +0000

description:
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.

diffstat:

 cad/magic/Makefile         |   5 +++--
 cad/magic/distinfo         |  18 +++++++++++++-----
 cad/magic/patches/patch-aa |  13 +++++++++++--
 cad/magic/patches/patch-ab |  25 +++++++++++++++++++++++--
 cad/magic/patches/patch-ai |  20 +++++++++++++++-----
 cad/magic/patches/patch-aj |  27 +++++++++++++++++++--------
 cad/magic/patches/patch-ar |  12 ++++++++++++
 cad/magic/patches/patch-as |  13 +++++++++++++
 cad/magic/patches/patch-at |  21 +++++++++++++++++++++
 cad/magic/patches/patch-au |  13 +++++++++++++
 cad/magic/patches/patch-av |  10 ++++++++++
 cad/magic/patches/patch-aw |  12 ++++++++++++
 cad/magic/patches/patch-ax |  13 +++++++++++++
 cad/magic/patches/patch-ay |  13 +++++++++++++
 14 files changed, 191 insertions(+), 24 deletions(-)

diffs (truncated from 350 to 300 lines):

diff -r 614c58617787 -r 57e72e26ac14 cad/magic/Makefile
--- a/cad/magic/Makefile        Fri Jan 06 18:02:05 2006 +0000
+++ b/cad/magic/Makefile        Fri Jan 06 18:14:06 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:52 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/06 18:14:06 joerg Exp $
 #
 
 DISTNAME=      magic-7.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    cad
 MASTER_SITES=  http://vlsi.cornell.edu/magic/
 
@@ -34,4 +34,5 @@
        cd ${WRKSRC} && printf "1\n2\n6\n\n\n\n\n\n\n\n\n\n\n" | \
                ${SETENV} ${MAKE_ENV} ./scripts/config
 
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 614c58617787 -r 57e72e26ac14 cad/magic/distinfo
--- a/cad/magic/distinfo        Fri Jan 06 18:02:05 2006 +0000
+++ b/cad/magic/distinfo        Fri Jan 06 18:14:06 2006 +0000
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.7 2005/09/24 02:09:41 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2006/01/06 18:14:06 joerg Exp $
 
 SHA1 (magic-7.1.tar.gz) = 176eb4c6a0ff33c6e265e61360c02da4f454f101
 RMD160 (magic-7.1.tar.gz) = 7ab03ba23243817b168254f8c6f7a50d8ea2a4db
 Size (magic-7.1.tar.gz) = 3860487 bytes
-SHA1 (patch-aa) = 6c25c20e7c23e86c8f4ddd2931cb2fa1decc9ff7
-SHA1 (patch-ab) = 5f21b16b5cf99d97036f2c086cb6b1c81fde3bf3
+SHA1 (patch-aa) = 30eb68f2cd768345d6b91359cdd4c7d23bdf892f
+SHA1 (patch-ab) = d4d6d370dabac47c3e41a54329913d2ebabc8477
 SHA1 (patch-ac) = 270cbb68cb3b1ff5e635490ac1dfe13e3dcfc0d0
 SHA1 (patch-ad) = e9db83580fc1b34906d9f5e151479e46f7da444a
 SHA1 (patch-ae) = 27555db8f06d1f8a7a6f002e7dfccf14a4db2765
 SHA1 (patch-af) = 415c0252b38dab9460697e2b3d87af83518ea980
 SHA1 (patch-ag) = b8dcf69daab42dfd24bdb2038733f88f269cc7dc
 SHA1 (patch-ah) = 31654bb19cf41bbd07d8ecd3d8b5c529684638a2
-SHA1 (patch-ai) = 14c2896f98b4dcf3fef08047c947b03cd589f643
-SHA1 (patch-aj) = 81a27ad988cdd6423040939c32abc329efeaa69b
+SHA1 (patch-ai) = 8c79ca61705f1ae02019fc964ac64a9a72c314f2
+SHA1 (patch-aj) = d86b45ec676b2acd1631a18635f3e989b3f87f34
 SHA1 (patch-ak) = 18c5a23f334c9878160c104d12be4f4e71da6d59
 SHA1 (patch-al) = 1ef7780a48da86d690b9cf8a31bd9dc416087a09
 SHA1 (patch-am) = c4e695c370db01775b321970a327ea0851fdf437
@@ -20,3 +20,11 @@
 SHA1 (patch-ao) = 747c18b5e997d652054d17acbdb1fee0748d77a8
 SHA1 (patch-ap) = b2b9e1c45dbefd1d93205bcc15ea713c38181598
 SHA1 (patch-aq) = 8ca051b61a8d79988838be4c1bc4dca3eed6bcaa
+SHA1 (patch-ar) = 898b58351cc567e184b128da0ad669744859bebf
+SHA1 (patch-as) = 2b574c0f2c81a3fd0c7982f84dad5bdbdbd0811b
+SHA1 (patch-at) = 6caeb2a9c455792b4ec0930b199df4880f42ce47
+SHA1 (patch-au) = a21eee3003b818f7d097eb9c7d87882d2c66283d
+SHA1 (patch-av) = 14422e1d0d714762c95890d850b149223d157944
+SHA1 (patch-aw) = 557bf1993732183b6738ec12539736ebd9aaa900
+SHA1 (patch-ax) = 8bc1938b4435d7724a666ad283c0aef93abdabf1
+SHA1 (patch-ay) = b31fee8531d37d07a0e3eab89b6526508c7e7199
diff -r 614c58617787 -r 57e72e26ac14 cad/magic/patches/patch-aa
--- a/cad/magic/patches/patch-aa        Fri Jan 06 18:02:05 2006 +0000
+++ b/cad/magic/patches/patch-aa        Fri Jan 06 18:14:06 2006 +0000
@@ -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 @@
  
      /* ------- 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 -r 614c58617787 -r 57e72e26ac14 cad/magic/patches/patch-ab
--- a/cad/magic/patches/patch-ab        Fri Jan 06 18:02:05 2006 +0000
+++ b/cad/magic/patches/patch-ab        Fri Jan 06 18:14:06 2006 +0000
@@ -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 @@
      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 -r 614c58617787 -r 57e72e26ac14 cad/magic/patches/patch-ai
--- a/cad/magic/patches/patch-ai        Fri Jan 06 18:02:05 2006 +0000
+++ b/cad/magic/patches/patch-ai        Fri Jan 06 18:14:06 2006 +0000
@@ -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 @@
  #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 -r 614c58617787 -r 57e72e26ac14 cad/magic/patches/patch-aj
--- a/cad/magic/patches/patch-aj        Fri Jan 06 18:02:05 2006 +0000
+++ b/cad/magic/patches/patch-aj        Fri Jan 06 18:14:06 2006 +0000
@@ -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 @@
 -#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 @@
  #ifdef        X11
      "XWIND",
      "X11",    
-@@ -194,25 +190,25 @@
+@@ -194,25 +187,25 @@ static (*(grInitProcs[]))() = {
      sunWSetDisplay,
      sunWSetDisplay,
      sunWSetDisplay,
@@ -72,3 +75,11 @@
  #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 -r 614c58617787 -r 57e72e26ac14 cad/magic/patches/patch-ar
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/magic/patches/patch-ar        Fri Jan 06 18:14:06 2006 +0000
@@ -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 -r 614c58617787 -r 57e72e26ac14 cad/magic/patches/patch-as
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/magic/patches/patch-as        Fri Jan 06 18:14:06 2006 +0000
@@ -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 -r 614c58617787 -r 57e72e26ac14 cad/magic/patches/patch-at
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/magic/patches/patch-at        Fri Jan 06 18:14:06 2006 +0000
@@ -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 -r 614c58617787 -r 57e72e26ac14 cad/magic/patches/patch-au
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/magic/patches/patch-au        Fri Jan 06 18:14:06 2006 +0000
@@ -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 -r 614c58617787 -r 57e72e26ac14 cad/magic/patches/patch-av
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/magic/patches/patch-av        Fri Jan 06 18:14:06 2006 +0000
@@ -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