adopted

1 files changed, 12 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 80f0c7cb185f..be24e28e8f15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,19 @@
+# Maintainer: Olaf Bauer <hydro@freenet.de>
 # Contributor: erm67
 
 pkgname=projectx-cvs
 pkgver=0.91.0.10.r20110331
-pkgrel=1
+pkgrel=2
 pkgdesc="DVB demux tool for repairing and analyzing different stream types"
 url="http://sourceforge.net/projects/project-x"
-arch=('i686' 'x86_64')
+arch=('any')
 license=('GPL')
-makedepends=('cvs' 'java-environment' 'apache-ant')
-depends=('java-environment' 'glibc' 'bash')
+makedepends=('cvs' 'java-environment')
+depends=('java-environment' 'bash')
 provides=('projectx')
 conflicts=('projectx')
-source=(projectx
-	http://sourceforge.net/p/project-x/patches/_discuss/thread/9f638374/33d2/attachment/pjxgcc.tar.bz2)
-md5sums=('d2c2582e21fae4a7c99ce26589800eab'
-         'bb3e5d77a9ccc7a3fc86f9243d82c624')
-noextract=('pjxgcc.tar.bz2')
+source=(projectx)
+md5sums=('d2c2582e21fae4a7c99ce26589800eab')
 options=('!makeflags')
 
 _cvsroot=":pserver:anonymous@project-x.cvs.sourceforge.net:/cvsroot/project-x"
@@ -29,7 +27,7 @@ prepare() {
     cd $_cvsmod
     cvs -z3 update -d
   else
-    cvs -z3 -d $_cvsroot co -D $pkgver -f $_cvsmod
+    cvs -z3 -d $_cvsroot co -f $_cvsmod
     cd $_cvsmod
   fi
   cd ..
@@ -42,27 +40,17 @@ build() {
   
   cp -r ${srcdir}/$_cvsmod ${srcdir}/$_cvsmod-build
   cd ${srcdir}/$_cvsmod-build
-  rm -r c_src
-  bsdtar -xjf ${srcdir}/pjxgcc.tar.bz2
 
-  mv htmls resources
-  mv ReadMe.txt resources
-  echo "CVS version "$pkgver >resources/ReleaseNotes.txt
   sed -i 's,^Exec=.*,Exec=projectx,' projectx.desktop
-  
-  ant
-  cd c_src/idct_gcc
-  find . -name "*.o" -exec rm {} \;
-  sed -i '5,28d' Makefile
 
-  CFLAGS+=" -fPIC -I/usr/lib/jvm/$(archlinux-java get)/include -I/usr/lib/jvm/$(archlinux-java get)/include/linux" make
+  chmod +x build.sh && ./build.sh
+
 }
+
 package() {
   cd ${srcdir}/$_cvsmod-build
   install -D -m0755 $srcdir/projectx $pkgdir/usr/bin/projectx
-  install -D -m0644 projectx.jar $pkgdir/usr/share/java/projectx/projectx.jar
-  install -D -m0644 lib/libidctgcc.so \
-          $pkgdir/usr/lib/projectx/libidctgcc.so
+  install -D -m0644 ProjectX.jar $pkgdir/usr/share/java/projectx/projectx.jar
   install -D -m0644 lib/commons-net-1.3.0.jar \
           $pkgdir/usr/share/java/projectx/lib/commons-net-1.3.0.jar
   install -D -m0644 lib/jakarta-oro-2.0.8.jar \