From bf306752625cd343371fb67bff049f5346437ae0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 2 Apr 2009 18:31:39 -0500
Subject: mplayer: make the pkgbuild and pkgname match.

---
 abs/core-testing/mplayer-nogui-svn/PKGBUILD | 56 +++++++++++++++++++++++++++++
 abs/core-testing/mplayer/PKGBUILD           | 56 -----------------------------
 2 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100644 abs/core-testing/mplayer-nogui-svn/PKGBUILD
 delete mode 100644 abs/core-testing/mplayer/PKGBUILD

diff --git a/abs/core-testing/mplayer-nogui-svn/PKGBUILD b/abs/core-testing/mplayer-nogui-svn/PKGBUILD
new file mode 100644
index 0000000..d241aef
--- /dev/null
+++ b/abs/core-testing/mplayer-nogui-svn/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: catwell <catwell@archlinux.us>
+# Contributor: Army <uli[dot]armbruster[at]gmail[dot].com>
+
+pkgname=mplayer-nogui-svn
+pkgver=29134
+pkgrel=2
+pkgdesc="Famous multimedia player, dev. version, without its GUI"
+arch=('i686' 'x86_64')
+url="http://www.mplayerhq.hu/"
+license=('GPL')
+depends=('ttf-dejavu' 'libcdio')
+makedepends=('subversion')
+conflicts=('mplayer')
+provides=('mplayer')
+source=()
+md5sums=()
+
+_svnmod="mplayer"
+_svntrunk=svn://svn.mplayerhq.hu/mplayer/trunk/
+
+build() {
+
+  cd $srcdir
+  if [ -d $_svnmod/.svn ]; then
+    cd $_svnmod
+    svn up -r $pkgver
+  else
+    svn co $_svntrunk --config-dir . -r $pkgver $_svnmod
+  fi
+  msg "SVN checkout done or server timeout"
+
+  cp -r $_svnmod $_svnmod-build
+  cd $_svnmod-build
+
+  msg "Building the package..."
+  CFLAGS="$CFLAGS -fomit-frame-pointer"
+  ./configure --prefix=/usr --confdir=/etc/mplayer --disable-gui \
+    --enable-runtime-cpudetection --enable-largefiles --enable-menu \
+    --disable-x264 --enable-mencoder --disable-directfb \
+    --disable-libdv --disable-aa --disable-liblzo --disable-speex \
+    --disable-fribidi --disable-arts --disable-smb --disable-dvdnav \
+    --disable-openal --disable-faad-internal --disable-jack \
+    --disable-musepack --disable-libamr_nb --disable-libamr_wb --enable-lirc
+    --disable-lircc --disable-x264 --disable-x264-lavc --enable-vdpau 
+
+  make || return 1
+  make DESTDIR=$pkgdir install || return 1
+
+  install -m0644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer
+  install -d $pkgdir/usr/share/mplayer/
+  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf
+
+  msg "Cleaning build files..."
+  rm -rf $srcdir/$_svnmod-build
+
+}
diff --git a/abs/core-testing/mplayer/PKGBUILD b/abs/core-testing/mplayer/PKGBUILD
deleted file mode 100644
index f36ac94..0000000
--- a/abs/core-testing/mplayer/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Maintainer: catwell <catwell@archlinux.us>
-# Contributor: Army <uli[dot]armbruster[at]gmail[dot].com>
-
-pkgname=mplayer-nogui-svn
-pkgver=29037
-pkgrel=1
-pkgdesc="Famous multimedia player, dev. version, without its GUI"
-arch=('i686' 'x86_64')
-url="http://www.mplayerhq.hu/"
-license=('GPL')
-depends=('ttf-dejavu')
-makedepends=('subversion')
-conflicts=('mplayer')
-provides=('mplayer')
-source=()
-md5sums=()
-
-_svnmod="mplayer"
-_svntrunk=svn://svn.mplayerhq.hu/mplayer/trunk/
-
-build() {
-
-  cd $srcdir
-  if [ -d $_svnmod/.svn ]; then
-    cd $_svnmod
-    svn up -r $pkgver
-  else
-    svn co $_svntrunk --config-dir . -r $pkgver $_svnmod
-  fi
-  msg "SVN checkout done or server timeout"
-
-  cp -r $_svnmod $_svnmod-build
-  cd $_svnmod-build
-
-  msg "Building the package..."
-  CFLAGS="$CFLAGS -fomit-frame-pointer"
-  ./configure --prefix=/usr --confdir=/etc/mplayer --disable-gui \
-    --enable-runtime-cpudetection --enable-largefiles --enable-menu \
-    --disable-x264 --enable-mencoder --disable-directfb \
-    --disable-libdv --disable-aa --disable-liblzo --disable-speex \
-    --disable-fribidi --disable-arts --disable-smb --disable-dvdnav \
-    --disable-openal --disable-faad-internal --disable-jack \
-    --disable-musepack --disable-libamr_nb --disable-libamr_wb --enable-lirc
-    --disable-lircc --disable-x264 --disable-x264-lavc --enable-vdpau 
-
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-
-  install -m0644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer
-  install -d $pkgdir/usr/share/mplayer/
-  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf
-
-  msg "Cleaning build files..."
-  rm -rf $srcdir/$_svnmod-build
-
-}
-- 
cgit v0.12