Sun Sep 11 23:14:33 UTC 2011

11 files changed, 104 insertions, 56 deletions

diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD
index 59b20c371..47dfc13a0 100644
--- a/community/aqbanking/PKGBUILD
+++ b/community/aqbanking/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 54691 2011-08-23 10:03:09Z spupykin $
+# $Id: PKGBUILD 55342 2011-09-10 08:52:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Moore <davidm@sjsoft.com>
 
 pkgname=aqbanking
-pkgver=5.0.14
+pkgver=5.0.15
+_dnrel=86
 pkgrel=1
 pkgdesc="A library for online banking and financial applications"
 arch=(i686 x86_64)
@@ -12,8 +13,8 @@ url="http://www.aquamaniac.de/aqbanking"
 license=('GPL')
 depends=('gwenhywfar' 'ktoblzcheck' 'libofx')
 options=('!makeflags' '!libtool')
-source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=85&file=01&dummy=aqbanking-$pkgver.tar.gz")
-md5sums=('c489bc8a8621d77653f09cae1ceb06e8')
+source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$pkgver.tar.gz")
+md5sums=('d7619785e50c2b9ca44b4ae8aa27aebc')
 
 build() {
   cd $srcdir/aqbanking-$pkgver
diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD
index e9fb17828..93fe2247a 100644
--- a/community/cherokee/PKGBUILD
+++ b/community/cherokee/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54590 2011-08-20 19:35:48Z foutrelis $
+# $Id: PKGBUILD 55378 2011-09-10 20:22:39Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=cherokee
-pkgver=1.2.98
-pkgrel=1
+pkgver=1.2.99
+pkgrel=2
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 arch=('i686' 'x86_64')
 url="http://www.cherokee-project.com/"
@@ -25,7 +25,7 @@ options=('!libtool')
 source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz
         cherokee.rc
         cherokee.logrotate)
-md5sums=('21b01e7d45c0e82ecc0c4257a9c27feb'
+md5sums=('c83115c3eebb29e6f2b4cc6fe699affe'
          'a2d2b69c6220fab57cda4f531b680f9f'
          '8d69341bd4002bffd69c6e82ff6c905f')
 
@@ -63,9 +63,11 @@ package() {
   chown -R http:http "$pkgdir/var/lib/$pkgname/graphs"
 
   # Use Python 2
-  sed -i 's/env python$/\02/' \
+  sed -i 's/env python$/&2/' \
     "$pkgdir/usr/share/cherokee/admin/"{server,upgrade_config}.py \
     "$pkgdir/usr/bin/"{CTK-run,cherokee-{admin-launcher,tweak}}
+  sed -i -r "s/['\"]python/&2/g" \
+    "$pkgdir/usr/share/cherokee/admin/wizards/django.py"
 
   # Compile Python scripts
   python2 -m compileall "$pkgdir"
diff --git a/community/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD
index 890b45679..3b7fec8d2 100644
--- a/community/gmerlin-avdecoder/PKGBUILD
+++ b/community/gmerlin-avdecoder/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 43369 2011-03-25 11:34:14Z mherych $
+# $Id: PKGBUILD 55358 2011-09-10 10:55:52Z pschmitz $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=gmerlin-avdecoder
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Media decoding library"
 arch=('i686' 'x86_64')
 url="http://gmerlin.sourceforge.net/avdec_frame.html"
@@ -17,6 +17,10 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
   rm -f cpuinfo.sh
   ./configure --prefix=/usr --without-doxygen
-  make || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD
index 69717e2bc..a38817828 100644
--- a/community/gpac/PKGBUILD
+++ b/community/gpac/PKGBUILD
@@ -5,18 +5,20 @@
 
 pkgname=gpac
 pkgver=0.4.5
-pkgrel=7
+pkgrel=8
 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
 arch=('i686' 'x86_64')
 url="http://gpac.sourceforge.net"
-depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'js' 'libmad' \
+depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'libmad'
          'faad2' 'xvidcore' 'ffmpeg' 'freeglut')
+# 'js'
 license=('LGPL')
 options=('!makeflags') # Multiple build jobs aren't handled correctly
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        libpng14-infopp-null.patch)
+        libpng14-infopp-null.patch openjpeg14.patch)
 md5sums=('755e8c438a48ebdb13525dd491f5b0d1'
-         '14d6483c9eb84434aea68596f243e0ca')
+         '14d6483c9eb84434aea68596f243e0ca'
+         '1605fc11bd49b9c8220820bb38912021')
 
 build() {
 	cd ${srcdir}/${pkgname}
@@ -29,13 +31,14 @@ build() {
 	#FS#14506
 	sed -i 's#lib64#lib#g' configure
 	patch -Np1 -i ${srcdir}/libpng14-infopp-null.patch
+	patch -Np1 -i ${srcdir}/openjpeg14.patch
 	
 	# Was getting "symbol lookup error: /usr/lib/gpac/gm_x11_out.so: undefined
 	# symbol: XvQueryExtension" with our LDFLAGS :\
-	unset LDFLAGS
+	export LDFLAGS=${LDFLAGS/,--as-needed/}
 	
 	./configure --prefix=/usr --mandir=/usr/share/man --use-js=no
-	make 
+	make
 }
 
 package() {
diff --git a/community/gpac/openjpeg14.patch b/community/gpac/openjpeg14.patch
new file mode 100644
index 000000000..68a625eeb
--- /dev/null
+++ b/community/gpac/openjpeg14.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/show_bug.cgi?id=361359
+
+Index: gpac/modules/img_in/jp2_dec.c
+===================================================================
+--- gpac.orig/modules/img_in/jp2_dec.c
++++ gpac/modules/img_in/jp2_dec.c
+@@ -340,9 +340,16 @@ static GF_Err JP2_ProcessData(GF_MediaDe
+ 	return GF_OK;
+ }
+ 
++char opj_version_buffer[500];
++
+ static const char *JP2_GetCodecName(GF_BaseDecoder *dec)
+ {
++#ifndef OPENJPEG_VERSION
++	snprintf(opj_version_buffer, sizeof(opj_version_buffer), "OpenJPEG %s", opj_version());
++	return opj_version_buffer;
++#else
+ 	return "OpenJPEG "OPENJPEG_VERSION ;
++#endif
+ }
+ 
+ 
diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD
index 770c55e33..bebd0c820 100644
--- a/community/mtpaint/PKGBUILD
+++ b/community/mtpaint/PKGBUILD
@@ -1,10 +1,12 @@
-# $Id: PKGBUILD 9274 2010-01-24 22:45:51Z foutrelis $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
+# $Id: PKGBUILD 55362 2011-09-10 10:56:06Z pschmitz $
+# Maintainer:
+# Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: yosh64 <yosh64.at.gmail.dot.com>
 
+
 pkgname=mtpaint
 pkgver=3.31
-pkgrel=4
+pkgrel=5
 pkgdesc="A simple GTK2 painting program designed for creating icons and pixel based artwork."
 arch=('i686' 'x86_64')
 url="http://mtpaint.sourceforge.net"
@@ -16,10 +18,15 @@ md5sums=('fbe34eb25f96b6092403115f1f6ab387'
          'f84245ae1e26bd734740306b09024bb8')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+	cd ${srcdir}/${pkgname}-${pkgver}
+
+	patch -Np1 -i ${srcdir}/libpng14.patch
+	./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff
+	make
+}
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
 
-  patch -Np1 -i "$srcdir/libpng14.patch" || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff
-  make || return 1
-  make DESTDIR=$pkgdir install
+	make DESTDIR=${pkgdir} install
 }
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index 3fefacf7e..3f5a016fd 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -1,10 +1,11 @@
+# $Id: PKGBUILD 55364 2011-09-10 10:56:13Z pschmitz $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Pierre-Paul Paquin <pierrepaulpaquin@gmail.com>
 # Contributor: xduugu (.desktop and install files)
 
 pkgname=mupdf
-pkgver=0.8.165
+pkgver=0.9
 pkgrel=1
 pkgdesc="lightweight PDF viewer and toolkit written in portable C"
 arch=('i686' 'x86_64')
@@ -13,7 +14,7 @@ license=('GPL3')
 depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext')
 install=mupdf.install
 source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz")
-md5sums=('a95813737924e60d87a944d52b6a5120')
+md5sums=('76640ee16a797a27fe49cc0eaa87ce3a')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index b1e9f37ac..71929e1d7 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54922 2011-08-28 11:38:33Z giovanni $
+# $Id: PKGBUILD 55381 2011-09-10 23:32:12Z dreisner $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
 pkgver=1.7.4
-pkgrel=2
+pkgrel=3
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64')
 url="https://alioth.debian.org/projects/pcsclite/"
@@ -15,7 +15,7 @@ options=('!libtool' '!docs')
 source=(https://alioth.debian.org/frs/download.php/3598/pcsc-lite-${pkgver}.tar.bz2
         pcscd)
 md5sums=('1caf0b8ca2ecbf82fe3b035b3fff22dd'
-         '80d90388e4d2a551cb7aefe3bd5147bd')
+         'c97b6bce695222efb0f003d8e8369010')
 
 build() {
   cd "${srcdir}/pcsc-lite-${pkgver}"
diff --git a/community/pcsclite/pcscd b/community/pcsclite/pcscd
index 93f869fd2..1dc5e0166 100644
--- a/community/pcsclite/pcscd
+++ b/community/pcsclite/pcscd
@@ -6,7 +6,7 @@
 DAEMON=/usr/sbin/pcscd
 NAME=pcscd
 DESC="PC/SC smart card daemon"
-PID_FILE=/var/run/pcscd/pcscd.pid 
+PID_FILE=/run/pcscd/pcscd.pid
 PCSCD_OPTIONS=
 
 case "$1" in
diff --git a/community/preload/PKGBUILD b/community/preload/PKGBUILD
index e5457727c..f3c9a1c18 100644
--- a/community/preload/PKGBUILD
+++ b/community/preload/PKGBUILD
@@ -1,38 +1,47 @@
+# $Id: PKGBUILD 55344 2011-09-10 09:19:46Z andrea $
+# Maintainer:
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=preload
 pkgver=0.6.4
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc="Makes applications run faster by prefetching binaries and shared objects"
 url="http://sourceforge.net/projects/preload"
 license=('GPL2')
+depends=('glib2' 'bash')
 makedepends=('help2man' 'pkgconfig')
-depends=('glib2')
 backup=('etc/preload.conf')
 options=('!makeflags')
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz \
+source=("http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz"
         rc.preload)
 md5sums=('10786287b55afd3a2b433b4f898809f4'
          'bde0dd7867c77e7c4d10b481b5cddcd3')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --localstatedir=/var
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  cd "${srcdir}"/$pkgname-$pkgver
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --mandir=/usr/share/man \
+    --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
   
-  install -D -m755 ../rc.preload $startdir/pkg/etc/rc.d/preload
-  rm -rf $startdir/pkg/etc/rc.d/init.d
+  install -D -m755 "${srcdir}"/rc.preload "${pkgdir}"/etc/rc.d/preload
+  rm -rf "${pkgdir}"/etc/rc.d/init.d
 
-  rm -rf $startdir/pkg/var/lib/preload/preload.state
-  rm -rf $startdir/pkg/var/log/preload.log
+  rm -rf "${pkgdir}"/var/lib/preload/preload.state
+  rm -rf "${pkgdir}"/var/log/preload.log
 
-  mkdir $startdir/pkg/etc/conf.d
-  mv $startdir/pkg/etc/sysconfig/* $startdir/pkg/etc/conf.d
-  rm -rf $startdir/pkg/etc/sysconfig
+  install -d "${pkgdir}"/etc/conf.d
+  mv "${pkgdir}"/etc/sysconfig/* "${pkgdir}"/etc/conf.d
+  rm -rf "${pkgdir}"/etc/sysconfig
 
-  sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' $startdir/pkg/etc/preload.conf
+  sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' "${pkgdir}"/etc/preload.conf
 }
diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD
index 0bc108944..452f60d96 100644
--- a/community/znc/PKGBUILD
+++ b/community/znc/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 47765 2011-05-25 13:51:21Z tdziedzic $
+# $Id: PKGBUILD 55376 2011-09-10 20:15:39Z dreisner $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mickael9 <mickael9 at gmail dot com>
 
 pkgname=znc
-pkgver=0.098
-pkgrel=3
+pkgver=0.200
+pkgrel=1
 pkgdesc='An IRC bouncer with modules & scripts support'
 url='http://en.znc.in/wiki/index.php/ZNC'
 license=('GPL2')
 arch=('i686' 'x86_64')
-
 depends=('c-ares' 'gcc-libs' 'openssl')
 makedepends=('swig' 'tcl' 'python' 'perl' 'cyrus-sasl')
 optdepends=('tcl: modtcl module'
             'python: modpython module'
             'perl: modperl module'
             'cyrus-sasl: saslauth module')
-
 source=("http://znc.in/releases/znc-${pkgver}.tar.gz")
-md5sums=('5667b4acb1f01309d6eded77abac700c')
+md5sums=('da5b690bc31b007474a77aae70c9c049')
 
 build() {
-  cd znc-${pkgver}
+  cd "znc-$pkgver"
 
   ./configure --prefix=/usr \
     --enable-sasl \
@@ -34,7 +32,7 @@ build() {
 }
 
 package() {
-  cd znc-${pkgver}
+  cd "znc-$pkgver"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="$pkgdir" install
 }