Wed Nov 23 23:15:26 UTC 2011

1 files changed, 55 insertions, 54 deletions

diff --git a/community/tuxguitar/PKGBUILD b/community/tuxguitar/PKGBUILD
index fc9c018b9..c5f297b2c 100644
--- a/community/tuxguitar/PKGBUILD
+++ b/community/tuxguitar/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 6777 2009-12-21 17:50:48Z spupykin $
+# $Id: PKGBUILD 59148 2011-11-21 12:35:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: |AhIoRoS| < ahioros@gmail.com >
 
 pkgname=tuxguitar
 pkgver=1.2
 pkgrel=4
+_jdk=java-7-openjdk
 pkgdesc="multitrack guitar tablature editor and player"
 arch=('i686' 'x86_64')
 #url="http://www.herac.com.ar/contenidos/tuxguitar.html"
 url="http://sourceforge.net/projects/tuxguitar"
 license=('LGPL')
 depends=('java-runtime' 'swt' 'alsa-lib')
-makedepends=('unzip' 'zip' 'apache-ant' 'jack-audio-connection-kit' 'fluidsynth')
+makedepends=('unzip' 'zip' 'apache-ant' 'jack' 'fluidsynth' 'java-environment')
+optdepends=('fluidsynth')
 install=tuxguitar.install
 source=(tuxguitar-src-$pkgver.tar.gz::http://sourceforge.net/projects/tuxguitar/files/TuxGuitar/TuxGuitar-$pkgver/tuxguitar-src-$pkgver.tar.gz/download
-	tuxguitar.desktop \
+	tuxguitar.desktop
 	tuxguitar.xml)
 md5sums=('f41ed20e77c6c3d8968991a29c71b912'
          'eea5247daa70ce6fc15e95b1080af486'
@@ -22,80 +24,80 @@ md5sums=('f41ed20e77c6c3d8968991a29c71b912'
 
 build() {
   cd $srcdir/tuxguitar-src-$pkgver
-  mkdir -p $pkgdir/usr/share/tuxguitar && \
+  mkdir -p $pkgdir/usr/share/tuxguitar
   mkdir -p $pkgdir/usr/bin
 
   export CLASSPATH=/usr/share/java/swt.jar:$CLASSPATH
 
-  (cd TuxGuitar/ && ant) || return 1
-  (cd TuxGuitar-alsa/ && ant) || return 1
-  (cd TuxGuitar-fluidsynth/ && ant) || return 1
-  (cd TuxGuitar-jack/ && ant) || return 1
-  (cd TuxGuitar-oss/ && ant) || return 1
-  (cd TuxGuitar-compat/ && ant) || return 1
-  (cd TuxGuitar-gtp/ && ant) || return 1
-  (cd TuxGuitar-ptb/ && ant) || return 1
-  (cd TuxGuitar-tef/ && ant) || return 1
-  (cd TuxGuitar-midi/ && ant) || return 1
-  (cd TuxGuitar-lilypond/ && ant) || return 1
-  (cd TuxGuitar-musicxml/ && ant) || return 1
-  (cd TuxGuitar-ascii/ && ant) || return 1
-  (cd TuxGuitar-converter/ && ant) || return 1
-  (cd TuxGuitar-tray/ && ant) || return 1
-  (cd TuxGuitar-community/ && ant) || return 1
-  (cd TuxGuitar-gervill/ && ant) || return 1
-  (cd TuxGuitar-jsa/ && ant) || return 1
+  (cd TuxGuitar/ && ant)
+  (cd TuxGuitar-alsa/ && ant)
+  (cd TuxGuitar-fluidsynth/ && ant)
+  (cd TuxGuitar-jack/ && ant)
+  (cd TuxGuitar-oss/ && ant)
+  (cd TuxGuitar-compat/ && ant)
+  (cd TuxGuitar-gtp/ && ant)
+  (cd TuxGuitar-ptb/ && ant)
+  (cd TuxGuitar-tef/ && ant)
+  (cd TuxGuitar-midi/ && ant)
+  (cd TuxGuitar-lilypond/ && ant)
+  (cd TuxGuitar-musicxml/ && ant)
+  (cd TuxGuitar-ascii/ && ant)
+  (cd TuxGuitar-converter/ && ant)
+  (cd TuxGuitar-tray/ && ant)
+  (cd TuxGuitar-community/ && ant)
+  (cd TuxGuitar-gervill/ && ant)
+  (cd TuxGuitar-jsa/ && ant)
 
-  cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/ && \
-  find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \; && \
-  mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/ && \
-  cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/ || return 1
+  cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/
+  find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \;
+  mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/
+  cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/
 
   # alsa
   pushd TuxGuitar-alsa/jni
-  gcc -I/usr/lib/jvm/java-6-openjdk/include -I/usr/lib/jvm/java-6-openjdk/include/linux -fPIC \
+  gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \
 	-c -o org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o \
-	org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c && \
-  gcc  -shared -o libtuxguitar-alsa-jni.so org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o -L/usr/lib -lasound && \
-  install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so && \
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib && \
-  ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so || return 1
+	org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c
+  gcc  -shared -o libtuxguitar-alsa-jni.so org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o -L/usr/lib -lasound
+  install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so
   popd
 
   # oss
   pushd TuxGuitar-oss/jni
-  gcc -I/usr/lib/jvm/java-6-openjdk/include -I/usr/lib/jvm/java-6-openjdk/include/linux -fPIC \
+  gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \
 	-c -o org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o \
-	org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c && \
-  gcc  -shared -o libtuxguitar-oss-jni.so org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o -L/usr/lib && \
-  install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so && \
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib && \
-  ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so || return 1
+	org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c
+  gcc  -shared -o libtuxguitar-oss-jni.so org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o -L/usr/lib
+  install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so
   popd
 
   # jack
   pushd TuxGuitar-jack/jni
-  gcc -I/usr/lib/jvm/java-6-openjdk/include -I/usr/lib/jvm/java-6-openjdk/include/linux -fPIC \
+  gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \
 	-c -o org_herac_tuxguitar_jack_JackClient.o \
-	org_herac_tuxguitar_jack_JackClient.c && \
-  gcc  -shared -o libtuxguitar-jack-jni.so org_herac_tuxguitar_jack_JackClient.o -L/usr/lib -ljack && \
-  install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so && \
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib && \
-  ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so || return 1
+	org_herac_tuxguitar_jack_JackClient.c
+  gcc  -shared -o libtuxguitar-jack-jni.so org_herac_tuxguitar_jack_JackClient.o -L/usr/lib -ljack
+  install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so
   popd
 
   # fluidsynth
   pushd TuxGuitar-fluidsynth/jni
-  gcc -I/usr/lib/jvm/java-6-openjdk/include -I/usr/lib/jvm/java-6-openjdk/include/linux -fPIC \
+  gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \
 	-c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o \
-	org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c && \
-  gcc  -shared -o libtuxguitar-fluidsynth-jni.so org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o -L/usr/lib -lfluidsynth && \
-  install -D -m0755 libtuxguitar-fluidsynth-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so && \
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib && \
-  ln -s /usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-fluidsynth-jni.so || return 1
+	org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
+  gcc  -shared -o libtuxguitar-fluidsynth-jni.so org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o -L/usr/lib -lfluidsynth
+  install -D -m0755 libtuxguitar-fluidsynth-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-fluidsynth-jni.so
   popd
 
-  cd $startdir/pkg/usr/bin
+  cd $pkgdir/usr/bin
   cat >tuxguitar << EOF
 #!/bin/sh
 export CLASSPATH=/usr/share/java/swt.jar:$CLASSPATH
@@ -104,8 +106,7 @@ cd /usr/share/$pkgname
 exec /usr/share/$pkgname/tuxguitar "\$1" "\$2" "\$3" "\$4" "\$5" "\$6" "\$7" "\$8" "\$9"
 EOF
 
-  chmod 755 tuxguitar && \
-  install -D -m0644 $srcdir/tuxguitar.xml $pkgdir/usr/share/mime/packages/tuxguitar.xml && \
+  chmod 755 tuxguitar
+  install -D -m0644 $srcdir/tuxguitar.xml $pkgdir/usr/share/mime/packages/tuxguitar.xml
   install -D -m0644 $srcdir/tuxguitar.desktop $pkgdir/usr/share/applications/tuxguitar.desktop
 }
-