[pkgsrc/trunk]: pkgsrc/devel/gettext-tools If va_copy defined use it in int_v...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/574cb850b67f
branches:  trunk
changeset: 515669:574cb850b67f
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jul 06 13:10:27 2006 +0000

description:
If va_copy defined use it in int_vasprintf().
Fixes PR pkg/32854.

diffstat:

 devel/gettext-tools/distinfo         |   3 ++-
 devel/gettext-tools/patches/patch-ap |  29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)

diffs (47 lines):

diff -r 5f390b295468 -r 574cb850b67f devel/gettext-tools/distinfo
--- a/devel/gettext-tools/distinfo      Thu Jul 06 12:56:30 2006 +0000
+++ b/devel/gettext-tools/distinfo      Thu Jul 06 13:10:27 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2006/02/14 22:31:42 joerg Exp $
+$NetBSD: distinfo,v 1.3 2006/07/06 13:10:27 markd Exp $
 
 SHA1 (gettext-0.14.5.tar.gz) = 68737eee1a6427044eef901dc88e4144d371fb6b
 RMD160 (gettext-0.14.5.tar.gz) = d31c8e49671f00623ce1e6f73716a5abcd1c7ec2
@@ -15,3 +15,4 @@
 SHA1 (patch-am) = c130b93748604e3823ba17d29af9d91aaeecfcde
 SHA1 (patch-an) = f99f345f9b23f72e4a462445bcce8281dd1e5308
 SHA1 (patch-ao) = 9e81b05b6e1ee76197c360a441264588607a475c
+SHA1 (patch-ap) = 2955c2d6b2b2d52248d449a0b7ea025a0d632bea
diff -r 5f390b295468 -r 574cb850b67f devel/gettext-tools/patches/patch-ap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gettext-tools/patches/patch-ap      Thu Jul 06 13:10:27 2006 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-ap,v 1.1 2006/07/06 13:10:27 markd Exp $
+
+--- gettext-tools/lib/vasprintf.c.orig 2006-06-28 23:14:51.332244000 +1200
++++ gettext-tools/lib/vasprintf.c
+@@ -40,7 +40,13 @@ int_vasprintf (char **result, const char
+   /* Add one to make sure that it is never zero, which might cause malloc
+      to return NULL.  */
+   size_t total_width = strlen (format) + 1;
+-  va_list ap = *args;
++  va_list ap;
++
++#ifdef va_copy
++  va_copy (ap, *args);
++#else
++  ap = *args;
++#endif
+ 
+   while (*p != '\0')
+     {
+@@ -109,6 +115,9 @@ int_vasprintf (char **result, const char
+         p++;
+       }
+     }
++#ifdef va_copy
++  va_end (ap);
++#endif
+ #ifdef TEST
+   global_total_width = total_width;
+ #endif