From 740b6dff01f491313029700502f7ae0c1d7a86df Mon Sep 17 00:00:00 2001
From: mrg <mrg@pkgsrc.org>
Date: Sat, 2 Aug 2003 05:20:37 +0000
Subject: make this build with gcc3: don't use invalid <varargs.h> expressions,
 but use simple <stdarg.h> ones instead.

---
 graphics/libungif/distinfo         |  5 +++--
 graphics/libungif/patches/patch-aa | 12 ++++++++++++
 graphics/libungif/patches/patch-ac | 30 ++++++++++--------------------
 3 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 graphics/libungif/patches/patch-aa

(limited to 'graphics')

diff --git a/graphics/libungif/distinfo b/graphics/libungif/distinfo
index 682f193ed83..6ee9a6bab0b 100644
--- a/graphics/libungif/distinfo
+++ b/graphics/libungif/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2002/12/04 07:04:36 thorpej Exp $
+$NetBSD: distinfo,v 1.6 2003/08/02 05:20:37 mrg Exp $
 
 SHA1 (libungif-4.1.0b1.tar.gz) = 5675aeb4a96ec476929c6d78907b5a689f872b03
 Size (libungif-4.1.0b1.tar.gz) = 351757 bytes
+SHA1 (patch-aa) = 2532fbeb4a6ae78259d1f993e6fafb16c99cd568
 SHA1 (patch-ab) = a93e2fe0a93aacda4566e723e681fd316fe2cb2a
-SHA1 (patch-ac) = e5e156e1b85254d989c19dd39bb10e4fd8c33054
+SHA1 (patch-ac) = 3981d775faf641d772810d38c78f928824e9a940
diff --git a/graphics/libungif/patches/patch-aa b/graphics/libungif/patches/patch-aa
new file mode 100644
index 00000000000..fa3736b4ddb
--- /dev/null
+++ b/graphics/libungif/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.5 2003/08/02 05:20:38 mrg Exp $
+
+--- lib/qprintf.c.orig	2000-02-07 03:45:07.000000000 +1100
++++ lib/qprintf.c	2003-07-29 10:16:23.000000000 +1000
+@@ -16,6 +16,7 @@
+ 
+ #include <stdio.h>
+ 
++#undef HAVE_VARARGS_H
+ #ifdef HAVE_VARARGS_H
+ #include <varargs.h>
+ #else
diff --git a/graphics/libungif/patches/patch-ac b/graphics/libungif/patches/patch-ac
index 58177f67e56..216ecfd57c2 100644
--- a/graphics/libungif/patches/patch-ac
+++ b/graphics/libungif/patches/patch-ac
@@ -1,22 +1,12 @@
-$NetBSD: patch-ac,v 1.3 2002/12/04 07:04:37 thorpej Exp $
+$NetBSD: patch-ac,v 1.4 2003/08/02 05:20:39 mrg Exp $
 
---- lib/qprintf.c.orig	Tue Dec  3 22:51:36 2002
-+++ lib/qprintf.c	Tue Dec  3 22:57:23 2002
-@@ -34,13 +34,14 @@
- * Same as fprintf to stderr but with optional print.			     *
- *****************************************************************************/
- #ifdef HAVE_VARARGS_H
--void GifQprintf(int va_alist)
-+void GifQprintf(Format, va_alist)
-+    char *Format;
-+    va_dcl
- {
--    char *Format, Line[128];
-+    char Line[128];
-     va_list ArgPtr;
+--- lib/getarg.c.orig	2000-02-07 03:45:07.000000000 +1100
++++ lib/getarg.c	2003-07-29 10:16:43.000000000 +1000
+@@ -105,6 +105,7 @@
+ #include <alloc.h>
+ #endif /* __MSDOS__ */
  
-     va_start(ArgPtr);
--    Format = va_arg(ArgPtr, char *);
- #else
- void GifQprintf(char *Format, ...)
- {
++#undef HAVE_VARARGS_H
+ #ifdef HAVE_VARARGS_H
+     #include <varargs.h>
+ #elif defined(STDC_HEADERS)
-- 
cgit v1.2.3