Correct usage of errno and ctype macros. The former is wrong when thread

linking is active, the latter can result in segfaults.

Bump revisions of mpg123, mpg123-esound and mpg123-nas for the ctype
bugfix.

3 files changed, 57 insertions, 9 deletions

diff --git a/audio/mpg123/patches/patch-aq b/audio/mpg123/patches/patch-aq
index b5b898079fc..08e50c199fb 100644
--- a/audio/mpg123/patches/patch-aq
+++ b/audio/mpg123/patches/patch-aq
@@ -1,8 +1,21 @@
-$NetBSD: patch-aq,v 1.2 2004/11/07 08:55:04 tron Exp $
+$NetBSD: patch-aq,v 1.3 2005/10/03 15:17:14 joerg Exp $
 
---- httpget.c.orig	2004-11-07 09:47:28.000000000 +0100
-+++ httpget.c	2004-11-07 09:49:34.000000000 +0100
-@@ -55,11 +55,10 @@
+--- httpget.c.orig	2005-10-03 17:03:06.000000000 +0200
++++ httpget.c	2005-10-03 17:03:06.000000000 +0200
+@@ -18,11 +18,9 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <ctype.h>
+ 
+-extern int errno;
+-
+ #include "mpg123.h"
+ 
+ #ifndef INADDR_NONE
+@@ -55,11 +53,10 @@
  #endif
  	int pos = 0;
  
@@ -15,7 +28,7 @@ $NetBSD: patch-aq,v 1.2 2004/11/07 08:55:04 tron Exp $
  				break;
  			}
  		}
-@@ -78,6 +77,7 @@
+@@ -78,6 +75,7 @@
  	}
  #endif
  
@@ -23,7 +36,7 @@ $NetBSD: patch-aq,v 1.2 2004/11/07 08:55:04 tron Exp $
  }
  
  void encode64 (char *source,char *destination)
-@@ -111,7 +111,7 @@
+@@ -111,7 +109,7 @@
  }
  
  /* VERY  simple auth-from-URL grabber */
@@ -32,7 +45,7 @@ $NetBSD: patch-aq,v 1.2 2004/11/07 08:55:04 tron Exp $
  {
    char *pos;
  
-@@ -126,9 +126,13 @@
+@@ -126,9 +124,13 @@
        if( url[i] == '/' )
           return 0;
      }
@@ -47,7 +60,16 @@ $NetBSD: patch-aq,v 1.2 2004/11/07 08:55:04 tron Exp $
      return 1;
    }
    return 0;
-@@ -265,7 +269,10 @@
+@@ -199,7 +201,7 @@
+ 	strncpy(p0, portptr, stringlength);
+ 	*(p0 + stringlength) = '\0';
+ 
+-	for (p = p0; *p && isdigit(*p); p++)
++	for (p = p0; *p && isdigit((unsigned char)*p); p++)
+ 		;
+ 	*p = '\0';
+ 	*port = (char *)p0;
+@@ -265,7 +267,10 @@
  	strncpy (purl, url, 1023);
  	purl[1023] = '\0';
  
@@ -59,7 +81,7 @@ $NetBSD: patch-aq,v 1.2 2004/11/07 08:55:04 tron Exp $
  
  	do {
  		strcpy (request, "GET ");
-@@ -399,6 +406,7 @@
+@@ -399,6 +404,7 @@
  		fprintf (stderr, "Too many HTTP relocations.\n");
  		exit (1);
  	}
diff --git a/audio/mpg123/patches/patch-av b/audio/mpg123/patches/patch-av
new file mode 100644
index 00000000000..5a92c4573cc
--- /dev/null
+++ b/audio/mpg123/patches/patch-av
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1 2005/10/03 15:17:14 joerg Exp $
+
+--- xfermem.c.orig	2005-07-23 23:42:59.000000000 +0000
++++ xfermem.c
+@@ -32,8 +32,6 @@
+ #include <sys/shm.h>
+ #endif
+ 
+-extern int errno;
+-
+ #if defined (USE_MMAP) && defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
+ #define MAP_ANON MAP_ANONYMOUS
+ #endif
diff --git a/audio/mpg123/patches/patch-aw b/audio/mpg123/patches/patch-aw
new file mode 100644
index 00000000000..d22aebe6368
--- /dev/null
+++ b/audio/mpg123/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.1 2005/10/03 15:17:14 joerg Exp $
+
+--- term.c.orig	2005-10-03 15:20:10.000000000 +0200
++++ term.c
+@@ -90,7 +90,7 @@ static long term_handle_input(struct fra
+   while(n > 0) {
+     fd_set r;
+     struct timeval t;
+-    char val;
++    unsigned char val;
+ 
+     t.tv_sec=0;
+     t.tv_usec=(do_delay) ? 1000 : 0;