upstream updates

Signed-off-by: Florian Pritz <bluewind@xssn.at>

14 files changed, 97 insertions, 104 deletions

diff --git a/0ad-svn/PKGBUILD b/0ad-svn/PKGBUILD
index 9036f74..1596105 100644
--- a/0ad-svn/PKGBUILD
+++ b/0ad-svn/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jakob "flocke" Nixdorf <flocke@user-helfen-usern.de>
 
 pkgname=0ad-svn
-pkgver=7093
+pkgver=7146
 pkgrel=1
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
diff --git a/PKGBUILD.proto b/PKGBUILD.proto
index e8660e4..6191efe 100644
--- a/PKGBUILD.proto
+++ b/PKGBUILD.proto
@@ -1,4 +1,4 @@
-# Contributor: Florian Pritz <f-p@gmx.at>
+# Contributor: Florian "Bluewind" Pritz <flo@xssn.at>
 pkgname=NAME
 pkgver=VERSION
 pkgrel=1
diff --git a/cdrtools/PKGBUILD b/cdrtools/PKGBUILD
index b6f6be8..5196fd1 100644
--- a/cdrtools/PKGBUILD
+++ b/cdrtools/PKGBUILD
@@ -1,7 +1,7 @@
 # Former contributor: Tuxbubling <tuxbubling@jabber.fr>, alejandronova
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=cdrtools
-pkgver=2.01.01a65
+pkgver=2.01.01a66
 pkgrel=1
 pkgdesc="Original cdrtools, supporting CD, DVD and BluRay burning"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ provides=('cdrkit')
 backup=('etc/default/cdrecord' 'etc/default/rscsi')
 install=cdrtools.install
 source=(ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.gz)
-md5sums=('04676436540b5860d751ace25358561a')
+md5sums=('b9d40bddf1ce75989d0a36b939f0c3fb')
          
 build() {
   cd "$srcdir"/cdrtools-${pkgver%%a*}
diff --git a/devtools-git/PKGBUILD b/devtools-git/PKGBUILD
index 4c4b9a1..ca19f60 100644
--- a/devtools-git/PKGBUILD
+++ b/devtools-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Evangelos Foutras <foutrelis@gmail.com>
 
 pkgname=devtools-git
-pkgver=20090826
+pkgver=20091018
 pkgrel=1
 pkgdesc="A few tools to help Arch Linux developers"
 arch=(i686 x86_64)
diff --git a/foo2zjs/PKGBUILD b/foo2zjs/PKGBUILD
index 43c0f94..55f4efb 100644
--- a/foo2zjs/PKGBUILD
+++ b/foo2zjs/PKGBUILD
@@ -1,31 +1,45 @@
-#Contributor: Stefan Lohmaier <noneus@noneus.de>
-#Contributor: hubert_star
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
 pkgname=foo2zjs
-pkgver=20090424
-pkgrel=1
+pkgver=20091017
+pkgrel=3
 pkgdesc="ZJStream Printer Drivers."
 url="http://foo2zjs.rkkda.com/"
-license="GPL"
-depends=(psutils cups foomatic-db-engine)
-makedepends=(wget unzip patch vim)
-arch=(i686 x86_64)
+license=('GPL' 'custom')
+depends=('psutils' 'cups' 'foomatic-db-engine')
+makedepends=('unzip')
+conflicts=('foomatic-db')
+optdepends=('tix: required by hplj10xx_gui.tcl')
+arch=('i686' 'x86_64')
+options=('!emptydirs')
 install=foo2zjs.install
-source=(makefile.patch)
-md5sums=('46042339057e6390c98236a9da8b01ee')
+source=(http://foo2zjs.rkkda.com/foo2zjs.tar.gz
+        foo2zjs-20091017-Makefile.patch
+        foo2zjs-20091017-udevfwld.patch)
+md5sums=('66413683916d4103d9bd1068b6fc2da6'
+         'b5584b05d86f5587fa9d635956dd40c6'
+         'd547a4f67d91f96a58ae2d565f54210e')
 
 build() {
-  cd "$srcdir"
-  rm -f $pkgname.tar.gz
-  wget "http://foo2zjs.rkkda.com/$pkgname.tar.gz"
-  tar xfz $pkgname.tar.gz
-  cd $pkgname
-  patch -Np1 < ../makefile.patch || return 1
+  cd "${srcdir}/${pkgname}"
+  patch -Np1 -i ${srcdir}/foo2zjs-20091017-Makefile.patch || return 1
+  patch -Np1 -i ${srcdir}/foo2zjs-20091017-udevfwld.patch || return 1
+  
   make || return 1
+
   ./getweb all || return 1
-  mkdir -p $pkgdir/usr/bin $pkgdir/etc/udev/rules.d $pkgdir/bin
-  mkdir -p $pkgdir/usr/share/{foomatic/db/source/opt,/cups/model}
-  make DESTDIR=$pkgdir install || return 1
-  make DESTDIR=$pkgdir install-hotplug || return 1
-  
-  chmod 755 $pkgdir/usr/share/{foo2oak/icm,foo2hp/icm,foo2zjs/crd,foo2zjs/firmware,foo2zjs/icm,foo2hiperc/icm,foo2lava/icm,foo2xqx/firmware,foo2qpdl/crd,foo2qpdl/icm,foo2slx/icm}
+
+  install -d ${pkgdir}/usr/share/{applications,pixmaps,cups/model}
+  install -d ${pkgdir}/usr/share/foomatic/db/source/{driver,opt,printer}
+
+  make DESTDIR=${pkgdir} install install-udev
+
+  install -m755 getweb ${pkgdir}/usr/bin
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+md5sums=('303d7849dcbfbe89d12b1cf30351500d'
+         'b5584b05d86f5587fa9d635956dd40c6'
+         'd547a4f67d91f96a58ae2d565f54210e')
+sha1sums=('dd9256ae008e16e7b0f9eddce787ff13fe82c1f6'
+          '2154a87f53fc0b9a899511fcf3ed88eb38757427'
+          '12eb107069b61ff2d702dcfacb033d8e251da057')
diff --git a/foo2zjs/foo2zjs.install b/foo2zjs/foo2zjs.install
index 284f90b..e7a45ec 100644
--- a/foo2zjs/foo2zjs.install
+++ b/foo2zjs/foo2zjs.install
@@ -1,48 +1,19 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
 post_install() {
   echo "-------------------------"
   echo "You need to restart cups."
   echo "-------------------------"
   echo
-  echo "You need to add your user to the group \"lp\"."
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
+  echo "You need to add your user to the lp group."
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
   echo "-------------------------"
   echo "You need to restart cups."
   echo "-------------------------"
-
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
 }
 
-# arg 1:  the old package version
 post_remove() {
   echo "-------------------------"
   echo "You need to restart cups."
   echo "-------------------------"
-
 }
-
-op=$1
-shift
-$op $*
diff --git a/inxi/PKGBUILD b/inxi/PKGBUILD
index 0f6a76f..3014b8f 100644
--- a/inxi/PKGBUILD
+++ b/inxi/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Florian Pritz <f-p@gmx.at>
 pkgname=inxi
-pkgver=1.2.2
+pkgver=1.2.5
 pkgrel=1
 pkgdesc="script to get system information"
 arch=('any')
diff --git a/mplayer-vdpau-nogui/PKGBUILD b/mplayer-vdpau-nogui/PKGBUILD
index 4772b27..f519722 100644
--- a/mplayer-vdpau-nogui/PKGBUILD
+++ b/mplayer-vdpau-nogui/PKGBUILD
@@ -1,7 +1,7 @@
 #Contributor: Reiser <metal@pop3.ru>
 
 pkgname=mplayer-vdpau-nogui
-pkgver=29583
+pkgver=29794
 pkgrel=1
 pkgdesc="Famous multimedia player, dev. version, without its GUI and support for nvidia VDPAU"
 arch=('i686' 'x86_64')
@@ -18,17 +18,29 @@ _svntrunk=svn://svn.mplayerhq.hu/mplayer/trunk
 _svnmod=mplayer-vdpau
 
 build() {
+
+		export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
+
 		cd $srcdir
 		svn co $_svntrunk $_svnmod
 		cp -R $_svnmod $_svnmod-build
 		cd $_svnmod-build
 		patch -p1 < ../no_segfault_configure.diff
 
+#     svn checkout svn://svn.ffmpeg.org/soc/wmapro wmapro 
+#     cp wmapro/wma* libavcodec 
+#     patch -p0 <wmapro/audioframesize.patch 
+#     patch -p0 <wmapro/mplayer.patch 
+#     patch -p0 <wmapro/wmapro_ffmpeg.patch 
+#  
+#     cp -v wmapro/wma3dec.c wmapro/wma3data.h wmapro/wma3.h libavcodec 
+    
     ./configure --prefix=/usr --confdir=/etc/mplayer --disable-gui \
-    --disable-runtime-cpudetection --enable-largefiles --enable-menu \
+    --enable-ossaudio --disable-alsa --disable-pulse --enable-pthreads \
+    --enable-runtime-cpudetection --enable-largefiles --enable-menu \
     --disable-libdv --disable-aa --disable-liblzo --disable-speex \
     --disable-fribidi --disable-arts --disable-esd --disable-smb --enable-dvdnav \
-    --disable-openal --disable-faad-internal --disable-jack --disable-directfb \
+    --disable-openal --disable-faad-internal --disable-directfb \
     --disable-musepack --enable-libopencore_amrnb --enable-libopencore_amrwb \
     --enable-vdpau --disable-libbs2b
 
diff --git a/mumble/PKGBUILD b/mumble/PKGBUILD
index 255364d..faa2b76 100644
--- a/mumble/PKGBUILD
+++ b/mumble/PKGBUILD
@@ -1,9 +1,12 @@
 # Contributor: Sebastian.Salich@gmx.de
 # Maintainer: Doc Angelo
 
+# If you want support for your G15 Keyboard, please add 'g15daemon'
+# to the depends and delete "no-g15" in the configure line below
+
 pkgname=mumble
 pkgver=1.1.8
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc="A voice chat application similar to TeamSpeak"
 license=('GPL')
@@ -18,24 +21,13 @@ source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz" \
 	mumble.install)
 md5sums=('a7da012922d39b87c45d9f481d4b5efb'
          'dfa125deb91aa1abdaee7b6295fb488e')
-# If you want support for your G15 Keyboard, please add 'g15daemon'
-# to the depends and delete "no-g15" in the configure line below
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  # workaround for wrong capitalization in translation files
-  mv ./src/mumble/mumble_qt.qrc ./src/mumble/mumble_qt.qrc.tmp
-  sed 's|qt_ja_jp.qm|qt_ja_JP.qm|g' ./src/mumble/mumble_qt.qrc.tmp > ./src/mumble/mumble_qt.qrc
-  rm ./src/mumble/mumble_qt.qrc.tmp
-  mv ./src/mumble/mumble.pro ./src/mumble/mumble.pro.tmp
-  sed 's|qt_ja_jp.qm|qt_ja_JP.qm|g' ./src/mumble/mumble.pro.tmp > ./src/mumble/mumble.pro
-  rm ./src/mumble/mumble.pro.tmp
-
-
   # Building mumble
   /usr/bin/qmake main.pro \
-    CONFIG+="no-bundled-speex no-speechd no-g15 no-xevie no-server" \
+    CONFIG+="no-bundled-speex no-speechd no-g15 no-xevie no-server no-embed-qt-translations" \
     DEFINES+="PLUGIN_PATH=/usr/lib/mumble/plugins" || exit 1
   make || exit 1
 
diff --git a/opencore-amr/PKGBUILD b/opencore-amr/PKGBUILD
index da36ced..755a7c8 100644
--- a/opencore-amr/PKGBUILD
+++ b/opencore-amr/PKGBUILD
@@ -1,37 +1,21 @@
 # Contributor: WAntilles <wantilles@adslgr.com>
-# Many thanks to the Gentoo guys.
 
 pkgname=opencore-amr
-pkgver=0.1.1
-pkgrel=2
+pkgver=0.1.2
+pkgrel=1
 pkgdesc="Open source implementation of the Adaptive Multi Rate (AMR) speech codec"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://opencore-amr.sourceforge.net/"
 depends=('glibc')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	opencore-amr-0.1.1-gentoo-pic.patch
-	opencore-amr-0.1.1-arch-paths.patch)
-md5sums=('d2e18436202fc14e03e5a254f8eb1df4'
-	 '8bf96678aaec5a6173185dd9608799d1'
-	 'd253da6c39b3c7455ed01afa1e1d300a')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('8e8b8b253eb046340ff7b6bf7a6ccd3e')
 
 build() {
-  cd ${srcdir}/${pkgname}
-
-  #Patch for -fPIC problem (graciously taken from Gentoo's e-build)
-  patch -Np2 -i "${srcdir}/opencore-amr-0.1.1-gentoo-pic.patch" || return 1
-
-  #Patch for correct Arch paths
-  patch -Np1 -i "${srcdir}/opencore-amr-0.1.1-arch-paths.patch" || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
 
+  ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR=${pkgdir}/ install || return 1
 }
 
-md5sums=('dcdc1b3a7f32668b196e861b0fa0e602'
-         '8bf96678aaec5a6173185dd9608799d1'
-         'd253da6c39b3c7455ed01afa1e1d300a')
-sha256sums=('eb17e4b99a37b66b85798551fb2036664e34f61fa06b2a9b5516d6216f5f007d'
-            '83cce71c7bac50781cca800fbd0a81f7fd1f52714b9bd7cad46b242cc79000fa'
-            '25f30aa53d3cc6a4fef2b3695c89cd399586eb5c741174bb371cb2084bfe55b5')
diff --git a/pacman-color/PKGBUILD b/pacman-color/PKGBUILD
index 03708b3..034bda5 100644
--- a/pacman-color/PKGBUILD
+++ b/pacman-color/PKGBUILD
@@ -1,12 +1,12 @@
 # Contributor: vogo <vojtech.gondzala@gmail.com>
 pkgname=pacman-color
-pkgver=3.3.1
+pkgver=3.3.2
 pkgrel=1
 pkgdesc="Command-line frontend for libalpm aka pacman with color patch"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
-depends=('pacman=3.3.1')
+depends=("pacman=$pkgver")
 makedepends=('patch')
 backup=('etc/pacman.d/color.conf')
 source=(ftp://ftp.archlinux.org/other/pacman/pacman-$pkgver.tar.gz
diff --git a/pydf/PKGBUILD b/pydf/PKGBUILD
new file mode 100644
index 0000000..c447605
--- /dev/null
+++ b/pydf/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer:  TDY <tdy@gmx.com>
+# Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com>
+
+pkgname=pydf
+pkgver=8
+pkgrel=1
+pkgdesc="A colorized df clone"
+arch=('i686' 'x86_64')
+url="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"
+license=('custom')
+depends=('python')
+backup=('etc/pydfrc')
+source=(http://kassiopeia.juls.savba.sk/~garabik/software/pydf/pydf_$pkgver.tar.gz)
+md5sums=('f1434d6d8c5291eda206c2d506e7792d')
+
+build() {
+  cd "$srcdir/pydf-$pkgver"
+  install -Dm755 pydf "$pkgdir/usr/bin/pydf"
+  install -Dm644 pydfrc "$pkgdir/etc/pydfrc"
+  install -Dm644 pydf.1 "$pkgdir/usr/share/man/man1/pydf.1"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/pydf/COPYING"
+}
diff --git a/tcc-git/PKGBUILD b/tcc-git/PKGBUILD
index da855f2..c1ce4a5 100644
--- a/tcc-git/PKGBUILD
+++ b/tcc-git/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=tcc-git
-pkgver=20090903
+pkgver=20091020
 pkgrel=1
 pkgdesc="Tiny C Compiler - small, simple, and fast single-pass C compiler"
 arch=('i686' 'x86_64')
diff --git a/tsung/PKGBUILD b/tsung/PKGBUILD
index f4e72e5..47858b9 100644
--- a/tsung/PKGBUILD
+++ b/tsung/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Florian Pritz <f-p@gmx.at>
 
 pkgname=tsung
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="Erlang-based open-source multi-protocol distributed load testing tool"
 arch=('i686' 'x86_64')
@@ -19,7 +19,5 @@ build() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('341852c8fd9731d0d31d9b7ab895985e')
-sha256sums=('122e3c51441e6fdd6f8d6463dae0aff911d706ef78989f8e7b19b2ec522ee208')
-md5sums=('341852c8fd9731d0d31d9b7ab895985e')
-sha256sums=('122e3c51441e6fdd6f8d6463dae0aff911d706ef78989f8e7b19b2ec522ee208')
+md5sums=('04484661643735262e625cac8fc3544d')
+sha1sums=('ac575f3a28b2a564868375efeed57b9ac4ddc2b5')