Tue Feb 7 23:15:14 UTC 2012

12 files changed, 339 insertions, 55 deletions

diff --git a/community/beye/PKGBUILD b/community/beye/PKGBUILD
index 80ec17860..2d4de199d 100644
--- a/community/beye/PKGBUILD
+++ b/community/beye/PKGBUILD
@@ -1,29 +1,48 @@
-# $Id: PKGBUILD 58672 2011-11-17 13:41:21Z spupykin $
+# $Id: PKGBUILD 63902 2012-02-06 17:16:05Z giovanni $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=beye
 pkgver=6.1.0
 _lver=610
-pkgrel=2
-pkgdesc="Binary viewer"
-arch=(i686 x86_64)
+pkgrel=4
+pkgdesc="A portable viewer of binary files, hexadecimal and disassembler modes"
+arch=('i686' 'x86_64')
 license=('GPL')
 depends=('slang' 'gpm')
+makedepends=('libx11')
 replaces=('biew')
 url="http://beye.sourceforge.net/"
-options=(zipman)
-source=(http://downloads.sourceforge.net/project/beye/biew/$pkgver/biew-${_lver}-src.tar.bz2)
-md5sums=('1b6477defaa61b8ca0f2ae1254978e94')
+source=("http://downloads.sourceforge.net/project/beye/biew/$pkgver/biew-${_lver}-src.tar.bz2"
+        'biew-610-fix_localedep-1.patch'
+        'biew-610-portable_configure-1.patch'
+        'biew-610-setup_window-1.patch')
+md5sums=('1b6477defaa61b8ca0f2ae1254978e94'
+         'f2d510cbeffadc4cc20e4bc4e7a08014'
+         '32e8bc2673db6566720c1ec6f9512fd6'
+         '93d7e300bd5fb85952891f220b12250a')
 
 build() {
   cd $srcdir/biew-${_lver}
-  CFLAGS="$CFLAGS -mmmx -msse" ./configure --prefix=/usr
-  make
+
+  patch -Np1 -i "${srcdir}/biew-610-fix_localedep-1.patch"
+  patch -Np1 -i "${srcdir}/biew-610-portable_configure-1.patch"
+
+  # Patch fixing a crash if MainWindow is not yet set
+  patch -Np1 -i "${srcdir}/biew-610-setup_window-1.patch"
+
+  sed -i -e "s:lib32:lib:g" configure
+  export CFLAGS="$CFLAGS -mmmx -msse"
+  ./configure --prefix=/usr
+
+  # Fix man pages path
+  sed -i -e 's^man/man1/biew.1^share/man/man1/biew.1^' makefile
+
+  make LDFLAGS="${LDFLAGS}"
 }
 
 package() {
   cd $srcdir/biew-${_lver}
+
   make DESTDIR=$pkgdir install
-  mv $pkgdir/usr/man $pkgdir/usr/share/
 }
diff --git a/community/beye/biew-610-fix_localedep-1.patch b/community/beye/biew-610-fix_localedep-1.patch
new file mode 100644
index 000000000..babe994e0
--- /dev/null
+++ b/community/beye/biew-610-fix_localedep-1.patch
@@ -0,0 +1,26 @@
+The configure script of biew-6.1.0 fails with
+    Checking for C compiler name ... gcc-Version
+if using the de_DE.UTF-8 locale and sys-devel/gcc-4.5.2. It may fail with other
+locales and/or compilers, too. The problem occurs due to the fact that the
+string “gcc version” written by gcc for ‘gcc -v’ is translated according to the
+language (German in the case mentioned above).
+
+This patch makes sure that the POSIX locale is used when the biew configure
+script checks for the name of the compiler. This allows the configure script to
+parse the output properly.
+
+ –nico
+
+
+diff -Naur biew-610.orig/configure biew-610/configure
+--- biew-610.orig/configure	2009-11-13 15:52:36.000000000 +0100
++++ biew-610/configure	2011-01-13 11:11:59.000000000 +0100
+@@ -497,7 +497,7 @@
+ 
+ _cdefos="-DDATADIR='\"$_datadir\"'"
+ 
+-cc_name=`$_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1`
++cc_name=`LC_ALL=POSIX $_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1`
+ cc_version=`$_cc -dumpversion`
+ 
+ echocheck "C compiler name"
diff --git a/community/beye/biew-610-portable_configure-1.patch b/community/beye/biew-610-portable_configure-1.patch
new file mode 100644
index 000000000..c64f6280b
--- /dev/null
+++ b/community/beye/biew-610-portable_configure-1.patch
@@ -0,0 +1,167 @@
+Changes the biew-610 configure script to use portable test constructs. See the
+Autoconf manual <URL:https://www.gnu.org/software/autoconf/manual/html_node/
+Limitations-of-Builtins.html#index-g_t_0040command_007btest_007d-1725> for
+explanations.
+
+ –nico
+
+
+diff -Naur biew-610.orig/configure biew-610/configure
+--- biew-610.orig/configure	2009-11-13 14:52:36.000000000 +0000
++++ biew-610/configure	2011-02-24 09:44:10.000000000 +0000
+@@ -171,7 +171,7 @@
+ # 1st: print out help
+ 
+ for parm in "$@" ; do
+-  if test "$parm" = "--help" || test "$parm" = "-help" || test "$parm" = "-h" ; then
++  if test "X$parm" = "X--help" || test "X$parm" = "X-help" || test "X$parm" = "X-h" ; then
+     cat << EOF
+ 
+ Usage: $0 [OPTIONS]...
+@@ -235,7 +235,7 @@
+ _cp=cp
+ _libext=a
+ _libprefix=lib
+-test "$CC" && _cc="$CC"
++test "X$CC" != X && _cc="$CC"
+ _prefix="/usr/local"
+ _datadir=
+ _libdir=
+@@ -340,11 +340,11 @@
+     ;;
+   esac
+ done
+-test -z "$_datadir" && _datadir=$_prefix"/share/biew"
+-test -z "$_libdir" && _libdir=$_prefix"/lib/biew"
++test "X$_datadir" = X && _datadir=$_prefix"/share/biew"
++test "X$_libdir" = X && _libdir=$_prefix"/lib/biew"
+ 
+ for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do
+-  test "$I" && break
++  test "X$I" != X && break
+ done
+ 
+ TMPLOG="config.log"
+@@ -357,8 +357,8 @@
+ _tee="tee -a $TMPLOG"
+ 
+ echocheck "architecture"
+-if test "$_target_arch" = auto ; then
+-  if test -z "$host_arch" ; then
++if test "X$_target_arch" = Xauto ; then
++  if test "X$host_arch" = X ; then
+   host_arch=`( uname -p ) 2>&1`
+   log "uname -p :" "$host_arch"
+   case "$host_arch" in
+@@ -416,8 +416,8 @@
+ x86_64  && _bitness=64
+ 
+ echocheck "target OS"
+-if test "$_target_system" = auto ; then
+-  if test -z "$system_name" ; then
++if test "X$_target_system" = Xauto ; then
++  if test "X$system_name" = X ; then
+     # OS name
+     system_name=`uname -s`
+     log "uname -s :" "$system_name"
+@@ -461,8 +461,8 @@
+   fi
+ fi
+ 
+-if test "$_target_system" = auto ; then
+-  if test -z "$system_name" ; then
++if test "X$_target_system" = Xauto ; then
++  if test "X$system_name" = X ; then
+     # OS name
+     system_name=`/bin/sh --version 2>&1 | sed -n 's/^.*\([(]\)./\1/p'`
+     log "/bin/sh --version:" "$system_name"
+@@ -549,7 +549,7 @@
+     ;;
+ esac
+ 
+-if test -z "$_x11incdir" ; then
++if test "X$_x11incdir" = X ; then
+ echocheck "X11 headers"
+   for I in /usr/include /usr/X11R6/include /usr/X11/include /usr/openwin/include ; do
+     if test -d "$I/X11" ; then
+@@ -559,11 +559,11 @@
+     fi
+   done
+ fi
+-if test -z "$_x11incdir" ; then
++if test "X$_x11incdir" = X ; then
+     echores "x11inc not found"
+ fi
+ 
+-if test -z "$_x11libdir" ; then
++if test "X$_x11libdir" = X ; then
+ echocheck "X11 libs"
+   for I in /usr/X11R6/lib /usr/X11/lib /usr/lib32 /usr/openwin/lib ; do
+     if test -d "$I" ; then
+@@ -573,24 +573,24 @@
+     fi
+   done
+ fi
+-if test -z "$_x11libdir" ; then
++if test "X$_x11libdir" = X ; then
+     echores "x11lib not found"
+ fi
+ 
+-test -z "$_debug" && _osldef="-s $_osldef" || _cdefos="-finline-limit-5 $_cdefos"
+-if test "$_profile" -o "$_debug" -o "$_gcov"; then
++test "X$_debug" = X && _osldef="-s $_osldef" || _cdefos="-finline-limit-5 $_cdefos"
++if test "X$_profile" != X || test "X$_debug" != X || test "X$_gcov" != X ; then
+   _cdefos="-W -Wall -O2 -fno-builtin $_debug $_profile $_gcov $_cdefos"
+   _osldef="$_debug $_profile $_osldef"
+-elif test -z "$CFLAGS" ; then
++elif test "X$CFLAGS" = X ; then
+     _cdefos="-DNDEBUG=1 -O2 -ffast-math -fomit-frame-pointer $_cdefos"
+     x86 && _cdefos="-mmmx -msse $_cdefos"
+ else
+     _cdefos="-DNDEBUG=1 $CFLAGS $_cdefos"
+ fi
+-test -n "$LDFLAGS" && _osldef="$LDFLAGS $_osldef"
+-test -n "$LIBS" && _osldef="$LIBS $_osldef"
++test "X$LDFLAGS" != X && _osldef="$LDFLAGS $_osldef"
++test "X$LIBS" != X && _osldef="$LIBS $_osldef"
+ 
+-if test "$_target_system" = dos ; then
++if test "X$_target_system" = Xdos ; then
+ # disable cc_check call for DJGPP due bugs in bash
+ _cdefos="-D__HAVE_PRAGMA_PACK__=1 $_cdefos"
+ else
+@@ -668,10 +668,10 @@
+ 	_curseslib=
+ 	disable _curses
+ 	cc_check -lcurses && _curseslib="-lcurses"
+-	if test -z "$_curseslib" ; then
++	if test "X$_curseslib" = X ; then
+ 	    cc_check -lncurses && _curseslib="-lncurses"
+ 	fi
+-	if test -n "$_curseslib" ; then
++	if test "X$_curseslib" != X ; then
+ 	    enable _curses
+ 	    _cdefos="-D_CURSES_ -D__OS_NAME__='\"Unix/Curses\"' $_cdefos"
+ 	    _oslibs="$_curseslib $_oslibs"
+@@ -711,10 +711,10 @@
+ enabled sys_resource_h && _cdefos="-DHAVE_SYS_RESOURCE=1 $_cdefos"
+ echores "$sys_resource_h"
+ 
+-if test -z "$_x11libdir" ; then
++if test "X$_x11libdir" = X ; then
+  _cdefos="$_cdefos"
+ else
+-  if test -z "$_x11incdir" ; then
++  if test "X$_x11incdir" = X ; then
+    _cdefos="$_cdefos"
+   else
+     _cdefos="-DHAVE_X11 $_cdefos"
+@@ -738,7 +738,7 @@
+ fi
+ 
+ # Checking for INSTALL
+-if test -z $_install
++if test "X$_install" = X
+ then
+     _install="install"
+     $_install --version 1>/dev/null 2>/dev/null || _install=""
diff --git a/community/beye/biew-610-setup_window-1.patch b/community/beye/biew-610-setup_window-1.patch
new file mode 100644
index 000000000..244f94a7a
--- /dev/null
+++ b/community/beye/biew-610-setup_window-1.patch
@@ -0,0 +1,28 @@
+If .biewrc does not exist, the setup dialog appears at program start. If you try
+to click a checkbox with the mouse, biew tries to dereference a null pointer
+(because the MainWindow is not yet set).
+
+This patch adds a workaround. Note that you actually cannot click a checkbox.
+But that is what users might expect. (Maybe the biew code should be changed to
+handle this properly.) Well, it is better not to crash, even if the checkboxes
+are not clickable.
+
+ –nico
+
+
+diff -Naur biew-610.orig/events.c biew-610/events.c
+--- biew-610.orig/events.c	2009-09-03 16:57:40.000000000 +0000
++++ biew-610/events.c	2011-09-06 09:41:01.000000000 +0000
+@@ -118,7 +118,11 @@
+                     }
+                     else
+                     {
+-                      X1 = 0; X2 = twGetClientWidth(MainWnd); Y1 = 1; Y2 = twGetClientHeight(MainWnd) - 1;
++                      TWindow *wnd =
++                              MainWnd ? MainWnd :  /*XXX:drop this line?*/
++                              twGetWinAtPos(mx, my);
++                      if(!wnd) return KE_MOUSE;
++                      X1 = 0; X2 = twGetClientWidth(wnd); Y1 = 1; Y2 = twGetClientHeight(wnd) - 1;
+                     }
+                     wdh = X2 - X1;
+                     hght = Y2 - Y1;
diff --git a/community/e3/PKGBUILD b/community/e3/PKGBUILD
new file mode 100644
index 000000000..b23534ff6
--- /dev/null
+++ b/community/e3/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 63897 2012-02-06 16:46:33Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Roberto Alsina <ralsina@kde.org>
+pkgname=e3
+pkgver=2.8
+pkgrel=2
+pkgdesc="Tiny text editor written in assembly, that doesn't depend on any libraries"
+arch=('x86_64' 'i686')
+url="http://sites.google.com/site/e3editor/"
+license=('GPL2')
+makedepends=('nasm')
+options=('!strip')
+source=("http://sites.google.com/site/e3editor/Home/$pkgname-$pkgver.tgz")
+sha256sums=('035737d0cc82b287386fdff8682b2c23ef620d7ef97dff7a1b1fe1777e4c4fb7')
+  
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  
+  sed -i 's:$(BINDIR)/e3 :e3 :' Makefile
+  make clean
+  if [ "$CARCH" == "i686" ]; then
+    make EXMODE=_ 32
+  else
+    make EXMODE=_ 64
+  fi
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make PREFIX="$pkgdir/usr" MANDIR="$pkgdir/usr/share/man/man1" install
+  install -Dm644 COPYING.GPL "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index 04eee157c..929cf8517 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63576 2012-02-05 11:57:26Z ibiru $
+# $Id: PKGBUILD 63866 2012-02-06 12:50:38Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 
 pkgbase=gambas3
@@ -13,7 +13,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
          'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
 pkgver=3.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net/"
diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index 034f10c36..b46eaf767 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 62878 2012-01-28 14:15:46Z ttopper $
+# $Id: PKGBUILD 63859 2012-02-06 10:27:05Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3-wm
 _pkgsourcename=i3
 pkgver=4.1.2
-pkgrel=1
+pkgrel=3
 pkgdesc="An improved dynamic tiling window manager"
 arch=('i686' 'x86_64')
 url="http://i3wm.org/"
diff --git a/community/ibus/PKGBUILD b/community/ibus/PKGBUILD
index 6071b1254..144c534fd 100644
--- a/community/ibus/PKGBUILD
+++ b/community/ibus/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 63348 2012-01-30 21:56:05Z ebelanger $
+# $Id: PKGBUILD 63863 2012-02-06 10:52:08Z ebelanger $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=ibus
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64')
 url="http://ibus.googlecode.com"
@@ -18,11 +18,12 @@ optdepends=('notification-daemon')
 options=('!libtool')
 install=ibus.install
 source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('b4f063794e89c71eb1f8cb543210da30')
+md5sums=('88ef7dda720cec2de92b8673832a702e')
 
 build() {
   cd ${pkgname}-${pkgver}
   export PYTHON=python2
+  sed -i 's|--pkg=ibus-1.0||' src/Makefile.in
   ./configure \
     --prefix=/usr \
     --libexecdir=/usr/lib/ibus \
diff --git a/community/imdbpy/PKGBUILD b/community/imdbpy/PKGBUILD
index 263a0a888..689bda8ff 100644
--- a/community/imdbpy/PKGBUILD
+++ b/community/imdbpy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 38352 2011-01-25 22:52:45Z schiv $
+# $Id: PKGBUILD 63916 2012-02-06 17:44:54Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
@@ -6,7 +6,7 @@
 
 pkgname=imdbpy
 _realname=IMDbPY
-pkgver=4.7
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Python bindings for the Internet Movie Database (IMDb)"
 url="http://imdbpy.sourceforge.net/"
@@ -14,9 +14,9 @@ arch=('i686' 'x86_64')
 license=('GPL')
 depends=('python2')
 makedepends=('python2-distribute')
-optdepends=('python-lxml' 'python2-sqlalchemy' 'python-sqlobject')
+optdepends=('python-lxml' 'python2-sqlalchemy' 'python2-sqlobject')
 source=(http://downloads.sourceforge.net/$pkgname/$_realname-$pkgver.tar.gz)
-md5sums=('4deaed7b55ba3098af5ac559da7dde1a')
+md5sums=('6644540206c5023cb332637089d5342d')
 
 build(){
   cd "$srcdir/$_realname-$pkgver"
@@ -30,8 +30,10 @@ build(){
   python2 setup.py install --root="$pkgdir" --optimize=1
 
   # fix paths
+  # WTH is upstream doing?
+  # TODO: report upstream about this nasty
   mv "$pkgdir/usr/etc" "$pkgdir"
-  install -d "$pkgdir/usr/share"
-  mv "$pkgdir/usr/imdb" "$pkgdir/usr/share"
-  mv "$pkgdir/usr/doc" "$pkgdir/usr/share/imdb/"
+  mkdir -p "$pkgdir/usr/share/doc"
+  #mv "$pkgdir/usr/imdb" "$pkgdir/usr/share"
+  mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc/imdb"
 }
diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD
index d575a5d51..4887297a5 100644
--- a/community/kadu/PKGBUILD
+++ b/community/kadu/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61079 2011-12-21 20:51:06Z andrea $
+# $Id: PKGBUILD 63896 2012-02-06 16:45:24Z tdziedzic $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Mateusz Herych
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 
 pkgname=kadu
-pkgver=0.10.1
-pkgrel=3
+pkgver=0.11.0
+pkgrel=1
 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
 arch=('i686' 'x86_64')
 url="http://www.kadu.net/"
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit')
 makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
 source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('6211a9a9e02d645268cbf055892601a0')
+md5sums=('480377508522fe088dd78452d06c5972')
 
 build() {
   cd "$srcdir"
diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD
index 77d6a7726..915feb40a 100755
--- a/community/mathomatic/PKGBUILD
+++ b/community/mathomatic/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60988 2011-12-20 10:07:46Z ttopper $
+# $Id: PKGBUILD 63855 2012-02-06 09:07:08Z ttopper $
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Maintainer:  Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=mathomatic
-pkgver=15.7.2
+pkgver=15.7.3
 pkgrel=1
 pkgdesc="General purpose Computer Algebra System written in C"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial'
             'm4: for complex operations using the matho script' 
             'gnuplot: for plotting')
 source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2)
-md5sums=('eb16844e2a4e06ba4f1fe6e2e278c47e')
+md5sums=('1d90afc833a8d11339aa2a51794a4871')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD
index 66697bd6d..64dc13d4b 100644
--- a/community/xmlrpc-c/PKGBUILD
+++ b/community/xmlrpc-c/PKGBUILD
@@ -1,40 +1,46 @@
-# $Id: PKGBUILD 61501 2012-01-02 03:26:41Z daenyth $
-# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com>
+# $Id: PKGBUILD 63853 2012-02-06 08:42:18Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Vitaliy Berdinskikh <skipper13@root.ua>
-
 pkgname=xmlrpc-c
-pkgver=2222
+pkgver=1.16.39
+epoch=1
 pkgrel=1
-pkgdesc='This library provides a modular implementation of XML-RPC for C and C++'
-arch=('i686' 'x86_64')
+pkgdesc='XML-RPC for C and C++'
+arch=('x86_64' 'i686')
 url='http://xmlrpc-c.sourceforge.net/'
-license=('custom:xmlrpc-c')
+license=('custom')
 depends=('curl' 'libxml2' 'gcc-libs' 'zlib')
-makedepends=('libtool')
+makedepends=('libtool' 'setconf')
 options=('!makeflags' '!libtool')
-source=("ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz")
-md5sums=('5822ea50f50fb86b5f211ec6bd820e5e')
+source=("http://sourceforge.net/projects/$pkgname/files/Xmlrpc-c%20Super%20Stable/$pkgver/$pkgname-$pkgver.tgz")
+sha256sums=('54adc6dae0af044fcbbfe97625f256f8afe7d7f0768ef82cef1f98d03c3fbb39')
 
 build() {
-	[ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
+  cd "$srcdir/$pkgname-$pkgver"
 
-	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr \
+  [ "$CARCH" != "i686" ] && export CFLAGS="$CFLAGS -fPIC"
+  ./configure --prefix=/usr \
     --mandir=/usr/share/man \
-		--enable-libxml2-backend \
-		--disable-cgi-server \
-		--disable-abyss-server \
-		--disable-libwww-client \
-		--disable-wininet-client
-
-	make CFLAGS_PERSONAL="${CFLAGS}"
+    --enable-libxml2-backend \
+    --disable-cgi-server \
+    --disable-abyss-server \
+    --disable-libwww-client \
+    --disable-wininet-client
+  mkdir include/curl
+  touch include/curl/types.h
+  make CFLAGS_PERSONAL="$CFLAGS"
 }
 
 package() {
-	cd $srcdir/$pkgname-$pkgver
-	make DESTDIR=$pkgdir install
+  cd "$srcdir/$pkgname-$pkgver"
 
-	install -m 644 -D doc/COPYING $pkgdir/usr/share/licenses/${pkgname}/LICENSE
+  make DESTDIR="$pkgdir" install
+  install -Dm644 doc/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  # Remove references to build directory
+  setconf "$pkgdir/usr/bin/xmlrpc-c-config" BLDDIR ""
+  setconf "$pkgdir/usr/bin/xmlrpc-c-config" ABS_SRCDIR ""
 }
+
 # vim:set ts=2 sw=2 et: