upgrade to 0.2.0 and unbreak

PR:		31121
Submitted by:	MAINTAINER

8 files changed, 164 insertions, 6 deletions

diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index df3d737a82d5..e9c4bb517638 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	mpg321
-PORTVERSION=	0.1.5
+PORTVERSION=	0.2.0
 CATEGORIES=	audio
 MASTER_SITES=	http://people.debian.org/~drew/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	naddy@mips.inka.de
 
-LIB_DEPENDS=	ao.1:${PORTSDIR}/audio/libao
-BUILD_DEPENDS=	${LOCALBASE}/lib/libmad.a:${PORTSDIR}/audio/mad
-
-BROKEN=		"not yet updated for libao.so.2"
+LIB_DEPENDS=	ao.2:${PORTSDIR}/audio/libao \
+		mad.0:${PORTSDIR}/audio/mad
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-mpg123-symlink
diff --git a/audio/mpg321/distinfo b/audio/mpg321/distinfo
index 3ba2170a7401..e5dee369c78d 100644
--- a/audio/mpg321/distinfo
+++ b/audio/mpg321/distinfo
@@ -1 +1 @@
-MD5 (mpg321_0.1.5.tar.gz) = 8632ea26959ae3057a6a6414e47fb486
+MD5 (mpg321_0.2.0.tar.gz) = 9bf6a0b049c492381819b53e7449455a
diff --git a/audio/mpg321/files/patch-mad.c b/audio/mpg321/files/patch-mad.c
new file mode 100644
index 000000000000..8589b5448bc8
--- /dev/null
+++ b/audio/mpg321/files/patch-mad.c
@@ -0,0 +1,90 @@
+
+$FreeBSD$
+
+--- mad.c.orig	Sun Sep 23 08:17:55 2001
++++ mad.c	Mon Sep 24 15:56:20 2001
+@@ -554,44 +554,47 @@
+     
+ int calc_length(char *file, buffer *buf)
+ {
+-    FILE * f;
++    int f;
+     struct stat filestat;
+     void *fdm;
+     char buffer[3];
+ 
+-    if (stat(file, &filestat) == -1)
++    f = open(file, O_RDONLY);
++
++    if (f < 0)
+     {
+         mpg321_error(file);
+         return -1;
+     }
+ 
+-    f = fopen(file, "r");
+-
+-    if (f == NULL)
++    if (fstat(f, &filestat) < 0)
+     {
+         mpg321_error(file);
++        close(f);
+         return -1;
+     }
+ 
+     if (!S_ISREG(filestat.st_mode))
+     {
+         fprintf(stderr, "%s: Not a regular file\n", file);
+-        fclose(f);
++        close(f);
+         return -1;
+     }
+ 
+     /* TAG checking is adapted from XMMS */
+     buf->length = filestat.st_size;
+ 
+-    if (fseek(f, -128, SEEK_END) < 0)
++    if (lseek(f, -128, SEEK_END) < 0)
+     {
+         mpg321_error(file);
++        close(f);
+         return -1;
+     }    
+ 
+-    if (read(fileno(f), buffer, 3) != 3)
++    if (read(f, buffer, 3) != 3)
+     {
+         fprintf(stderr, "Couldnt read 3 bytes from %s\n", file);
++        close(f);
+         return -1;
+     }
+     
+@@ -600,12 +603,11 @@
+         buf->length -= 128; /* Correct for id3 tags */
+     }
+     
+-    rewind(f);
+-
+-    fdm = mmap(0, buf->length, PROT_READ, MAP_SHARED, fileno(f), 0);
++    fdm = mmap(0, buf->length, PROT_READ, MAP_SHARED, f, 0);
+     if (fdm == MAP_FAILED)
+     {
+         mpg321_error(file);
++        close(f);
+         return -1;
+     }
+ 
+@@ -616,11 +618,11 @@
+     if (munmap(fdm, buf->length) == -1)
+     {
+         mpg321_error(file);
+-        fclose(f);
++        close(f);
+         return -1;
+     }
+ 
+-    if (fclose(f) == EOF)
++    if (close(f) < 0)
+     {
+         mpg321_error(file);
+         return -1;
diff --git a/audio/mpg321/files/patch-mpg321.h b/audio/mpg321/files/patch-mpg321.h
new file mode 100644
index 000000000000..2ac5003087d8
--- /dev/null
+++ b/audio/mpg321/files/patch-mpg321.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- mpg321.h.orig	Sat Sep 22 22:39:04 2001
++++ mpg321.h	Mon Sep 24 16:06:19 2001
+@@ -32,6 +32,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <limits.h>
+ #include <ao/ao.h>
diff --git a/audio/mpg321/files/patch-network.c b/audio/mpg321/files/patch-network.c
new file mode 100644
index 000000000000..212cc481cb21
--- /dev/null
+++ b/audio/mpg321/files/patch-network.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- network.c.orig	Mon Sep 24 16:01:09 2001
++++ network.c	Mon Sep 24 16:01:27 2001
+@@ -237,7 +237,7 @@
+   int data_sock;
+   char ftp_request[1024];
+   struct sockaddr_in stLclAddr;
+-  size_t namelen;
++  socklen_t namelen;
+   int i;
+ 
+   /* Check for URL syntax */
diff --git a/audio/mpg321/files/patch-options.c b/audio/mpg321/files/patch-options.c
new file mode 100644
index 000000000000..5b76533a742a
--- /dev/null
+++ b/audio/mpg321/files/patch-options.c
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- options.c.orig	Mon Sep 24 16:12:31 2001
++++ options.c	Mon Sep 24 16:12:47 2001
+@@ -28,9 +28,9 @@
+ #include "mpg321.h"
+ #include "getopt.h"
+ 
+-#include <sys/types.h>
+-#include <unistd.h>
++#include <sys/time.h>
+ #include <sys/resource.h>
++#include <unistd.h>
+ #include <string.h>
+ 
+ void parse_options(int argc, char *argv[], playlist *pl)
diff --git a/audio/mpg321/files/patch-playlist.c b/audio/mpg321/files/patch-playlist.c
new file mode 100644
index 000000000000..af768ace6cc3
--- /dev/null
+++ b/audio/mpg321/files/patch-playlist.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- playlist.c.orig	Mon Sep 24 21:09:15 2001
++++ playlist.c	Mon Sep 24 21:09:34 2001
+@@ -48,6 +48,7 @@
+     pl->files_size = DEFAULT_PLAYLIST_SIZE;
+     pl->numfiles = 0;
+     pl->random_play = 0;
++    strcpy(pl->remote_file, "");
+     
+     return pl;
+ }
diff --git a/audio/mpg321/files/patch-remote.c b/audio/mpg321/files/patch-remote.c
new file mode 100644
index 000000000000..b9216399109b
--- /dev/null
+++ b/audio/mpg321/files/patch-remote.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- remote.c.orig	Mon Sep 24 16:06:46 2001
++++ remote.c	Mon Sep 24 16:06:48 2001
+@@ -27,6 +27,7 @@
+ 
+ #include "mpg321.h"
+ 
++#include <sys/time.h>
+ #include <string.h>
+ #include <unistd.h>
+