Add include of <string.h> for missing prototype for strlen(). Also, OK

to include unistd.h on NetBSD, for getopt() prototype.

3 files changed, 48 insertions, 2 deletions

diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index cf16fc2a554..2871493d25a 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/06/21 16:38:33 rh Exp $
+$NetBSD: distinfo,v 1.6 2001/08/11 20:51:24 fredb Exp $
 
 SHA1 (xmms-1.2.5.tar.gz) = 64d64a6db0b08ba91a135229437c384da7dba1e5
 Size (xmms-1.2.5.tar.gz) = 2414840 bytes
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = 6f236de07dcd7ce8a2325effe038e42ea4222250
 SHA1 (patch-ae) = 1e486f43bfe8dbafbbea3db3781ec08196184ee2
 SHA1 (patch-af) = 472e2504fae530b34785e18d38d6f45891494a6d
 SHA1 (patch-ag) = 24a56ba54752994806518872d03709559f5ac620
-SHA1 (patch-ah) = b9d9453e99a25601c79cc0beeb37685f7fbefa6f
+SHA1 (patch-ah) = 1c83d665d2473692a3a9feae625f48c420849d6a
 SHA1 (patch-ai) = d05ba576dc40dd29d59c571fbab369d83fbe0b06
 SHA1 (patch-aj) = 95e965c5033dea5d2b0be2a22058f19504da0031
 SHA1 (patch-ak) = 9c89fc3014c1109b14f56c4bdaae7782f2531529
@@ -16,3 +16,5 @@ SHA1 (patch-am) = 3f44eb6ea71c47133482142f4d18ff60c230763c
 SHA1 (patch-an) = 9055b76be68766955311b8f388afd60c604c0c34
 SHA1 (patch-ao) = 428e1083a104358d752ddc483310a97764cb6979
 SHA1 (patch-ap) = 493a4d81960b4d11548b8f277c00b8315339ac02
+SHA1 (patch-aq) = 3eb19fbebfc0ea68cd6703b6b3d1a706406b1aee
+SHA1 (patch-ar) = ef35ce733dceac323119b5bbb3065164fac87c74
diff --git a/audio/xmms/patches/patch-aq b/audio/xmms/patches/patch-aq
new file mode 100644
index 00000000000..242d0f01203
--- /dev/null
+++ b/audio/xmms/patches/patch-aq
@@ -0,0 +1,22 @@
+$NetBSD: patch-aq,v 1.1 2001/08/11 20:51:25 fredb Exp $
+
+--- wmxmms/getopt.c.orig	Thu Jul 29 16:03:12 1999
++++ wmxmms/getopt.c
+@@ -64,7 +64,7 @@
+ 
+ /* This needs to come after some library #include
+    to get __GNU_LIBRARY__ defined.  */
+-#ifdef	__GNU_LIBRARY__
++#if defined(__GNU_LIBRARY__) || defined(__NetBSD__)
+ /* Don't include stdlib.h for non-GNU C libraries because some of them
+    contain conflicting prototypes for getopt.  */
+ #include <stdlib.h>
+@@ -198,7 +198,7 @@
+ /* Value of POSIXLY_CORRECT environment variable.  */
+ static char *posixly_correct;
+ 
+-#ifdef	__GNU_LIBRARY__
++#if defined(__GNU_LIBRARY__) || defined(__NetBSD__)
+ /* We want to avoid inclusion of string.h with non-GNU libraries
+    because there are many ways it can cause trouble.
+    On some systems, it contains special magic macros that don't work
diff --git a/audio/xmms/patches/patch-ar b/audio/xmms/patches/patch-ar
new file mode 100644
index 00000000000..eb6a38e78ba
--- /dev/null
+++ b/audio/xmms/patches/patch-ar
@@ -0,0 +1,22 @@
+$NetBSD: patch-ar,v 1.1 2001/08/11 20:51:25 fredb Exp $
+
+--- xmms/getopt.c.orig	Thu Jul 29 16:03:12 1999
++++ xmms/getopt.c
+@@ -64,7 +64,7 @@
+ 
+ /* This needs to come after some library #include
+    to get __GNU_LIBRARY__ defined.  */
+-#ifdef	__GNU_LIBRARY__
++#if defined(__GNU_LIBRARY__) || defined(__NetBSD__)
+ /* Don't include stdlib.h for non-GNU C libraries because some of them
+    contain conflicting prototypes for getopt.  */
+ #include <stdlib.h>
+@@ -198,7 +198,7 @@
+ /* Value of POSIXLY_CORRECT environment variable.  */
+ static char *posixly_correct;
+ 
+-#ifdef	__GNU_LIBRARY__
++#if defined(__GNU_LIBRARY__) || defined(__NetBSD__)
+ /* We want to avoid inclusion of string.h with non-GNU libraries
+    because there are many ways it can cause trouble.
+    On some systems, it contains special magic macros that don't work