[pkgsrc/trunk]: pkgsrc/audio/xcdplayer Make this compile with gcc3 (varargs -...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba5e77a724f3
branches:  trunk
changeset: 466778:ba5e77a724f3
user:      agc <agc%pkgsrc.org@localhost>
date:      Fri Jan 23 09:02:15 2004 +0000

description:
Make this compile with gcc3 (varargs -> stdarg)

diffstat:

 audio/xcdplayer/distinfo         |   4 ++--
 audio/xcdplayer/patches/patch-ag |  40 +++++++++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 11 deletions(-)

diffs (75 lines):

diff -r 5f8d25fcfbfb -r ba5e77a724f3 audio/xcdplayer/distinfo
--- a/audio/xcdplayer/distinfo  Fri Jan 23 08:59:37 2004 +0000
+++ b/audio/xcdplayer/distinfo  Fri Jan 23 09:02:15 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 12:14:40 agc Exp $
+$NetBSD: distinfo,v 1.3 2004/01/23 09:02:15 agc Exp $
 
 SHA1 (xcdplayer-2.2.tar.Z) = e518f2df9fcc5e21e1123fe6f5b1193f232b76ef
 Size (xcdplayer-2.2.tar.Z) = 89435 bytes
@@ -8,7 +8,7 @@
 SHA1 (patch-ad) = 1c1b3ac0661095c239228de69c5c8f161b5cdb99
 SHA1 (patch-ae) = 19a4a70a4c83ae147c8cc653cf95c32370fd084f
 SHA1 (patch-af) = 54c96ac87764c222e48e0dcf4267a93cdd966843
-SHA1 (patch-ag) = c05179debd97b1f6b53c891fe85e4c1b0b8f9b62
+SHA1 (patch-ag) = cb787b19c00d8bda99367eb71dc5e234857a4539
 SHA1 (patch-ah) = b2d4bd7fe5ab0089fd1e05827e9be6ca18a01233
 SHA1 (patch-ai) = 2a3a3726aed4e295c5546d11fd0b3948cecc239a
 SHA1 (patch-aj) = 74e92d2096e5d6ffd6f24dbf2501ed349e9c834f
diff -r 5f8d25fcfbfb -r ba5e77a724f3 audio/xcdplayer/patches/patch-ag
--- a/audio/xcdplayer/patches/patch-ag  Fri Jan 23 08:59:37 2004 +0000
+++ b/audio/xcdplayer/patches/patch-ag  Fri Jan 23 09:02:15 2004 +0000
@@ -1,8 +1,14 @@
-$NetBSD: patch-ag,v 1.3 1999/09/06 16:37:42 tron Exp $
+$NetBSD: patch-ag,v 1.4 2004/01/23 09:02:15 agc Exp $
 
 --- debug.c.orig       Tue Jan 12 19:59:35 1993
 +++ debug.c    Mon Sep  6 18:37:05 1999
-@@ -20,6 +20,10 @@
+@@ -15,31 +15,28 @@
+ 
+ # include <X11/Intrinsic.h>
+ 
+-# include <varargs.h>
++# include <stdarg.h>
+ # include <stdio.h>
  
  # include "debug.h"
  
@@ -12,13 +18,29 @@
 +
  /* VARARGS */
  void
- debug_printf(va_alist)
-@@ -33,7 +37,7 @@
-       /*
-        * first arg is whether or not to print.
-        */
+-debug_printf(va_alist)
+-      va_dcl
++debug_printf(int p, char *fmt, ...)
+ {
+       va_list         args;
+-      char            *fmt;
+-
+-      va_start(args);
+ 
+-      /*
+-       * first arg is whether or not to print.
+-       */
 -      if ((va_arg(args, int) == 0) || (debug == False))
-+      if ((va_arg(args, int) == 0) || (app_data.debug == False))
++      if (p == 0 || app_data.debug == False) {
                return;
+-
+-      fmt = va_arg(args, char *);
++      }
++      va_start(args, fmt);
+       vfprintf(stdout, fmt, args);
++      va_end(args);
  
-       fmt = va_arg(args, char *);
+       fflush(stdout);
+ 
+-      va_end(args);
+ }