[arch-commits] Commit in timidity++/trunk (ChangeLog PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, December 16, 2008 @ 00:42:52
  Author: eric
Revision: 21750

upgpkg: timidity++ 2.13.2-8
    Rebuilt against xaw3d 1.5E, Added ChangeLog

Added:
  timidity++/trunk/ChangeLog
Modified:
  timidity++/trunk/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   52 +++++++++++++++++++++++-----------------------------
 2 files changed, 28 insertions(+), 29 deletions(-)

Added: ChangeLog
===================================================================
--- ChangeLog	                        (rev 0)
+++ ChangeLog	2008-12-16 05:42:52 UTC (rev 21750)
@@ -0,0 +1,5 @@
+2008-12-14  Eric Belanger  <eric at archlinux.org>
+
+	* timidity++ 2.13.2-8
+	* Rebuilt against xaw3d 1.5E
+	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-12-16 05:37:58 UTC (rev 21749)
+++ PKGBUILD	2008-12-16 05:42:52 UTC (rev 21750)
@@ -1,28 +1,24 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=timidity++
 pkgver=2.13.2
-pkgrel=7
+pkgrel=8
 pkgdesc="TiMidity is a MIDI to WAVE converter and player"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+url="http://timidity.sourceforge.net"
 license=('GPL')
 depends=('libao' 'libvorbis' 'jack-audio-connection-kit>=0.102.20-2' 'ncurses>=5.6-7')
 makedepends=('xaw3d' 'gtk2' 'tk' 'libxaw')
-source=(http://downloads.sourceforge.net/sourceforge/timidity/TiMidity++-${pkgver}.tar.gz
-	timidity.cfg
-        timidity++.sh
-	2.13.2-gcc4.patch
-	TiMidity++-2.13.2+flac-1.1.3.patch
-	timidity++-2.13.2-exiterror.patch
-	timidity++-2.13.2-gtk26.patch)
+backup=('etc/timidity++/timidity.cfg')
+source=(http://downloads.sourceforge.net/sourceforge/timidity/TiMidity++-${pkgver}.tar.gz \
+	timidity.cfg timidity++.sh 2.13.2-gcc4.patch TiMidity++-2.13.2+flac-1.1.3.patch \
+	timidity++-2.13.2-exiterror.patch timidity++-2.13.2-gtk26.patch)
 md5sums=('4a1644d1893437b372769cf331611e76' '3fcc8f065c959205113fa7e9ab2be3c6'\
          '35606c12af9c6be9361d64fc536f046f' '0868926c5290817cacb9a1849bc043c2'\
          'fcbd27ff83066f69a3f8bd2442a3b3e2' '31bdaea612f18e2c3d45a8a73ab44c81'\
          '16a4adec164836d4390dc6b0f9a69ce9')
-url="http://timidity.sourceforge.net"
-backup=('etc/timidity++/timidity.cfg')
 sha1sums=('8d1762aeda0ed765f2f49e5560a8700f490c1853'
 	  '660b3afbb720d26e8f008034cee66dd8da082d6e'
 	  '9f3e732a7ca1e97119a76df62ecf154df04d4f77'
@@ -32,24 +28,22 @@
 	  'ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4')
 
 build() {
-  cd ${startdir}/src/TiMidity++-${pkgver}
-  patch -Np1 -i ${startdir}/src/2.13.2-gcc4.patch || return 1
-  patch -Np1 -i ${startdir}/src/TiMidity++-2.13.2+flac-1.1.3.patch || return 1
-  patch -Np1 -i ${startdir}/src/timidity++-2.13.2-exiterror.patch || return 1
-  patch -Np0 -i ${startdir}/src/timidity++-2.13.2-gtk26.patch || return 1
-  autoconf
-  sed -i 's/tcl8.4/tcl8.5/' configure
-  sed -i 's/tk8.4/tk8.5/' configure
-  ./configure --prefix=/usr \
-	--with-default-path=/etc/timidity++/ \
-	--enable-server \
-	--enable-alsaseq \
-	--enable-spectrogram \
+  cd ${srcdir}/TiMidity++-${pkgver}
+  patch -p1 < ../2.13.2-gcc4.patch || return 1
+  patch -p1 < ../TiMidity++-2.13.2+flac-1.1.3.patch || return 1
+  patch -p1 < ../timidity++-2.13.2-exiterror.patch || return 1
+  patch -p0 < ../timidity++-2.13.2-gtk26.patch || return 1
+
+  autoconf || return 1
+  sed -i 's/tcl8.4/tcl8.5/' configure || return 1
+  sed -i 's/tk8.4/tk8.5/' configure || return 1
+  ./configure --prefix=/usr --with-default-path=/etc/timidity++/ \
+	--enable-server --enable-alsaseq --enable-spectrogram \
 	--enable-audio=alsa,oss,ao,vorbis,flac,esd,jack \
 	--enable-dynamic=ncurses,tcltk,vt100,xaw,gtk \
-	--disable-gtktest
+	--disable-gtktest || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  install -D -m644 ${startdir}/src/timidity.cfg ${startdir}/pkg/etc/timidity++/timidity.cfg
-  install -D -m755 ${startdir}/src/timidity++.sh ${startdir}/pkg/etc/rc.d/timidity++
+  make DESTDIR=${pkgdir} install || return 1
+  install -D -m644 ../timidity.cfg ${pkgdir}/etc/timidity++/timidity.cfg
+  install -D -m755 ../timidity++.sh ${pkgdir}/etc/rc.d/timidity++
 }