Update aumix to 2.9.1. in this version a lot of bugs were fixed including

PR 34040 reappeared again. aumix-gtk now uses gtk2.

6 files changed, 12 insertions, 30 deletions

diff --git a/audio/aumix-gtk/Makefile b/audio/aumix-gtk/Makefile
index 64bb11db2d6..1d77fe4ced2 100644
--- a/audio/aumix-gtk/Makefile
+++ b/audio/aumix-gtk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/03/03 00:12:37 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2012/07/17 21:26:47 cheusov Exp $
 
 .include "../../audio/aumix/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/aumix/aumix-gtk/}
-PKGREVISION=	12
 
 COMMENT+=	(ncurses and GTK+ 2.0 interfaces)
 
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 1401a779002..0bcbdbc7131 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2011/04/22 13:42:50 obache Exp $
+# $NetBSD: Makefile,v 1.26 2012/07/17 21:26:47 cheusov Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	8
-
 COMMENT+=	(ncurses interface only)
 
 CONFLICTS=	aumix-gtk-[0-9]*
diff --git a/audio/aumix/Makefile.common b/audio/aumix/Makefile.common
index 3e779dea90a..2fe5d4911e5 100644
--- a/audio/aumix/Makefile.common
+++ b/audio/aumix/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2012/02/15 20:04:30 hans Exp $
+# $NetBSD: Makefile.common,v 1.8 2012/07/17 21:26:47 cheusov Exp $
 # used by audio/aumix/Makefile
 # used by audio/aumix-gtk/Makefile
 
-DISTNAME=	aumix-2.8
+DISTNAME=	aumix-2.9.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aumix/} \
 		http://jpj.net/~trevor/aumix/ \
@@ -26,7 +26,6 @@ GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--enable-own-labels
 CONFIGURE_ARGS+=	--enable-nls
-CONFIGURE_ARGS+=	--without-gtk1
 CONFIGURE_ARGS+=	--without-gtk
 
 LIBS.SunOS+=		-lintl
diff --git a/audio/aumix/PLIST b/audio/aumix/PLIST
index ea629333dfc..0e3274dd9c4 100644
--- a/audio/aumix/PLIST
+++ b/audio/aumix/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:32:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/07/17 21:26:47 cheusov Exp $
 bin/aumix
 bin/mute
 bin/xaumix
 man/man1/aumix.1
+man/man1/mute.1
 man/man1/xaumix.1
 share/aumix/ansi
 share/aumix/aumix.xpm
@@ -10,11 +11,13 @@ share/aumix/fadein.set
 share/aumix/fadeout.set
 share/aumix/vt100
 share/aumix/xterm
+share/locale/ca/LC_MESSAGES/aumix.mo
 share/locale/de/LC_MESSAGES/aumix.mo
 share/locale/el/LC_MESSAGES/aumix.mo
 share/locale/es/LC_MESSAGES/aumix.mo
 share/locale/fr/LC_MESSAGES/aumix.mo
 share/locale/gl/LC_MESSAGES/aumix.mo
+share/locale/it/LC_MESSAGES/aumix.mo
 share/locale/ja/LC_MESSAGES/aumix.mo
 share/locale/nl/LC_MESSAGES/aumix.mo
 share/locale/pl/LC_MESSAGES/aumix.mo
diff --git a/audio/aumix/distinfo b/audio/aumix/distinfo
index d8c65716070..a0f2eecc8b2 100644
--- a/audio/aumix/distinfo
+++ b/audio/aumix/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/02/15 20:04:30 hans Exp $
+$NetBSD: distinfo,v 1.7 2012/07/17 21:26:47 cheusov Exp $
 
-SHA1 (aumix-2.8.tar.bz2) = 5cea563ae91f628433a1950a36efd23681da4bf4
-RMD160 (aumix-2.8.tar.bz2) = f7ab3737af772b97359dfc5d9852d06fda05aaa5
-Size (aumix-2.8.tar.bz2) = 157503 bytes
-SHA1 (patch-ad) = fc610f71143b892b68f798e3556bc756875dd26c
+SHA1 (aumix-2.9.1.tar.bz2) = 1b84054cfb74d3513b254d05c2fb08f6a6a3edc7
+RMD160 (aumix-2.9.1.tar.bz2) = a68d2e1da251edad721e997099d8149075f07449
+Size (aumix-2.9.1.tar.bz2) = 231622 bytes
 SHA1 (patch-src_common.h) = 55106984552fb769cca82d847095351e1d8cec4e
diff --git a/audio/aumix/patches/patch-ad b/audio/aumix/patches/patch-ad
deleted file mode 100644
index 5d368f7fef6..00000000000
--- a/audio/aumix/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/06/19 15:55:09 jlam Exp $
-
---- src/Makefile.in.orig	Tue Jun 19 06:09:52 2001
-+++ src/Makefile.in
-@@ -88,9 +88,9 @@
- aumix_SOURCES = common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c 		mouse.c common.h curses.h gpm-xterm.h gtk.h interactive.h  		mouse.h play.xpm record.xpm
- 
- localedir = $(datadir)/locale
--INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
-+INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
- CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@
--LDADD = -L@libdir@
-+LDADD = 
- LIBS = @LIBS@ @GTK_LIBS@ @INTLLIBS@
- DEFS = @DEFS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs