Wed Jul 11 00:01:34 UTC 2012

14 files changed, 157 insertions, 108 deletions

diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index 5c81e9d9a..e18d678d8 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73273 2012-07-05 09:07:14Z spupykin $
+# $Id: PKGBUILD 73545 2012-07-09 12:52:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ejabberd
 pkgver=2.1.11
-pkgrel=2
+pkgrel=3
 pkgdesc="Jabber server written in Erlang"
 arch=('x86_64' 'i686')
 url="http://www.ejabberd.im/"
@@ -18,11 +18,10 @@ source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${
         "$pkgname")
 md5sums=('a70b040c4e7602f47718c8afe8780d50'
          'f97c8a96160f30e0aecc9526c12e6606'
-         '13c22f8f3b55e3933d531e652e4e7535')
+         '2338a6230ce5f9f60be6dddcfa39bc7e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver/src"
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --enable-pam --enable-odbc
   make
@@ -30,14 +29,10 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver/src"
-
   make DESTDIR="$pkgdir" install
   install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname"
-  install -d "$pkgdir/var/spool/$pkgname"
   install -d "$pkgdir/var/lib/$pkgname"
-  install -D -m0644 "$srcdir/$pkgname.logrotate" \
-    "$pkgdir/etc/logrotate.d/$pkgname"
-  sed -i 's|SPOOLDIR=/var/lib/ejabberd|SPOOLDIR=/var/spool/ejabberd|' $pkgdir/usr/sbin/ejabberdctl
+  install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
   chmod ug+r "$pkgdir/etc/$pkgname/"*
   rm -rf "$pkgdir/var/lock"
 }
diff --git a/community/ejabberd/ejabberd b/community/ejabberd/ejabberd
index 259d4db66..c73be811c 100644
--- a/community/ejabberd/ejabberd
+++ b/community/ejabberd/ejabberd
@@ -23,7 +23,7 @@ case "$1" in
     [ -f /var/run/ejabber.pid ] && rm -f /var/run/ejabber.pid
     PID=`get_pid`
     if [ -z "$PID" ]; then
-      su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/spool/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"'
+      su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"'
       if [ $? -gt 0 ]; then
         stat_fail
         exit 1
diff --git a/community/ejabberd/ejabberd.install b/community/ejabberd/ejabberd.install
index 9d17a911e..6e586229d 100644
--- a/community/ejabberd/ejabberd.install
+++ b/community/ejabberd/ejabberd.install
@@ -2,7 +2,6 @@ post_install() {
   groupadd -r jabber
   useradd -r -G jabber -d /var/lib/ejabberd ejabberd
   chown -R ejabberd.jabber /var/log/ejabberd
-  chown -R ejabberd.jabber /var/spool/ejabberd
   chown -R ejabberd.jabber /var/lib/ejabberd
   chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
   chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
@@ -11,11 +10,11 @@ post_install() {
 
 post_upgrade() {
   chown -R ejabberd.jabber /var/log/ejabberd
-  chown -R ejabberd.jabber /var/spool/ejabberd
   chown -R ejabberd.jabber /var/lib/ejabberd
   chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
   chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
   chmod 4750 /usr/lib/ejabberd/priv/bin/epam
+  echo ">> ejabberd looks into /var/lib/ejabberd for mnesia db now"
 }
 
 post_remove() {
diff --git a/community/gtkdatabox/PKGBUILD b/community/gtkdatabox/PKGBUILD
index 7aebf48bf..e5c8ed830 100644
--- a/community/gtkdatabox/PKGBUILD
+++ b/community/gtkdatabox/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 65594 2012-02-21 09:22:40Z spupykin $
+# $Id: PKGBUILD 73537 2012-07-09 10:13:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gtkdatabox
-pkgver=0.9.0.1
-pkgrel=3
+pkgver=0.9.1.3
+pkgrel=1
 pkgdesc="A widget for the Gtk+ library designed to display large amounts of numerical data"
 arch=(i686 x86_64)
 url="http://www.eudoxos.net/gtk/gtkdatabox"
 options=('!libtool')
 license=("LGPL")
 depends=('gtk2')
-source=(http://www.eudoxos.net/gtk/gtkdatabox/download/gtkdatabox-$pkgver.tar.gz)
-md5sums=('cb62ac3ab2ddafa6cb1bcd3a55a1cc88')
+#source=(http://www.eudoxos.net/gtk/gtkdatabox/download/gtkdatabox-$pkgver.tar.gz)
+source=(http://downloads.sourceforge.net/project/gtkdatabox/gtkdatabox/$pkgver/gtkdatabox-$pkgver.tar.gz)
+md5sums=('60a3eebd61a4ca36879d7e60d1aca727')
 
 build() {
   cd $srcdir/gtkdatabox-$pkgver
+  find -name 'Makefile*' -type f -exec sed -i 's#.*DISABLE_DEPRECATED\\#\\#' {} \;
   LDFLAGS=-lm ./configure --prefix=/usr
-  find -name Makefile -type f -exec sed -i 's#.*DISABLE_DEPRECATED\\#\\#' {} \;
   make
   make DESTDIR=$pkgdir install
 }
diff --git a/community/isomaster/PKGBUILD b/community/isomaster/PKGBUILD
index e8336f88c..44cacda89 100644
--- a/community/isomaster/PKGBUILD
+++ b/community/isomaster/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66615 2012-02-26 14:45:31Z lfleischer $
+# $Id: PKGBUILD 73565 2012-07-09 23:28:25Z ebelanger $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Mefju <mefju@o2.pl>
 
 pkgname=isomaster
-pkgver=1.3.8
-pkgrel=2
+pkgver=1.3.9
+pkgrel=1
 pkgdesc="CD image editor written in GTK2"
 arch=('i686' 'x86_64')
 url="http://littlesvr.ca/isomaster"
@@ -13,11 +13,14 @@ license=('GPL2')
 depends=('gtk2' 'desktop-file-utils')
 makedepends=('iniparser')
 install=isomaster.install
-source=("http://littlesvr.ca/isomaster/releases/$pkgname-$pkgver.tar.bz2")
-md5sums=('bd046989611ded72358ffdc61e46bcfb')
+source=("http://littlesvr.ca/isomaster/releases/$pkgname-$pkgver.tar.bz2"
+        isomaster-1.3.9-asneeded.patch)
+md5sums=('ba7b44303979fd193df04b8f5f7ce4f8'
+         '79ac690bd7edf69dfb53e9916fc1182d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -p0 -i ../isomaster-1.3.9-asneeded.patch
   make PREFIX=/usr
 }
 
diff --git a/community/isomaster/isomaster-1.3.9-asneeded.patch b/community/isomaster/isomaster-1.3.9-asneeded.patch
new file mode 100644
index 000000000..102f54db4
--- /dev/null
+++ b/community/isomaster/isomaster-1.3.9-asneeded.patch
@@ -0,0 +1,14 @@
+--- Makefile
++++ Makefile
+@@ -75,9 +75,9 @@
+ isomaster: $(OBJECTS) lib iniparser
+ 	@echo 'Linking isomaster'
+ ifndef USE_SYSTEM_INIPARSER
+-	@$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a -o isomaster
++	@$(CC) $(LDFLAGS) $(OBJECTS) -o isomaster bk/bk.a iniparser-2.17/libiniparser.a `pkg-config --libs gtk+-2.0` 
+ else
+-	@$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a -liniparser -o isomaster
++	@$(CC) $(LDFLAGS) $(OBJECTS) -o isomaster bk/bk.a -liniparser `pkg-config --libs gtk+-2.0`
+ endif
+ 
+ # static pattern rule
diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD
index 68b9e87b7..946bd220c 100644
--- a/community/klavaro/PKGBUILD
+++ b/community/klavaro/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 72725 2012-06-21 14:59:35Z stativ $
+# $Id: PKGBUILD 73539 2012-07-09 10:19:45Z spupykin $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=klavaro
 pkgver=1.9.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Free touch typing tutor program"
 arch=('i686' 'x86_64')
 url="http://klavaro.sourceforge.net/"
diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD
index 9aaa55a76..059802ff6 100644
--- a/community/leptonica/PKGBUILD
+++ b/community/leptonica/PKGBUILD
@@ -1,30 +1,20 @@
-# $Id: PKGBUILD 63638 2012-02-05 12:02:42Z ibiru $
+# $Id: PKGBUILD 73532 2012-07-09 08:57:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Christoph Drexler <chrdr at gmx dot at>
 
 pkgname=leptonica
-pkgver=1.68
-pkgrel=3
+pkgver=1.69
+pkgrel=1
 pkgdesc="Software that is broadly useful for image processing and image analysis applications"
 arch=('i686' 'x86_64')
 url="http://www.leptonica.com/"
 license=('custom')
-depends=('glibc')
-makedepends=('giflib' 'gnuplot' 'libjpeg' 'libpng' 'libtiff' 'zlib')
-# 'webp'
-optdepends=('giflib:  for supporting gif files'
-	    'gnuplot: gnuplot support'
-	    'libjpeg: for supporting jpeg files'
-	    'libpng:  for supporting png files'
-	    'libtiff: for supporting tiff files'
-	    'zlib:    for supporting compressed files')
-#	    'webp:    for supporting webp files'
+depends=('giflib' 'gnuplot' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
 source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz)
-md5sums=('5cd7092f9ff2ca7e3f3e73bfcd556403')
+md5sums=('d4085c302cbcab7f9af9d3d6f004ab22')
 
 build() {
   cd ${srcdir}/leptonica-${pkgver}
-  sed -i '1,1i#include <zlib.h>' src/pngio.c
   ./configure --prefix=/usr
   make
 }
diff --git a/community/lrzip/PKGBUILD b/community/lrzip/PKGBUILD
index ced3afecb..1b0f3cb5b 100644
--- a/community/lrzip/PKGBUILD
+++ b/community/lrzip/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68263 2012-03-20 22:36:38Z arodseth $
+# $Id: PKGBUILD 73561 2012-07-09 21:11:49Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: graysky <graysky AT archlinux DOT us>
 # Contributor: kastor@fobos.org.ar
 
 pkgname=lrzip
-pkgver=0.612
-pkgrel=3
+pkgver=0.613
+pkgrel=1
 pkgdesc="Multi-threaded compression using the rzip/lzma, lzo, and zpaq algorithms"
 url="http://lrzip.kolivas.org/"
 license=('GPL')
@@ -18,7 +18,7 @@ then
 fi
 options=('!libtool')
 source=("http://ck.kolivas.org/apps/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('2c309fb40766207f1deeb09e2431ae34db7e6d7a22d713c25efcc84ed8c52e97')
+sha256sums=('70dc55fbc4fe3d029c8edfc20f47f02d78c9c4c473201e6ec616febe9ce6b7eb')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/mingw32-pthreads/PKGBUILD b/community/mingw32-pthreads/PKGBUILD
index 48a1ca469..f34d87ddf 100644
--- a/community/mingw32-pthreads/PKGBUILD
+++ b/community/mingw32-pthreads/PKGBUILD
@@ -1,34 +1,33 @@
-# $Id: PKGBUILD 66225 2012-02-23 05:01:23Z spupykin $
+# $Id: PKGBUILD 73530 2012-07-09 08:46:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Marcel Schneider marcelATcoopmastersDOTde
 
 pkgname=mingw32-pthreads
-pkgver=2.8.0
-_pkgver=2-8-0
-pkgrel=3
+pkgver=2.9.1
+pkgrel=1
 arch=(i686 x86_64)
 pkgdesc="The POSIX 1003.1-2001 standard for writing multithreaded applications."
 license=(LGPL)
 makedepends=('mingw32-gcc-base' 'mingw32-runtime' 'mingw32-w32api')
 url="http://sourceware.org/pthreads-win32/"
 options=(!strip)
-source=(ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-$_pkgver-release.tar.gz)
-md5sums=('6d30c693233b1464ef8983fedd8ccb22')
+source=(ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-${pkgver//./-}-release.tar.gz)
+md5sums=('36ba827d6aa0fa9f9ae740a35626e2e3')
 
 build() {
-  cd $srcdir/pthreads-w32-$_pkgver-release
+  cd $srcdir/pthreads-w32-${pkgver//./-}-release
   make CROSS=i486-mingw32- clean GC
 }
 
 package() {
-  cd $srcdir/pthreads-w32-$_pkgver-release
+  cd $srcdir/pthreads-w32-${pkgver//./-}-release
   mkdir $pkgdir/usr
   mkdir $pkgdir/usr/i486-mingw32
   mkdir $pkgdir/usr/i486-mingw32/include
   mkdir $pkgdir/usr/i486-mingw32/lib
-  install $srcdir/pthreads-w32-$_pkgver-release/pthread.h $pkgdir/usr/i486-mingw32/include/pthread.h
-  install $srcdir/pthreads-w32-$_pkgver-release/sched.h $pkgdir/usr/i486-mingw32/include/sched.h
-  install $srcdir/pthreads-w32-$_pkgver-release/semaphore.h $pkgdir/usr/i486-mingw32/include/semaphore.h
-  install $srcdir/pthreads-w32-$_pkgver-release/libpthreadGC2.a $pkgdir/usr/i486-mingw32/lib/libpthread.a
-  install $srcdir/pthreads-w32-$_pkgver-release/pthreadGC2.dll $pkgdir/usr/i486-mingw32/lib/
+  install $srcdir/pthreads-w32-${pkgver//./-}-release/pthread.h $pkgdir/usr/i486-mingw32/include/pthread.h
+  install $srcdir/pthreads-w32-${pkgver//./-}-release/sched.h $pkgdir/usr/i486-mingw32/include/sched.h
+  install $srcdir/pthreads-w32-${pkgver//./-}-release/semaphore.h $pkgdir/usr/i486-mingw32/include/semaphore.h
+  install $srcdir/pthreads-w32-${pkgver//./-}-release/libpthreadGC2.a $pkgdir/usr/i486-mingw32/lib/libpthread.a
+  install $srcdir/pthreads-w32-${pkgver//./-}-release/pthreadGC2.dll $pkgdir/usr/i486-mingw32/lib/
 }
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index d2a3c9ee6..dd36f4206 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70495 2012-05-09 17:17:28Z spupykin $
+# $Id: PKGBUILD 73526 2012-07-09 06:06:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -7,12 +7,12 @@
 
 pkgname=minidlna
 pkgver=1.0.24
-pkgrel=4
+pkgrel=5
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/minidlna/"
 license=('GPL')
-depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite')
+depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg-compat' 'sqlite')
 conflicts=('minidlna-cvs')
 backup=('etc/minidlna.conf'
 	'etc/conf.d/minidlna')
@@ -20,14 +20,17 @@ changelog=changelog
 source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz
 	minidlna.rc
 	minidlna.conf
-	minidlna.service)
+	minidlna.service
+	ffmpeg-compat.patch)
 md5sums=('be9b4c91e3fcde592dc3f9828098ca0f'
          'c9863d5703e0a8469cc200f2739567e7'
          'af1b8c0fef9902f797b0324c255da5a1'
-         '1903ed9ceee43b8bb86146b9ad8eb50c')
+         '1903ed9ceee43b8bb86146b9ad8eb50c'
+         '310d66170f20d660e96f4c9709559ed1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 <$srcdir/ffmpeg-compat.patch
   sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh
   make
 }
diff --git a/community/minidlna/ffmpeg-compat.patch b/community/minidlna/ffmpeg-compat.patch
new file mode 100644
index 000000000..aa6f982e5
--- /dev/null
+++ b/community/minidlna/ffmpeg-compat.patch
@@ -0,0 +1,50 @@
+diff -wbBur minidlna-1.0.24/genconfig.sh minidlna-1.0.24.my/genconfig.sh
+--- minidlna-1.0.24/genconfig.sh	2012-01-21 04:34:13.000000000 +0400
++++ minidlna-1.0.24.my/genconfig.sh	2012-07-09 09:51:09.000000000 +0400
+@@ -47,15 +47,15 @@
+ [ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"
+ [ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"
+ [ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"
+-[ ! -e "/usr/include/ffmpeg/avutil.h" -a \
++[ ! -e "/usr/include/ffmpeg-compat/avutil.h" -a \
+   ! -e "/usr/include/libavutil/avutil.h" -a \
+-  ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"
+-[ ! -e "/usr/include/ffmpeg/avformat.h" -a \
++  ! -e "/usr/include/ffmpeg-compat/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"
++[ ! -e "/usr/include/ffmpeg-compat/avformat.h" -a \
+   ! -e "/usr/include/libavformat/avformat.h" -a \
+-  ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"
+-[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \
++  ! -e "/usr/include/ffmpeg-compat/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"
++[ ! -e "/usr/include/ffmpeg-compat/avcodec.h" -a \
+   ! -e "/usr/include/libavcodec/avcodec.h" -a \
+-  ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"
++  ! -e "/usr/include/ffmpeg-compat/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"
+ if [ -n "$MISSING" ]; then
+ 	echo -e "\nERROR!  Cannot continue."
+ 	echo -e "The following required libraries are either missing, or are missing development headers:\n"
+diff -wbBur minidlna-1.0.24/Makefile minidlna-1.0.24.my/Makefile
+--- minidlna-1.0.24/Makefile	2012-01-18 02:49:01.000000000 +0400
++++ minidlna-1.0.24.my/Makefile	2012-07-09 10:01:10.000000000 +0400
+@@ -13,9 +13,9 @@
+ #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
+ #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
+ CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
+-	 -I/usr/include/ffmpeg \
+-	 -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
+-	 -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
++	 -I/usr/include/ffmpeg-compat \
++	 -I/usr/include/ffmpeg-compat/libavutil -I/usr/include/ffmpeg-compat/libavcodec -I/usr/include/ffmpeg-compat/libavformat
++LDFLAGS+= -L/usr/lib/ffmpeg-compat -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat
+ #STATIC_LINKING: CFLAGS += -DSTATIC
+ #STATIC_LINKING: LDFLAGS = -static
+ CC = gcc
+@@ -64,7 +64,7 @@
+ 	$(INSTALL) -d $(ETCINSTALLDIR)
+ 	$(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
+ 
+-minidlna:	$(BASEOBJS) $(LNXOBJS) $(LIBS)
++minidlna:	$(BASEOBJS) $(LNXOBJS)
+ 	@echo Linking $@
+ 	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
+ 
diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD
index 04e329e46..2db56161a 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 71903 2012-06-03 06:00:07Z bisson $
+# $Id: PKGBUILD 73541 2012-07-09 11:23:02Z bisson $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=nsd
-pkgver=3.2.10
-pkgrel=2
+pkgver=3.2.11
+pkgrel=1
 pkgdesc='Authoritative only, high performance and simple DNS server'
 url='http://www.nlnetlabs.nl/nsd/'
 license=('BSD')
@@ -14,7 +14,7 @@ makedepends=('flex')
 arch=('i686' 'x86_64')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'service')
-sha1sums=('04657cffe5087d97213b245f8281296cac86b868'
+sha1sums=('4b8b9293fd13b0fba2a2bff9fd11940e0d8d7448'
           'e560876628a30f11f9abbee4abcaa1f51cf449a6')
 
 install=install
diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD
index c228c1ca5..25305e8f8 100644
--- a/community/tesseract/PKGBUILD
+++ b/community/tesseract/PKGBUILD
@@ -1,52 +1,29 @@
-# $Id: PKGBUILD 59081 2011-11-21 09:28:09Z spupykin $
+# $Id: PKGBUILD 73535 2012-07-09 09:16:10Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Hauser <andy-aur@splashground.de>
 
-pkgname=tesseract
+# chinese requires two files
+_langs=(ind swe ron slv srp tgl tur hun fin ita nld jpn vie spa ukr fra slk
+kor ell rus por bul lav lit pol dan-frak deu dan ces cat eng chi_tra chi_sim)
+
+pkgbase=tesseract
+pkgname=(tesseract $(for l in ${_langs[@]}; do echo tesseract-data-${l}; done))
 pkgver=3.01
-pkgrel=1
+pkgrel=2
 pkgdesc="An OCR programm"
-arch=(x86_64 i686)
+arch=(i686 x86_64)
 url="http://code.google.com/p/tesseract-ocr"
 license=("APACHE")
 depends=(libpng libtiff libjpeg zlib giflib gcc-libs leptonica)
 source=(http://tesseract-ocr.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        http://tesseract-ocr.googlecode.com/files/chi_tra.traineddata.gz
         http://tesseract-ocr.googlecode.com/files/chi_sim.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/ind.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/swe.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/ron.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/slv.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/srp.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/tgl.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/tur.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/hun.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/fin.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/ita.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/nld.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/jpn.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/vie.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/spa.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/ukr.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/fra.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/slk.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/kor.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/ell.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/rus.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/por.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/bul.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/lav.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/lit.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/pol.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/dan-frak.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/deu.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/dan.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/ces.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/cat.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/eng.traineddata.gz)
+        http://tesseract-ocr.googlecode.com/files/chi_tra.traineddata.gz
+        $(for l in ${_langs[@]}; do
+        echo http://tesseract-ocr.googlecode.com/files/${l}.traineddata.gz
+        done))
 md5sums=('1ba496e51a42358fb9d3ffe781b2d20a'
-         '06fce5f5c0221286eab591819406d91e'
          '127e0b742b615d81c3b97a555acd8285'
+         '06fce5f5c0221286eab591819406d91e'
          'f4ae2e5668f693cc51c6e3c3f57a8f1d'
          '3787ff0fc1a07517203466830f6f868e'
          '7b50075692e7a07ac8f59e0cde51cfb9'
@@ -77,19 +54,37 @@ md5sums=('1ba496e51a42358fb9d3ffe781b2d20a'
          '7aaeb321dbf069d14d2601dc36d3dddc'
          '2e97c952075064834f1cad6a133970fa'
          '308099b2b95834916ec410191c86cd48'
-         'd91041ad156cf2db36664e91ef799451')
+         'd91041ad156cf2db36664e91ef799451'
+         '06fce5f5c0221286eab591819406d91e'
+         '127e0b742b615d81c3b97a555acd8285')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  [ -f Makefile.in ] || automake
+  sed -i '1,1i#include <unistd.h>' viewer/svutil.cpp
+  [ -f Makefile.in ] || { aclocal && automake; }
   [ -f Makefile ] || ./configure --prefix=/usr
   make
 }
 
-package() {
+package_tesseract() {
   cd $srcdir/$pkgname-$pkgver
+
   make DESTDIR=$pkgdir install
+
   mkdir -p $pkgdir/usr/share/tessdata
-  cp $srcdir/*.traineddata $pkgdir/usr/share/tessdata/
-  find $pkgdir/usr/share/tessdata -type f -exec chmod 0644 {} \;
 }
+
+# Declare the package functions for data
+for l in ${_langs[@]}; do
+    eval "
+package_tesseract-data-${l}(){
+    pkgdesc=\"Tesseract OCR data ($l)\"
+    depends=('tesseract')
+    groups=('tesseract-data')
+
+    mkdir -p \$pkgdir/usr/share/tessdata
+    cp \$srcdir/${l}.traineddata \$pkgdir/usr/share/tessdata/
+    find \$pkgdir/usr/share/tessdata -type f -exec chmod 0644 {} \;
+}
+    "
+done