Mon Jul 11 23:12:58 UTC 2011

6 files changed, 65 insertions, 30 deletions

diff --git a/community/dwm/PKGBUILD b/community/dwm/PKGBUILD
index 5236301dc..ba034ff76 100644
--- a/community/dwm/PKGBUILD
+++ b/community/dwm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 45679 2011-04-27 08:57:46Z spupykin $
+# $Id: PKGBUILD 51492 2011-07-10 19:48:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Dag Odenhall <dag.odenhall@gmail.com>
 # Contributor: Grigorios Bouzakis <grbzks@gmail.com>
 
 pkgname=dwm
-pkgver=5.8.2
-pkgrel=2
+pkgver=5.9
+pkgrel=1
 pkgdesc="A dynamic window manager for X"
 url="http://dwm.suckless.org"
 arch=('i686' 'x86_64')
@@ -16,24 +16,24 @@ install=dwm.install
 source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz
 	config.h
 	dwm.desktop)
-md5sums=('f0b422bfeaa812d66c6dd15c3cc92a6b'
+md5sums=('2799f885c05817ca112d521bb247f797'
          'f0ba59bf77a53e3a2fc8596740ee5cb8'
          '939f403a71b6e85261d09fc3412269ee')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
   cp $srcdir/config.h config.h
-
   sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
   sed -i 's/^CFLAGS = -g/#CFLAGS += -g/g' config.mk
   sed -i 's/^#CFLAGS = -std/CFLAGS += -std/g' config.mk
   sed -i 's/^LDFLAGS = -g/#LDFLAGS += -g/g' config.mk
   sed -i 's/^#LDFLAGS = -s/LDFLAGS += -s/g' config.mk
-
   make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
-  make PREFIX=/usr DESTDIR=$pkgdir install
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make PREFIX=/usr DESTDIR=$pkgdir install
   install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
   install -m644 -D README $pkgdir/usr/share/doc/$pkgname/README
   install -m644 -D $srcdir/dwm.desktop $pkgdir//etc/X11/sessions/dwm.desktop
diff --git a/community/kaudiocreator/PKGBUILD b/community/kaudiocreator/PKGBUILD
index 7ec7e79ce..7f19b59f5 100644
--- a/community/kaudiocreator/PKGBUILD
+++ b/community/kaudiocreator/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 24995 2010-08-30 09:56:37Z andrea $
+# $Id: PKGBUILD 51505 2011-07-10 22:05:47Z lcarlier $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=kaudiocreator
-pkgver=1.2.90
+pkgver=1.2.95
 pkgrel=1
 pkgdesc="A program for ripping and encoding Audio-CDs, encoding files from disk"
 arch=('i686' 'x86_64')
@@ -13,12 +13,14 @@ depends=('kdemultimedia-kioslave' 'taglib' 'libdiscid')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://www.kde-apps.org/CONTENT/content-files/107645-${pkgname}-${pkgver}.tar.bz2")
-md5sums=('3d86f19700ace837093a134876314862')
+md5sums=('5449607bb940b7b9522f5c47c6149f99')
 
 build() {
   cd ${srcdir}
+
   mkdir build
   cd build
+
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
@@ -27,5 +29,6 @@ build() {
 
 package() {
   cd ${srcdir}/build
+
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD
index 20af83ec8..b10a7dde9 100644
--- a/community/puzzles/PKGBUILD
+++ b/community/puzzles/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 pkgname=puzzles
-pkgver=9168
+pkgver=9179
 pkgrel=1
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('MIT')
 makedepends=('pkgconfig')
 depends=('gtk2')
 source=("http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-r${pkgver}.tar.gz")
-md5sums=('15ec7483b579bd61edd972e81f3902b9')
+md5sums=('f724413049ff2a3cc00799793190b1d0')
 
 build() {
 	cd ${srcdir}/${pkgname}-r${pkgver}
diff --git a/community/scilab/PKGBUILD b/community/scilab/PKGBUILD
index 563d44f1d..a1996a774 100644
--- a/community/scilab/PKGBUILD
+++ b/community/scilab/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=scilab
 pkgver=5.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Scilab is a scientific software package for numerical computations.'
 arch=('i686' 'x86_64')
 url='http://www.scilab.org/'
@@ -14,30 +14,32 @@ depends=('libxml2' 'pcre' 'lapack' 'java-batik' 'java-flexdock>=0.5.2'
   'ocaml' 'javahelp2' 'jgraphx=1_4_1_0' 'jlatexmath>=0.9.4' 
   'jlatexmath-fop>=0.9.4' 'junit' 'java-skinlf' 'xalan-java' 
   'java-commons-logging' 'hdf5')
-makedepends=('apache-ant' 'antlr2')
+makedepends=('apache-ant' 'antlr2' 'gcc-fortran' 'java-avalon-framework' 'xorg-fonts-type1')
 [[ $CARCH == x86_64 ]] && \
   source=("http://www.scilab.org/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" \
   "http://www.scilab.org/download/5.3.1/prerequirements-scilab-5.3.1-x86_64-src.tar.gz" \
-  'scilab.desktop' 'classpath.xml')
+  'scilab.desktop' 'classpath.xml' 'configure-hdf5-vercheck.patch')
 
 [[ $CARCH == i686 ]] && \
   source=("http://www.scilab.org/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" \
   "http://www.scilab.org/download/5.3.1/prerequirements-scilab-5.3.1-src.tar.gz" \
-  'scilab.desktop' 'classpath.xml')
+  'scilab.desktop' 'classpath.xml' 'configure-hdf5-vercheck.patch')
 
 [[ $CARCH == x86_64 ]] && md5sums=('0002653e670efabb8faf9e6403367134'
          '7c9bda373d8dfd75a4f8227a08ced588'
          'ad6286f324891fe8b86c60e4012a36b7'
-         'efe6e8d06968ba5e1a3e5ab540a79667')
+         'efe6e8d06968ba5e1a3e5ab540a79667'
+	 '7bf1a2149521db9e1c9a2ed684f9ce52')
 [[ $CARCH == i686 ]] && md5sums=('0002653e670efabb8faf9e6403367134'
-         '7545859e4078d3b77436b7f322967f26'
+	 '7545859e4078d3b77436b7f322967f26'
          'ad6286f324891fe8b86c60e4012a36b7'
-         'efe6e8d06968ba5e1a3e5ab540a79667')
+         'efe6e8d06968ba5e1a3e5ab540a79667'
+         '7bf1a2149521db9e1c9a2ed684f9ce52')
 
 options=('!libtool' '!emptydirs')
 
 build() {
-  # we do not want thigs we already have in Arch Linux
+  # we do not want things we already have in Arch Linux
   cd ${pkgname}-${pkgver}/thirdparty
   rm  avalon* batik* commons-* flexdock* gluegen-rt* jeuclid* jgraphx* \
     jhall* jlatexmath* jogl* jrosetta* junit* looks-2.1.1.jar xalan* \
@@ -47,6 +49,9 @@ build() {
   # begin configuring and building
   cd ..
 
+  # dirty hack to remove non-working hdf5 version check from configure
+  patch -Np0 -i ${srcdir}/configure-hdf5-vercheck.patch
+
   ./configure \
     --prefix=/usr \
     --enable-build-localization \
@@ -56,7 +61,6 @@ build() {
     --with-fftw \
     --with-hdf5 \
     --with-gfortran  # Needed for 64 bits, don't hurt for 32 bits
-
   make all doc
 }
 
diff --git a/community/scilab/configure-hdf5-vercheck.patch b/community/scilab/configure-hdf5-vercheck.patch
new file mode 100644
index 000000000..0f1d875f3
--- /dev/null
+++ b/community/scilab/configure-hdf5-vercheck.patch
@@ -0,0 +1,24 @@
+--- configure.bak	2011-07-10 11:28:35.833136771 +0200
++++ configure	2011-07-10 11:28:45.023136232 +0200
+@@ -19495,21 +19495,6 @@
+ // #line 19495 "configure"
+ import ncsa.hdf.hdf5lib.H5;
+ 
+-public class conftest {
+-    public static void main(String[] argv) {
+-        String minVersion="1.8.4";
+-                            int[] vers = new int[3];
+-                try { H5.H5get_libversion(vers); }
+-                catch (Throwable ex) {System.exit(-1);}
+-                String ver = vers[0] + "."+ vers[1] +"."+vers[2];
+-
+-                            System.out.println(ver);
+-                                  if (minVersion.compareTo(ver) > 0) {
+-                                   System.exit(-1);
+-                                }
+-
+-    }
+-}
+ EOF
+ 
+     CLASSPATH=$ac_java_classpath
diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD
index cc857b27b..c2c1efe37 100644
--- a/community/tmux/PKGBUILD
+++ b/community/tmux/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 40748 2011-02-26 13:51:26Z spupykin $
+# $Id: PKGBUILD 51497 2011-07-10 19:49:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  TDY <tdy@gmx.com>
 # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
 
 pkgname=tmux
-pkgver=1.4
-pkgrel=3
+pkgver=1.5
+pkgrel=1
 pkgdesc="A terminal multiplexer"
 url="http://tmux.sourceforge.net/"
 arch=('i686' 'x86_64')
@@ -13,19 +13,23 @@ license=('BSD')
 depends=('ncurses' 'libevent')
 source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz
 	LICENSE)
-md5sums=('0bfc7dd9a5bab192406167589c716a21'
+md5sums=('3d4b683572af34e83bc8b183a8285263'
          '71601bc37fa44e4395580b321963018e')
 
 build() {
   cd "$srcdir/tmux-$pkgver"
-  ./configure
-  make PREFIX=/usr
-  make install PREFIX=/usr DESTDIR=$pkgdir
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/tmux-$pkgver"
+  make install DESTDIR=$pkgdir
   install -Dm644 examples/tmux.vim "$pkgdir/usr/share/vim/vimfiles/syntax/tmux.vim"
   install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/tmux/LICENSE"
   install -dm755 "$pkgdir/usr/share/tmux/"
   install -m644 examples/* "$pkgdir/usr/share/tmux/"
-  mv $pkgdir/usr/man $pkgdir/usr/share/
+#  mv $pkgdir/usr/man $pkgdir/usr/share/
   mkdir -p $pkgdir/etc/bash_completion.d/
   mv $pkgdir/usr/share/tmux/bash_completion_tmux.sh $pkgdir/etc/bash_completion.d/tmux
 }