main/aumix: upgrade to 2.9.1

4 files changed, 4 insertions, 89 deletions

diff --git a/main/aumix/APKBUILD b/main/aumix/APKBUILD
index d4d8136311..b7e93b4232 100644
--- a/main/aumix/APKBUILD
+++ b/main/aumix/APKBUILD
@@ -1,28 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=aumix
-pkgver=2.8
-pkgrel=3
+pkgver=2.9.1
+pkgrel=0
 pkgdesc="A color text mode sound mixer"
 url="http://www.jpj.net/~trevor/aumix.html"
 arch="all"
 license="GPL"
 depends=
 makedepends="ncurses-dev"
-source="http://jpj.net/~trevor/aumix/aumix-$pkgver.tar.bz2
-	aumix-2.8-mute.patch
-	aumix-2.8-nohome.patch
-	aumix-2.8-save_load.patch
+source="http://jpj.net/~trevor/aumix/releases/aumix-$pkgver.tar.bz2
 	aumix.initd
 	"
 
 prepare() { 
 	cd "$srcdir"/aumix-$pkgver
-	for i in ../*.patch; do
-		msg "Applying $i..."
-		patch -p1 < $i || return 1
-	done
-
-	sed -i -e '/USE_NLS=yes/d' configure || return 1
 }
 
 build() {
@@ -41,8 +32,5 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install || return 1
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/aumix
 }
-md5sums="dc3fc7209752207c23e7c94ab886b340  aumix-2.8.tar.bz2
-3611c0372870a0ad67630231fe576e32  aumix-2.8-mute.patch
-6c8d691beb495257d8309e58c127acd2  aumix-2.8-nohome.patch
-113377f0f69925467a5a5b633a78160c  aumix-2.8-save_load.patch
+md5sums="34f28ae1c94fc5298e8bb2688c4b3a20  aumix-2.9.1.tar.bz2
 affaa735ad9b65a540842994caba18fd  aumix.initd"
diff --git a/main/aumix/aumix-2.8-mute.patch b/main/aumix/aumix-2.8-mute.patch
deleted file mode 100644
index 8a32fd5b9b..0000000000
--- a/main/aumix/aumix-2.8-mute.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix mute script: save volume and then set it to 0 instead of saving it directly 
-to 0. Bug #122087.
-Index: aumix-2.8/src/mute
-===================================================================
---- aumix-2.8.orig/src/mute
-+++ aumix-2.8/src/mute
-@@ -8,7 +8,8 @@
- volumes=$(aumix -vq |tr -d ,)
- if [ $(echo $volumes | awk '{print $2}') -ne 0 -o \
- 	$(echo $volumes | awk '{print $3}') -ne 0 ]; then
--	aumix -S -v 0
-+	aumix -S
-+	aumix -v 0
- else
- 	aumix -L > /dev/null
- fi
diff --git a/main/aumix/aumix-2.8-nohome.patch b/main/aumix/aumix-2.8-nohome.patch
deleted file mode 100644
index bf20f0372c..0000000000
--- a/main/aumix/aumix-2.8-nohome.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
---- aumix-2.8.orig/src/common.c	2002-10-29 13:27:51.000000000 -0800
-+++ aumix-2.8/src/common.c	2004-07-22 01:28:07.684999900 -0700
-@@ -591,7 +591,7 @@
- 	char            filename[PATH_MAX];
- 	if (save_filename == NULL) {
- 		home = getenv("HOME");
--		if ((strlen(home) + strlen(AUMIXRC) + 2) < PATH_MAX) {
-+		if (home && (strlen(home) + strlen(AUMIXRC) + 2) < PATH_MAX) {
- 			sprintf(filename, "%s/.%s", home, AUMIXRC);
- 			setfile = CheckAndOpen(filename, mode);
- 		}
diff --git a/main/aumix/aumix-2.8-save_load.patch b/main/aumix/aumix-2.8-save_load.patch
deleted file mode 100644
index 498716b517..0000000000
--- a/main/aumix/aumix-2.8-save_load.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/src/common.c	2002-11-28 14:22:00.000000000 +0100
-+++ b/src/common.c	2002-11-28 14:23:11.000000000 +0100
-@@ -116,6 +116,7 @@
- int             main(int argc, char *argv[])
- {
- 	int             optn, ii;
-+	int		save = 0, load = 0;
- #ifdef HAVE_CURSES
- 	int             setcolors = FALSE;
- #endif				/* HAVE_CURSES */
-@@ -171,14 +172,10 @@
- 				break;
- #endif				/* HAVE_CURSES */
- 			case 'S':	/* Save to file. */
--				if (mixer_fd == -1)
--					ErrorExitWarn(InitializeMixer(device_filename), 'e');
--				ErrorExitWarn(SaveSettings(), 'e');
-+				save = 1;
- 				break;
- 			case 'L':	/* Load from file. */
--				if (mixer_fd == -1)
--					ErrorExitWarn(InitializeMixer(device_filename), 'e');
--				ErrorExitWarn(LoadSettings(), 'e');
-+				load = 1;
- 				break;
- #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
- 			case 'I':	/* User asked for interactive mode. */
-@@ -194,6 +191,17 @@
- 			}
- 		}
- 	}
-+	if (save | load) {
-+		if (mixer_fd == -1)
-+			ErrorExitWarn(InitializeMixer(device_filename), 'e');
-+		if (save)
-+			ErrorExitWarn(SaveSettings(), 'e');
-+		else
-+			ErrorExitWarn(LoadSettings(), 'e');
-+		close(mixer_fd);
-+		exit(EXIT_SUCCESS);
-+	}
-+	
- #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
- /* Be interactive if no options were given. */
- 	if (!interactive && argc <= 1)