mpg123: merge -alsa subpkg to the libmpg123 pkg; makes no sense to have it in another subpkg.

srcpkgs/mpg123-alsa

@@ -1 +0,0 @@
-mpg123

srcpkgs/mpg123/template

@@ -1,13 +1,12 @@
 # Template file for 'mpg123'
 pkgname=mpg123
 version=1.19.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-module-suffix=.so --with-optimization=4
  --with-default-audio=alsa --enable-ipv6=yes --enable-network=yes"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libltdl-devel jack-devel pulseaudio-devel SDL-devel"
-depends="mpg123-alsa>=${version}"
 short_desc="Fast console MPEG audio decoder/player"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.mpg123.de/"
@@ -45,22 +44,14 @@ mpg123-sdl_package() {
 	}
 }
 
-mpg123-alsa_package() {
-	lib32disabled=yes
-	depends="libmpg123>=${version}"
-	short_desc+=" - ALSA output plugin"
-	replaces="libmpg123<1.13.4_1"
-	pkg_install() {
-		vmove usr/lib/mpg123/output_alsa.so
-	}
-}
-
 libmpg123_package() {
+	replaces="mpg123-alsa<1.19.0_3"
 	short_desc+=" - Runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 		vmove usr/lib/mpg123/output_dummy.so
 		vmove usr/lib/mpg123/output_oss.so
+		vmove usr/lib/mpg123/output_alsa.so
 	}
 }