From abbee5c7951a239d131d55703de9f07eca5e9549 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Mon, 17 Jul 2006 17:41:00 +0000
Subject: Assume stdarg.h exists instead of using varargs.h in some cases.
 Fixes build with gcc-3.4.6 on Linux.  From Roman Valls in PR 34016.

---
 mail/elm/distinfo         |  5 +++--
 mail/elm/patches/patch-ak | 25 +++++++++++++++++++++----
 mail/elm/patches/patch-am | 17 +++++++++++++++++
 3 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 mail/elm/patches/patch-am

(limited to 'mail/elm')

diff --git a/mail/elm/distinfo b/mail/elm/distinfo
index 830e014151d..42dee01b793 100644
--- a/mail/elm/distinfo
+++ b/mail/elm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/06/20 15:39:06 joerg Exp $
+$NetBSD: distinfo,v 1.12 2006/07/17 17:41:00 wiz Exp $
 
 SHA1 (elm2.5.8.tar.gz) = bf09df75d0dc9097a1e69591bfb4872f860e00c7
 RMD160 (elm2.5.8.tar.gz) = c12dbefd0bf9d47ee4438673507a4693c4a6808c
@@ -13,5 +13,6 @@ SHA1 (patch-ag) = e7bb5d94736a7a1dd8616a7e8f88c4c5c64059d1
 SHA1 (patch-ah) = 142735922d6d58f08823dbc68540e6c9faf1eac9
 SHA1 (patch-ai) = 0564267f91fa54405c900f0d51f0f64ecc9e0277
 SHA1 (patch-aj) = e129e633f8def8cd529b03014d6818b1eb59d220
-SHA1 (patch-ak) = 2169bc9d28077d8c5e6cd298b3891731f0b611b8
+SHA1 (patch-ak) = 7e3fe79d140cd205a910b8a9a56327dc19e3359e
 SHA1 (patch-al) = fe79a8d235c815728398e8052005755ea44c257a
+SHA1 (patch-am) = d406ae06488b85b33b03d860b37398849dce7832
diff --git a/mail/elm/patches/patch-ak b/mail/elm/patches/patch-ak
index fdef9d8546b..cb49c0558e4 100644
--- a/mail/elm/patches/patch-ak
+++ b/mail/elm/patches/patch-ak
@@ -1,8 +1,25 @@
-$NetBSD: patch-ak,v 1.1 2006/01/24 22:47:13 joerg Exp $
+$NetBSD: patch-ak,v 1.2 2006/07/17 17:41:00 wiz Exp $
 
---- hdrs/mcprtlib.h.orig	2006-01-24 21:26:45.000000000 +0000
+--- hdrs/mcprtlib.h.orig	2005-08-18 12:49:24.000000000 +0000
 +++ hdrs/mcprtlib.h
-@@ -145,7 +145,7 @@ typedef struct {
+@@ -46,16 +46,8 @@ up-to-date.  Many thanks.
+ 08/10/90   1 nazgul	Initial version
+ */
+ 
+-/* taken from Xm/lib/VaSimple.h
+-   currently no one defines MISSING_STDARG_H */
+- 
+-#ifdef	I_STDARG
+ # include <stdarg.h>
+ # define Va_start(a,b) va_start(a,b)
+-#else
+-# include <varargs.h>
+-# define Va_start(a,b) va_start(a)
+-#endif
+ 
+ #define MCFree		0x0010			/* Reminder to MCPrintFree */
+ #define MCCatalog	0x0100			/* Probably came from catalog */
+@@ -145,7 +137,7 @@ typedef struct {
      for (i = 0; i < typeCnt; ++i) {					      \
  	switch (typeList[i].type) {					      \
  	  case MCShortType:						      \
@@ -11,7 +28,7 @@ $NetBSD: patch-ak,v 1.1 2006/01/24 22:47:13 joerg Exp $
  	    break;							      \
  	  case MCLongType:						      \
  	    typeList[i].u.longV = va_arg(vl, long);			      \
-@@ -159,7 +159,7 @@ typedef struct {
+@@ -159,7 +151,7 @@ typedef struct {
  	    break;							      \
  #endif*/								      \
  	  case MCFloatType:						      \
diff --git a/mail/elm/patches/patch-am b/mail/elm/patches/patch-am
new file mode 100644
index 00000000000..05024b1c554
--- /dev/null
+++ b/mail/elm/patches/patch-am
@@ -0,0 +1,17 @@
+$NetBSD: patch-am,v 1.1 2006/07/17 17:41:00 wiz Exp $
+
+--- src/curses.c.orig	2005-08-18 13:20:14.000000000 +0000
++++ src/curses.c
+@@ -47,11 +47,7 @@ static char rcsid[] = "@(#)$Id: curses.c
+ #include "s_elm.h"
+ 
+ #include <assert.h>
+-#ifdef I_STDARG
+-# include <stdarg.h>
+-#else
+-# include <varargs.h>
+-#endif
++#include <stdarg.h>
+ 
+ #define S_(sel, str)	catgets(elm_msg_cat, ElmSet, (sel), (str))
+ 
-- 
cgit v1.2.3