[pkgsrc/trunk]: pkgsrc/audio/tosha strndup has only recently been added to Ne...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a38893433481
branches:  trunk
changeset: 534395:a38893433481
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Oct 19 13:33:24 2007 +0000

description:
strndup has only recently been added to NetBSD, so choose another way of
defining the function, whose prototype is incompatible to the native
strndup.

diffstat:

 audio/tosha/distinfo         |   5 ++---
 audio/tosha/patches/patch-ag |  20 --------------------
 audio/tosha/patches/patch-ah |   9 ++++-----
 3 files changed, 6 insertions(+), 28 deletions(-)

diffs (62 lines):

diff -r 428fb26b47ef -r a38893433481 audio/tosha/distinfo
--- a/audio/tosha/distinfo      Fri Oct 19 11:07:44 2007 +0000
+++ b/audio/tosha/distinfo      Fri Oct 19 13:33:24 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2007/10/17 21:49:17 rillig Exp $
+$NetBSD: distinfo,v 1.7 2007/10/19 13:33:24 rillig Exp $
 
 SHA1 (tosha-0.05.tar.gz) = b567f452843b544b082c88403d74ad1ca07f6820
 RMD160 (tosha-0.05.tar.gz) = 21ed9253b020efba1035febe86080a2bd8cc04da
@@ -7,5 +7,4 @@
 SHA1 (patch-ab) = 9b4b43d6cb0fe2871cfd0e7e76ffdbd19123573a
 SHA1 (patch-ac) = 26feb1151d4fb02c5831762447c7bb264517f4d6
 SHA1 (patch-af) = 4a1debd7dec8eaa6e2cae2dc33c8ec1aecbfc736
-SHA1 (patch-ag) = 594eca739420fca1812486c0572492af7399429a
-SHA1 (patch-ah) = 6d31675bf98220fc98300dbd871330b458c97e4d
+SHA1 (patch-ah) = 95b93716401bf84964661834365de5da5fd7486d
diff -r 428fb26b47ef -r a38893433481 audio/tosha/patches/patch-ag
--- a/audio/tosha/patches/patch-ag      Fri Oct 19 11:07:44 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2007/10/17 21:49:17 rillig Exp $
-
---- utils.c.orig       1997-05-21 00:12:35.000000000 +0000
-+++ utils.c    2007-10-17 21:47:50.000000000 +0000
-@@ -56,6 +56,7 @@ void *tmalloc (size_t size)
-       return (mem);
- }
- 
-+#if !defined(__NetBSD__)
- char *strndup (char *src, int num)
- {
-       char *dst;
-@@ -65,6 +66,7 @@ char *strndup (char *src, int num)
-       dst[num] = '\0';
-       return (strncpy(dst, src, num));
- }
-+#endif
- 
- char *justify (char *str)
- {
diff -r 428fb26b47ef -r a38893433481 audio/tosha/patches/patch-ah
--- a/audio/tosha/patches/patch-ah      Fri Oct 19 11:07:44 2007 +0000
+++ b/audio/tosha/patches/patch-ah      Fri Oct 19 13:33:24 2007 +0000
@@ -1,14 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2007/10/17 21:49:17 rillig Exp $
+$NetBSD: patch-ah,v 1.2 2007/10/19 13:33:25 rillig Exp $
 
 --- utils.h.orig       1997-05-21 00:13:22.000000000 +0000
 +++ utils.h    2007-10-17 21:47:24.000000000 +0000
-@@ -59,7 +59,9 @@ void *tmalloc (size_t size);
+@@ -59,6 +59,8 @@ void *tmalloc (size_t size);
   *   allocated.
   */
  
-+#if !defined(__NetBSD__)
++#include <string.h>
++#define strndup tosha_strndup
  char *strndup (char *src, int num);
-+#endif
  /*
   *   Like strdup(), but limits the string length to at most
-  *   <num> characters (not counting the terminating zero).