Update "mpg123" package version 0.59r. Changes since version 0.59q:

- applied audio_alib changes from Ralf Hildebrandt <R.Hildebrandt@TU-BS.DE>
- some 'paetsches' from DK
- minor optimizations in layer3 (dequantize/huffman)
- BSDOS 4.0 with gcc added to Makefile (<sms@moe.2bsd.com>)
- Solaris-ESD patch from Ryan Prosser <prosser@wam.umd.edu>
- Added Frontend changes from Bertrand Petit <elrond@phoe.netdev.net>
- more DK 'paetsches' (final dk7-clubhaus edition), includes extended term
  control
- SGI audio fix for non RAD machines from Erik Mouw <J.A.K.Mouw@its.tudelft.nl>
- fixed ugly bug in layer3 dequant for bt==2 (may cause high frequency clitchs)
- AMD-3DNow optimizations in decode and dct64
- OS/2 reworked from Samuel Audet (see audio_os2.c for more)
- added freebsd-esd make-entry from Daniel O'Connor (darius@guppy.dons.net.au)
- added enhanced head_check from D. Skarda <0rfelyus@atrey.karlin.mff.cuni.cz>
- applied 'xterm-title-patch' from "Wilson, Jeff D" <jeff.wilson@wilcom.com>
- more esd changes from Robert Bihlmeyer <robbe@orcus.priv.at>
- applied Hannu Napari's <Hannu.Napari@hut.fi> SGI audio patches
- minor changes in httpget.c and mpg123.c
- added native AIX support from Juergen.Schoew@unix-ag.uni-siegen.de
- applied playlist patch from <psst@euskalnet.net>
- more SGI audio patches from Gilles Zunino <Gilles.Zunino@hei.fupl.asso.fr>
- applied esdserver patch from Matthew Parslow <roy@alpha.alphalink.com.au>
- added some fixes for control_generic

5 files changed, 12 insertions, 65 deletions

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 72eed5230da..8b4bd97e0eb 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.14 1999/07/05 21:56:03 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 1999/07/10 10:39:02 tron Exp $
 #
 
-# for OBJECT_FMT
-.include "../../mk/bsd.prefs.mk"
-
-DISTNAME=       mpg123-0.59q
+DISTNAME=       mpg123-0.59r
 CATEGORIES=	audio
-MASTER_SITES=   http://ftp.tu-clausthal.de/pub/unix/audio/mpg123/
+MASTER_SITES=	http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/
 
-MAINTAINER=	augustss@cs.chalmers.se
-HOMEPAGE=	http://mpg.123.org/
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123.html
+
+# for OBJECT_FMT
+.include "../../mk/bsd.prefs.mk"
 
 .if (${MACHINE_ARCH} == "i386")
 .if (${OBJECT_FMT} == "ELF")
diff --git a/audio/mpg123/files/md5 b/audio/mpg123/files/md5
index 72733ad9596..78dbea263b5 100644
--- a/audio/mpg123/files/md5
+++ b/audio/mpg123/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/04/08 07:34:56 tron Exp $
+$NetBSD: md5,v 1.6 1999/07/10 10:39:03 tron Exp $
 
-MD5 (mpg123-0.59q.tar.gz) = 004b50277781704142964a728687224e
+MD5 (mpg123-0.59r.tar.gz) = 95df59ad1651dd2346d49fafc83747e7
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa
index ea6f52fd33b..f8971cb0ea9 100644
--- a/audio/mpg123/patches/patch-aa
+++ b/audio/mpg123/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 1999/06/28 00:35:33 thorpej Exp $
+$NetBSD: patch-aa,v 1.11 1999/07/10 10:39:03 tron Exp $
 
 --- Makefile.orig	Tue Jan 26 06:35:18 1999
 +++ Makefile	Wed Jun 23 19:45:35 1999
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.10 1999/06/28 00:35:33 thorpej Exp $
 +
 +netbsd-i386-elf:
 +	$(MAKE) CC=cc LDFLAGS= \
-+		OBJECTS='decode_i386.o dct64_i386.o getbits.o decode_i586.o \
++		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
 +			audio_sun.o' \
 +		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
 +			-funroll-all-loops -ffast-math -DROT_I386 \
diff --git a/audio/mpg123/patches/patch-ad b/audio/mpg123/patches/patch-ad
deleted file mode 100644
index 013f2bcff82..00000000000
--- a/audio/mpg123/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1998/08/15 10:58:41 frueauf Exp $
-
---- buffer.c.orig	Wed Feb 11 21:55:18 1998
-+++ buffer.c	Sat Aug 15 12:15:26 1998
-@@ -48,7 +48,7 @@
- 	for (;;) {
- 		if (intflag) {
- 			intflag = FALSE;
--#if defined(SOLARIS) || defined(__NetBSD__)
-+#if defined(SOLARIS) || defined(NETBSD)
- 			if (param.outmode == DECODE_AUDIO)
- 				audio_queueflush (ai);
- #endif
diff --git a/audio/mpg123/patches/patch-ag b/audio/mpg123/patches/patch-ag
deleted file mode 100644
index 3dc577a86f3..00000000000
--- a/audio/mpg123/patches/patch-ag
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/05/01 09:55:32 tron Exp $
-
---- httpget.c	Mon Nov 23 08:17:46 1998
-+++ httpget.c	Thu Apr 29 15:08:05 1999
-@@ -154,6 +154,7 @@
- 				if (!(proxyurl = getenv("http_proxy")))
- 					proxyurl = getenv("HTTP_PROXY");
- 		if (proxyurl && proxyurl[0] && strcmp(proxyurl, "none")) {
-+			host = NULL;
- 			if (!(url2hostport(proxyurl, &host, &proxyip, &proxyport))) {
- 				fprintf (stderr, "Unknown proxy host \"%s\".\n",
- 					host ? host : "");
-@@ -184,18 +185,22 @@
- 			myip = proxyip;
- 		}
- 		else {
-+			host = NULL;
- 			if (!(sptr = url2hostport(purl, &host, &myip, &myport))) {
- 				fprintf (stderr, "Unknown host \"%s\".\n",
- 					host ? host : "");
- 				exit (1);
- 			}
--			if (host)
--				free (host);
- 			strcat (request, sptr);
- 		}
- 		sprintf (request + strlen(request),
- 			" HTTP/1.0\r\nUser-Agent: %s/%s\r\n",
- 			prgName, prgVersion);
-+		if (host) {
-+			sprintf(request + strlen(request),
-+				 "Host: %s:%u\r\n", host, myport);
-+			free (host);
-+		}
- 		strcat (request, ACCEPT_HEAD);
- 		strcat (request, "\r\n");
- 		server.sin_family = AF_INET;
->Audit-Trail:
->Unformatted:
-