[pkgsrc/trunk]: pkgsrc/mail/ja-mh Fix compile problem with gcc-3.X. This pat...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/74fe7291b45d
branches:  trunk
changeset: 480641:74fe7291b45d
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Sep 18 04:43:39 2004 +0000

description:
Fix compile problem with gcc-3.X.  This patch is from
FreeBSD's japanese/mh ports.

Bump PKGREVISION.

diffstat:

 mail/ja-mh/Makefile         |   3 +-
 mail/ja-mh/distinfo         |   3 +-
 mail/ja-mh/patches/patch-as |  55 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 2 deletions(-)

diffs (87 lines):

diff -r 71e893dc77a4 -r 74fe7291b45d mail/ja-mh/Makefile
--- a/mail/ja-mh/Makefile       Sat Sep 18 02:47:28 2004 +0000
+++ b/mail/ja-mh/Makefile       Sat Sep 18 04:43:39 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 21:46:20 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/09/18 04:43:39 taca Exp $
 # FreeBSD Id: Makefile,v 1.13 1999/02/10 18:13:21 motoyuki Exp $
 
 DISTNAME=      mh-6.8.4-JP-3.03
 PKGNAME=       ja-mh6-3.03
+PKGREVISION=   1
 CATEGORIES=    japanese mail
 MASTER_SITES=  ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ \
                ftp://komadori.planet.sci.kobe-u.ac.jp/pub/MH/ \
diff -r 71e893dc77a4 -r 74fe7291b45d mail/ja-mh/distinfo
--- a/mail/ja-mh/distinfo       Sat Sep 18 02:47:28 2004 +0000
+++ b/mail/ja-mh/distinfo       Sat Sep 18 04:43:39 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $
+$NetBSD: distinfo,v 1.2 2004/09/18 04:43:39 taca Exp $
 
 SHA1 (mh-6.8.4-JP-3.03.tar.gz) = e533b22c23e79e8cba50ed2fe391f0f3b3ca332a
 Size (mh-6.8.4-JP-3.03.tar.gz) = 1567712 bytes
@@ -20,3 +20,4 @@
 SHA1 (patch-ap) = bde44e5f75ee1e124b5fff9679823e1ee2c313f0
 SHA1 (patch-aq) = e9399fe4a26005be428960666ac7ac437789aaa5
 SHA1 (patch-ar) = 3f9a0e510c9649ac07f07ef86f4a139bba1a5055
+SHA1 (patch-as) = 287118b416c42d4ec340c4548242d4e15afa6748
diff -r 71e893dc77a4 -r 74fe7291b45d mail/ja-mh/patches/patch-as
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/ja-mh/patches/patch-as       Sat Sep 18 04:43:39 2004 +0000
@@ -0,0 +1,55 @@
+$NetBSD: patch-as,v 1.1 2004/09/18 04:43:39 taca Exp $
+
+--- sbr/concat.c.orig  1993-12-01 13:01:21.000000000 +0900
++++ sbr/concat.c
+@@ -2,13 +2,12 @@
+ 
+ #include "../h/mh.h"
+ #include <stdio.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ 
+ 
+ /* VARARGS */
+ 
+-char   *concat (va_alist)
+-va_dcl
++char   *concat (char *first, ...)
+ {
+     register char  *cp,
+                    *dp,
+@@ -17,19 +16,26 @@ va_dcl
+     register    va_list list;
+ 
+     len = 1;
+-    va_start (list); 
+-    while (cp = va_arg (list, char *))
+-      len += strlen (cp);
+-    va_end (list);
++    if (first) {
++          len += strlen(first);
++          va_start (list, first);
++          while (cp = va_arg (list, char *))
++                  len += strlen (cp);
++          va_end (list);
++    }
+ 
+     dp = sp = malloc (len);
+     if (dp == NULL)
+       adios (NULLCP, "unable to allocate string storage");
+ 
+-    va_start (list); 
+-    while (cp = va_arg (list, char *))
+-      sp = copy (cp, sp);
+-    va_end (list);
++    *sp = '\0';
++    if (first) {
++          sp = copy (first, sp);
++          va_start (list, first);
++          while (cp = va_arg (list, char *))
++                  sp = copy (cp, sp);
++          va_end (list);
++    }
+ 
+     return dp;
+ }