Update audio/mpg321 to 0.3.2.

pkgsrc changes:

  * Add options.mk to support ALSA.
  * Pull in fix contributed by Keith M Wesolowski in joyent/pkgsrc#29
    to fix core dump on exit.
  * Add patch comments and use standard naming scheme.

Upstream changes (taken from Debian changelog):

mpg321 (0.3.2-1) unstable; urgency=low

  * Fixed bugs to stdout-output (remove garbage in buffer from wrong
    stdout fprintf's, it should have been stderr instead)
  * Fixed bug when closing the stream of AO device that caused wrong
    header to the output buffer for the normal operation. Buffered output
    has no problem with that.

mpg321 (0.3.1-1) unstable; urgency=low

  * Fixed typo ("lighweight") in the man page.

mpg321 (0.3.0-1) unstable; urgency=low

  * Fixed trailing "/" when printint directory.
    Bug reported from Erik (Gentoo).
  * Fixed mistake for '--cdr' option. It should be 'cdr file'
    than 'wave file' in output.
  * mpg321 now supports multiprocessing buffering.Check '-b' option.
    (Closes: Bug#113405).
  * Added '-3' or '--restart' option in man file.
  * Added ALSA volume control when using output buffer.
  * Added Mute/unmute into Basic Keys functionality.

5 files changed, 47 insertions, 13 deletions

diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index 993e2523024..9604ba0cafd 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2015/03/11 22:25:25 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2016/06/02 09:18:19 jperkin Exp $
 
-DISTNAME=	mpg321-0.2.13-4
-PKGNAME=	mpg321-0.2.13.4
+DISTNAME=	mpg321_0.3.2.orig
+PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpg321/}
 
@@ -13,6 +13,10 @@ LICENSE=	gnu-gpl-v2
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-mpg123-symlink
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/:S/.orig/-orig/}
+
+.include "options.mk"
+
 .include "../../audio/libao/buildlink3.mk"
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
diff --git a/audio/mpg321/distinfo b/audio/mpg321/distinfo
index 91f91b0dbb9..0c12609677d 100644
--- a/audio/mpg321/distinfo
+++ b/audio/mpg321/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 01:12:43 agc Exp $
+$NetBSD: distinfo,v 1.8 2016/06/02 09:18:19 jperkin Exp $
 
-SHA1 (mpg321-0.2.13-4.tar.gz) = 08ca707bbf1ff88d401ff2a3625fb242d445bfd2
-RMD160 (mpg321-0.2.13-4.tar.gz) = 5c1d50de0bae66381702ed3f238bfdc0f7b8f2d2
-SHA512 (mpg321-0.2.13-4.tar.gz) = 3b7c507abefcf1b2a98748d22e510adc070be7ce4016c31f4815f75cde17032eb57fb2f4b209e117cfb8e80edfb1150f8d725d6969f77d0ee6b514a91f79b2c8
-Size (mpg321-0.2.13-4.tar.gz) = 144542 bytes
-SHA1 (patch-ab) = 3ec9382e50e03e25522a961aa52c29660a8564f9
+SHA1 (mpg321_0.3.2.orig.tar.gz) = bf1c22542c86af69267828e45f217fdeb49e5d43
+RMD160 (mpg321_0.3.2.orig.tar.gz) = 04ea36c893bbe6fb0054a7fcd71294927cf70ac9
+SHA512 (mpg321_0.3.2.orig.tar.gz) = f1bead2c11e4cde0f1a87e1b2e3d216ef80c9a5dd8b219841961688d44a5fc63a54b7af07359766fde0b2712ddc5d0a90b20149c3228cb2d70e830e15c8ab234
+Size (mpg321_0.3.2.orig.tar.gz) = 151139 bytes
+SHA1 (patch-ao.c) = cb404acdfb032c5a823c717965d14319db0d4466
+SHA1 (patch-mpg321.c) = 0f82c72976ce1f1e7d16cd972eb1e38a0e305f86
diff --git a/audio/mpg321/options.mk b/audio/mpg321/options.mk
new file mode 100644
index 00000000000..ecc0dd20fe4
--- /dev/null
+++ b/audio/mpg321/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2016/06/02 09:18:19 jperkin Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mpg321
+PKG_SUPPORTED_OPTIONS=	alsa
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Malsa)
+CONFIGURE_ARGS+=	--enable-alsa=yes
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--enable-alsa=no
+.endif
diff --git a/audio/mpg321/patches/patch-ab b/audio/mpg321/patches/patch-ao.c
index 251aa1de8ac..90c13765fcb 100644
--- a/audio/mpg321/patches/patch-ab
+++ b/audio/mpg321/patches/patch-ao.c
@@ -1,12 +1,14 @@
-$NetBSD: patch-ab,v 1.2 2011/10/18 11:13:56 ryoon Exp $
+$NetBSD: patch-ao.c,v 1.1 2016/06/02 09:18:19 jperkin Exp $
 
---- ao.c.orig	2011-10-01 09:50:12.000000000 +0000
+Ensure structs are zero'd before use.
+
+--- ao.c.orig	2012-03-25 12:27:49.000000000 +0000
 +++ ao.c
-@@ -234,6 +234,7 @@ void open_ao_playdevice(struct mad_heade
+@@ -299,6 +299,7 @@ void open_ao_playdevice(struct mad_heade
             and restore it afterwards */
          signal(SIGINT, SIG_DFL);
          
-+	memset(&format, 0, sizeof(format));
++        memset(&format, 0, sizeof(format));
          format.bits = 16;
          format.rate = header->samplerate;
          format.channels = (options.opt & MPG321_FORCE_STEREO) ? 2 : MAD_NCHANNELS(header);
diff --git a/audio/mpg321/patches/patch-mpg321.c b/audio/mpg321/patches/patch-mpg321.c
new file mode 100644
index 00000000000..3fb6c6a0315
--- /dev/null
+++ b/audio/mpg321/patches/patch-mpg321.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-mpg321.c,v 1.1 2016/06/02 09:18:19 jperkin Exp $
+
+Ensure structs are zero'd before use.
+
+--- mpg321.c.orig	2012-03-25 12:27:49.000000000 +0000
++++ mpg321.c
+@@ -525,6 +525,7 @@ int main(int argc, char *argv[])
+     
+     old_dir[0] = '\0';
+ 
++    memset(&playbuf, 0, sizeof(playbuf));
+     playbuf.pl = pl = new_playlist();
+ 
+     if (!pl)