[pkgsrc/trunk]: pkgsrc/cad/magic Use stdarg rather than varargs.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d2236756ae3
branches:  trunk
changeset: 466787:9d2236756ae3
user:      agc <agc%pkgsrc.org@localhost>
date:      Fri Jan 23 11:43:33 2004 +0000

description:
Use stdarg rather than varargs.

This code is old - it's been ages since I've seen definitions for
sunview and X10...

diffstat:

 cad/magic/distinfo         |  20 ++++++++-
 cad/magic/patches/patch-aa |  33 ++++++++++-----
 cad/magic/patches/patch-ab |   7 +-
 cad/magic/patches/patch-ac |  30 ++++++++++++++
 cad/magic/patches/patch-ad |  33 +++++++++++++++
 cad/magic/patches/patch-ae |  13 ++++++
 cad/magic/patches/patch-af |  39 ++++++++++++++++++
 cad/magic/patches/patch-ag |  12 +++++
 cad/magic/patches/patch-ah |  12 +++++
 cad/magic/patches/patch-ai |  30 ++++++++++++++
 cad/magic/patches/patch-aj |  74 +++++++++++++++++++++++++++++++++++
 cad/magic/patches/patch-ak |  95 ++++++++++++++++++++++++++++++++++++++++++++++
 cad/magic/patches/patch-al |  49 +++++++++++++++++++++++
 cad/magic/patches/patch-am |  17 ++++++++
 cad/magic/patches/patch-an |  10 ++++
 cad/magic/patches/patch-ao |  47 ++++++++++++++++++++++
 cad/magic/patches/patch-ap |  10 ++++
 17 files changed, 513 insertions(+), 18 deletions(-)

diffs (truncated from 636 to 300 lines):

diff -r adf4bc602291 -r 9d2236756ae3 cad/magic/distinfo
--- a/cad/magic/distinfo        Fri Jan 23 11:43:06 2004 +0000
+++ b/cad/magic/distinfo        Fri Jan 23 11:43:33 2004 +0000
@@ -1,6 +1,20 @@
-$NetBSD: distinfo,v 1.2 2002/07/14 03:47:46 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3 2004/01/23 11:43:33 agc Exp $
 
 SHA1 (magic-7.1.tar.gz) = 176eb4c6a0ff33c6e265e61360c02da4f454f101
 Size (magic-7.1.tar.gz) = 3860487 bytes
-SHA1 (patch-aa) = bb18e6672441e404b0969cd1f5cb387ef4f97386
-SHA1 (patch-ab) = c4b516d71ec012593f0559e8d0d1b5bad69d736a
+SHA1 (patch-aa) = bfd5101deed8e5626311798f7dd4e8c80c3d63e7
+SHA1 (patch-ab) = 4168f956b665672ec79e11875f7b948a5be715ba
+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-ak) = 18c5a23f334c9878160c104d12be4f4e71da6d59
+SHA1 (patch-al) = 1ef7780a48da86d690b9cf8a31bd9dc416087a09
+SHA1 (patch-am) = c4e695c370db01775b321970a327ea0851fdf437
+SHA1 (patch-an) = 83e9e5242b483f398962a6237551b860749e70f0
+SHA1 (patch-ao) = 747c18b5e997d652054d17acbdb1fee0748d77a8
+SHA1 (patch-ap) = b2b9e1c45dbefd1d93205bcc15ea713c38181598
diff -r adf4bc602291 -r 9d2236756ae3 cad/magic/patches/patch-aa
--- a/cad/magic/patches/patch-aa        Fri Jan 23 11:43:06 2004 +0000
+++ b/cad/magic/patches/patch-aa        Fri Jan 23 11:43:33 2004 +0000
@@ -1,19 +1,24 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/06 21:37:29 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2004/01/23 11:43:33 agc Exp $
 
 --- misc/magic.h.orig  Fri Sep 21 11:15:45 2001
 +++ misc/magic.h       Wed Mar 13 12:37:46 2002
-@@ -147,69 +147,11 @@
+@@ -99,7 +99,7 @@
+       : FALSE)
+ #else
+ #define       ASSERT(p, where)        (FALSE)
+-#endif        PARANOID
++#endif        /* PARANOID */
+ 
+ 
+ /* ------------------------ Malloc/free ------------------------------- */
+@@ -146,71 +146,13 @@
+  *
   */
  
 -#ifdef        i386
 -#define       IS_LITTLE_ENDIAN        /* Intel x86 processors. */
-+#include <sys/endian.h>
-+#if BYTE_ORDER==BIG_ENDIAN
-+#define IS_BIG_ENDIAN
-+#else
-+#define IS_LITTLE_ENDIAN
- #endif
- 
+-#endif
+-
 -#ifdef        linux
 -#define       IS_LITTLE_ENDIAN        /* Intel x86 processors running Linux >=.99p7. */
 -#endif
@@ -65,8 +70,13 @@
 -
 -#ifdef        ALPHA
 -#define       IS_LITTLE_ENDIAN        /* Digital Alpha AXP */
--#endif
--
++#include <sys/endian.h>
++#if BYTE_ORDER==BIG_ENDIAN
++#define IS_BIG_ENDIAN
++#else
++#define IS_LITTLE_ENDIAN
+ #endif
+ 
 -/* Well, how'd we do? */
 -
 -#if   !defined(IS_BIG_ENDIAN) && !defined(IS_LITTLE_ENDIAN)
@@ -77,3 +87,4 @@
 -#endif
  
      /* ------- Configuration:  Handle Missing Routines/Definitions ------- */
+ 
diff -r adf4bc602291 -r 9d2236756ae3 cad/magic/patches/patch-ab
--- a/cad/magic/patches/patch-ab        Fri Jan 23 11:43:06 2004 +0000
+++ b/cad/magic/patches/patch-ab        Fri Jan 23 11:43:33 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2002/07/14 03:47:46 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.3 2004/01/23 11:43:33 agc Exp $
 
 --- scripts/config.orig        Sat Jul 13 23:25:57 2002
 +++ scripts/config
-@@ -191,15 +191,22 @@
+@@ -191,15 +191,21 @@
      breaksw
  case "2":
      echo "NetBSD 1.x selected"
@@ -12,8 +12,7 @@
 +    else if (-f /usr/libexec/cpp0) then
 +      set cpp = "/usr/libexec/cpp0 -P -traditional"
 +    else
-+      echo "I am not able to figure out where cpp is on your system"
-+      exit 1
++      set cpp = "cc -E -traditional"
 +    endif
      if ($?usingX11) then
        echo "NOTE:  Since you are running NetBSD using X11, we're assuming"
diff -r adf4bc602291 -r 9d2236756ae3 cad/magic/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/magic/patches/patch-ac        Fri Jan 23 11:43:33 2004 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1 2004/01/23 11:43:33 agc Exp $
+
+--- database/database.h.in     2004/01/23 09:50:02     1.1
++++ database/database.h.in     2004/01/23 09:50:45
+@@ -26,13 +26,13 @@
+ 
+ #ifndef       _MAGIC
+ int err0 = Need_to_include_misc/magic_header;
+-#endif        _MAGIC
++#endif        /* _MAGIC */
+ #ifndef       _TILES
+ int err1 = Need_to_include_tiles/tile_header;
+-#endif        _TILES
++#endif        /* _TILES */
+ #ifndef       _HASH
+ int err2 = Need_to_include_utils/hash_header;
+-#endif        _HASH
++#endif        /* _HASH */
+ 
+ /* ----------------------- Tunable constants -------------------------- */
+ 
+@@ -412,7 +412,7 @@
+    bool side;
+ } DiagInfo;
+ 
+-#endif NONMANHATTAN
++#endif /* NONMANHATTAN */
+ 
+ /*     
+  * Structure to pass to dbcUnconnectFunc(), containing the overlap
diff -r adf4bc602291 -r 9d2236756ae3 cad/magic/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/magic/patches/patch-ad        Fri Jan 23 11:43:33 2004 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-ad,v 1.1 2004/01/23 11:43:33 agc Exp $
+
+--- tech/tech.c        2004/01/23 09:51:59     1.1
++++ tech/tech.c        2004/01/23 09:52:54
+@@ -31,8 +31,8 @@
+ #include "utils/malloc.h"
+ 
+ #ifndef NO_VARARGS
+-#include <varargs.h>
+-#endif  NO_VARARGS
++#include <stdarg.h>
++#endif  /* NO_VARARGS */
+ 
+ global char *TechDefault = NULL;
+ 
+@@ -415,15 +415,12 @@
+  /*VARARGS0*/
+ 
+ void
+-TechError(va_alist)
+-va_dcl
++TechError(char *fmt, ...)
+ {
+     va_list args;
+-    char *fmt;
+ 
+     TechPrintLine();
+-    va_start(args);
+-    fmt = va_arg(args, char *);
++    va_start(args, fmt);
+     (void) GrVfprintf(stderr, fmt, args);
+     va_end(args);
+ }
diff -r adf4bc602291 -r 9d2236756ae3 cad/magic/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/magic/patches/patch-ae        Fri Jan 23 11:43:33 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2004/01/23 11:43:33 agc Exp $
+
+--- ext2sim/ext2sim.c  2004/01/23 09:53:44     1.1
++++ ext2sim/ext2sim.c  2004/01/23 09:54:02
+@@ -19,7 +19,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <stdlib.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include "misc/magic.h"
+ #include "utils/geometry.h"
+ #include "utils/hash.h"
diff -r adf4bc602291 -r 9d2236756ae3 cad/magic/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/magic/patches/patch-af        Fri Jan 23 11:43:33 2004 +0000
@@ -0,0 +1,39 @@
+$NetBSD: patch-af,v 1.1 2004/01/23 11:43:33 agc Exp $
+
+--- ext2spice/ext2spice.c      2004/01/23 09:54:56     1.1
++++ ext2spice/ext2spice.c      2004/01/23 09:56:01
+@@ -18,7 +18,7 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include "misc/magic.h"
+ #include "utils/malloc.h"
+ #include "utils/geometry.h"
+@@ -1586,22 +1586,19 @@
+ }
+ 
+ /* debugging stuff */
+-#include <varargs.h>
++#include <stdarg.h>
+ 
+ #define DBG 1
+ 
+-DBPRINT( va_alist )
+-  va_dcl
++DBPRINT( char *fmt, ... )
+   {
+     va_list  args;
+-    char     *fmt;
+     FILE     *fp;
+     char     buff[ 300 ];
+ 
+     if ( DBG ) {
+-    va_start( args );
++    va_start( args, fmt );
+     fp = stderr ;
+-    fmt = va_arg( args, char * );
+     (void) vsprintf( buff, fmt, args );
+     va_end( args );
+ 
diff -r adf4bc602291 -r 9d2236756ae3 cad/magic/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/magic/patches/patch-ag        Fri Jan 23 11:43:33 2004 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2004/01/23 11:43:33 agc Exp $
+
+--- extcheck/extcheck.c        2004/01/23 09:56:51     1.1
++++ extcheck/extcheck.c        2004/01/23 09:57:23
+@@ -28,7 +28,6 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
+-#include <varargs.h>
+ #include "misc/magic.h"
+ #include "misc/paths.h"
+ #include "utils/geometry.h"
diff -r adf4bc602291 -r 9d2236756ae3 cad/magic/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/magic/patches/patch-ah        Fri Jan 23 11:43:33 2004 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2004/01/23 11:43:33 agc Exp $
+
+--- extflat/EFargs.c   2004/01/23 09:58:12     1.1
++++ extflat/EFargs.c   2004/01/23 09:58:38
+@@ -24,7 +24,6 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <stdlib.h>
+-#include <varargs.h>
+ #ifdef SYSV
+ #include <string.h>
+ #endif
diff -r adf4bc602291 -r 9d2236756ae3 cad/magic/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/magic/patches/patch-ai        Fri Jan 23 11:43:33 2004 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ai,v 1.1 2004/01/23 11:43:33 agc 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 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <stdlib.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include "misc/magic.h"
+ #include "utils/geometry.h"
+ #include "utils/hash.h"
+@@ -534,14 +534,12 @@
+  */
+ 
+     /*VARARGS1*/
+-efReadError(fmt, va_alist)
+-    char *fmt;
+-    va_dcl
++efReadError(char *fmt, ...)
+ {
+     va_list args;
+