4 files changed, 55 insertions, 57 deletions
diff --git a/abs/core/aumix/PKGBUILD b/abs/core/aumix/PKGBUILD
index 09b525a..aa9b072 100644
--- a/abs/core/aumix/PKGBUILD
+++ b/abs/core/aumix/PKGBUILD
@@ -1,24 +1,40 @@
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# $Id: PKGBUILD 70215 2012-05-02 12:56:49Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=aumix
-pkgver=2.8
+pkgver=2.9.1
 pkgrel=4
 pkgdesc="A color text mode sound mixer with GPM support"
 arch=('i686' 'x86_64')
 license=('GPL')
-url="http://www.jpj.net/~trevor/aumix.html"
-depends=('gpm')
-conflicts=('aumix-gtk')
+depends=()
+makedepends=('gtk2' 'gpm' 'ncurses')
+optdepends=('gtk2: aumix'
+	    'ncurses: aumix-nox'
+	    'gpm: aumix-nox')
+replaces=('aumix-gtk')
 provides=('aumix-gtk')
-source=(http://jpj.net/~trevor/aumix/aumix-$pkgver.tar.bz2 aumix.patch)
-md5sums=('dc3fc7209752207c23e7c94ab886b340' 'a4dae53812a41b7576228c37856c701b')
+install=aumix.install
+url=(http://www.jpj.net/~trevor/aumix.html)
+source=(http://www.jpj.net/~trevor/aumix/releases/aumix-$pkgver.tar.bz2
+	aumix.desktop)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 <../aumix.patch || return 1
-  # we build without X/GTK support so we can avoid the dependencies.
-  # if you want GTK support, you can rebuild aumix from your ABS tree.
-  ./configure --prefix=/usr --without-alsa --without-gtk --without-gtk1 || return 1
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  cd $srcdir/aumix-$pkgver
+
+  msg "No X11 build"
+  ./configure --prefix=/usr --mandir=/usr/share/man --without-gtk --without-gtk1 \
+	--without-alsa --without-x
+  make
+  install -D -m0755 src/aumix $pkgdir/usr/bin/aumix-nox
+  make distclean
+
+  msg "X11+GTK2 build"
+  ./configure --prefix=/usr --mandir=/usr/share/man --without-gtk1 --without-alsa \
+	--without-gpm
+  make
+  make DESTDIR=$pkgdir install
+  install -D -m0644 $srcdir/aumix.desktop $pkgdir/usr/share/applications/aumix.desktop
 }
+md5sums=('34f28ae1c94fc5298e8bb2688c4b3a20'
+         'afba8b39b8dd95d8a9d74356023de14a')
diff --git a/abs/core/aumix/aumix.desktop b/abs/core/aumix/aumix.desktop
new file mode 100644
index 0000000..9bf61a7
--- /dev/null
+++ b/abs/core/aumix/aumix.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=0.92
+Encoding=UTF-8
+MultipleArgs=false
+Terminal=0
+Icon=/usr/share/aumix/aumix.xpm
+Exec=/usr/bin/aumix
+Categories=Application;GTK;AudioVideo;Audio;Video;
+Type=Application
+Name=GTK sound mixer
+Name[en]=GTK sound mixer
+Name[ru]=Микшер с GTK-интерфейсом
diff --git a/abs/core/aumix/aumix.install b/abs/core/aumix/aumix.install
new file mode 100644
index 0000000..783d3b3
--- /dev/null
+++ b/abs/core/aumix/aumix.install
@@ -0,0 +1,13 @@
+post_install() {
+  [ -x /usr/bin/update-desktop-database ] && /usr/bin/update-desktop-database > /dev/null 2>&1
+  true
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove () {
+  [ -x /usr/bin/update-desktop-database ] && /usr/bin/update-desktop-database > /dev/null 2>&1
+  true
+}
diff --git a/abs/core/aumix/aumix.patch b/abs/core/aumix/aumix.patch
deleted file mode 100644
index 2cf645f..0000000
--- a/abs/core/aumix/aumix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Nru aumix-2.7/Makefile.in aumix-2.7-new/Makefile.in
---- aumix-2.7/Makefile.in	Tue Jun 27 07:51:42 2000
-+++ aumix-2.7-new/Makefile.in	Fri Oct  5 18:29:37 2001
-@@ -102,7 +102,7 @@
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-+	cd $(top_srcdir) 
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
-@@ -114,7 +114,7 @@
- config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
--	cd $(srcdir) && $(AUTOCONF)
-+	cd $(srcdir) 
- 
- config.h: stamp-h
- 	@if test ! -f $@; then \
-@@ -132,7 +132,7 @@
- 		$(MAKE) $(srcdir)/stamp-h.in; \
- 	else :; fi
- $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
--	cd $(top_srcdir) && $(AUTOHEADER)
-+	cd $(top_srcdir) 
- 	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
- 
- mostlyclean-hdr:
-diff -Nru aumix-2.7/src/Makefile.in aumix-2.7-new/src/Makefile.in
---- aumix-2.7/src/Makefile.in	Tue Jun 27 07:51:42 2000
-+++ aumix-2.7-new/src/Makefile.in	Fri Oct  5 18:30:02 2001
-@@ -123,8 +123,6 @@
- all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .o .s
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
-