Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/moreutils/PKGBUILD
	core/iputils/PKGBUILD
	libre/texlive-bin-libre/PKGBUILD
	testing/openldap/PKGBUILD

23 files changed, 177 insertions, 84 deletions

diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD
index 0e48adec9..eb2b80368 100644
--- a/community/avr-gcc/PKGBUILD
+++ b/community/avr-gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72864 2012-06-24 08:07:58Z schuay $
+# $Id: PKGBUILD 72946 2012-06-25 12:14:03Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -9,7 +9,7 @@
 pkgname=avr-gcc
 _pkgname=gcc
 pkgver=4.7.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="The GNU AVR Compiler Collection"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'custom')
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index fc1930db8..f986423c6 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70477 2012-05-09 10:21:50Z tredaelli $
+# $Id: PKGBUILD 72962 2012-06-25 16:40:54Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: shahid <helllamer@gmail.com>
 
 pkgbase=bitcoin
 pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.6.2
-_commit=06d764e
+pkgver=0.6.3
+_commit=bbe1084
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.bitcoin.org/"
@@ -14,7 +14,7 @@ conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
 replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
 license=('MIT')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/bitcoin/$pkgbase/tarball/v$pkgver")
-sha256sums=('03c72d7bcdec70cb88033abb785b50686880b95d4768e8586891a9728d498c5a')
+sha256sums=('3f1a0df5d713c9e4f54f00a8f3f75c6828041afd826e16976b00229de0aecb70')
 
 build() {
   cd "$srcdir/bitcoin-$pkgbase-$_commit"
diff --git a/community/conntrack-tools/01-config-file-path.patch b/community/conntrack-tools/01-config-file-path.patch
index 8512cc9ab..9041ddbc4 100644
--- a/community/conntrack-tools/01-config-file-path.patch
+++ b/community/conntrack-tools/01-config-file-path.patch
@@ -6,6 +6,7 @@
  
 -#define DEFAULT_CONFIGFILE	"/etc/conntrackd/conntrackd.conf"
 +#define DEFAULT_CONFIGFILE	"/etc/conntrackd.conf"
- #define DEFAULT_LOCKFILE	"/var/lock/conntrackd.lock"
+-#define DEFAULT_LOCKFILE	"/var/lock/conntrackd.lock"
++#define DEFAULT_LOCKFILE	"/run/lock/conntrackd.lock"
  #define DEFAULT_LOGFILE		"/var/log/conntrackd.log"
  #define DEFAULT_STATS_LOGFILE	"/var/log/conntrackd-stats.log"
diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 541456cd8..9630101af 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72534 2012-06-16 14:02:03Z seblu $
+# $Id: PKGBUILD 72966 2012-06-25 17:24:52Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Valere Monseur <valere_monseur@hotmail.com>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=conntrack-tools
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
 arch=('i686' 'x86_64')
@@ -18,14 +18,12 @@ source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.b
         'conntrackd.rc'
         'conntrackd.conf'
         'conntrackd.service'
-        '01-config-file-path.patch'
-        '02-fix-compilation-of-timeout-extension.patch')
-md5sums=('8e20330d6ca3a3f23552aa900b1d467c'
+        '01-config-file-path.patch')
+md5sums=('48d414cb7a354001babf184ae6c16db9'
          '478fe76da0202fcb5249bf65968d1c26'
          'd3e73e81b54e3e8166d357d434680684'
          'bd135eaefb47923bb8e8d26f084d3e9d'
-         '411fc0eb97c02595aab69b14c26c1d00'
-         '0144021bbec4d5b496ddd86a7ff7a257')
+         'e71ff7b8c4997b797cab3eaaccb693f4')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD
index d12c5680b..b588ed08d 100644
--- a/community/denemo/PKGBUILD
+++ b/community/denemo/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 60150 2011-12-06 08:50:04Z spupykin $
+# $Id: PKGBUILD 72932 2012-06-25 10:29:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 # Contributor: Gnud <ach.gnud@gmail.com>
 
 pkgname=denemo
-pkgver=0.9.2
+pkgver=0.9.4
 pkgrel=1
 pkgdesc="A music score editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.denemo.org"
 license=('GPL')
-depends=('aubio' 'portaudio' 'lilypond' 'gtk2' 'libxml2' 'guile' 'fftw' 'gtksourceview2'
-	 'librsvg' 'fluidsynth' 'libsmf')
+depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'guile' 'fftw'
+	 'librsvg' 'fluidsynth' 'libsmf' 'evince' 'gtksourceview3' 'portmidi')
 options=('!libtool')
 backup=('etc/denemo/denemo.conf')
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6dbe944f45cf8818b199e831ac7a5e4f')
+md5sums=('25f141beedbb067aa361975935588862')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc
+  sed -i 's|#include <glib/gmessages.h>|#include <glib.h>|' src/pitchrecog.c
   make
   make DESTDIR=$pkgdir install
 }
diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD
index 3e33ace62..63dc8472c 100644
--- a/community/distcc/PKGBUILD
+++ b/community/distcc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 57046 2011-10-19 10:30:08Z spupykin $
+# $Id: PKGBUILD 72942 2012-06-25 11:01:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=distcc
 pkgver=3.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A distributed C, C++, Obj C compiler"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/distcc/"
@@ -49,5 +49,6 @@ package() {
   ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/cc
   ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/gcc
   ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/g++
+  ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/c++
   ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/cpp
 }
diff --git a/community/evas_generic_loaders-svn/PKGBUILD b/community/evas_generic_loaders-svn/PKGBUILD
index f8309be89..402a429f5 100644
--- a/community/evas_generic_loaders-svn/PKGBUILD
+++ b/community/evas_generic_loaders-svn/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72755 2012-06-22 09:43:40Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# $Id: PKGBUILD 72970 2012-06-25 18:51:00Z foutrelis $
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=evas_generic_loaders-svn
 pkgver=72171
-pkgrel=1
+pkgrel=2
 pkgdesc="Additional generic loaders for Evas"
 arch=('i686' 'x86_64')
 groups=('e17-libs-svn' 'e17-svn')
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index 7591abe02..ebe2a2b12 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 71272 2012-05-26 07:54:42Z pschmitz $
+# $Id: PKGBUILD 72971 2012-06-25 18:51:13Z foutrelis $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
          'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
 pkgver=2.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net"
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index bd23a6141..9d0e08c7d 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 71274 2012-05-26 07:54:52Z pschmitz $
+# $Id: PKGBUILD 72972 2012-06-25 18:51:23Z foutrelis $
 # 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.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
diff --git a/community/grafx2/PKGBUILD b/community/grafx2/PKGBUILD
index d7756ee14..bbd6c8d17 100644
--- a/community/grafx2/PKGBUILD
+++ b/community/grafx2/PKGBUILD
@@ -1,43 +1,43 @@
-# $Id: PKGBUILD 63612 2012-02-05 12:00:25Z ibiru $
+# $Id: PKGBUILD 72950 2012-06-25 12:33:19Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Simon Parzer <simon.parzer@gmail.com>
+
 pkgname=grafx2
 pkgver=2.3
-pkgrel=3
+pkgrel=2
 pkgdesc="Pixelart-oriented painting program"
 arch=('x86_64' 'i686')
 url="http://code.google.com/p/grafx2/"
 license=('GPL2')
 install=grafx2.install
 depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils')
-source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz"
-        "grafx2.desktop")
-md5sums=('916a35c4762e85b4210a1041fbbfd830'
-         '9b3ecb5c2d44b987d65257184f46e6c4')
+makedepends=('gendesk' 'setconf')
+options=('!emptydirs')
+source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz")
+sha256sums=('b43fa837e30abfb0830f9a1b793a78ed690fbafdcd378e51197f01998bbf392e')
+_name=('GrafX2')
+_exec=('grafx2 %U')
+_genericname=('Drawing program')
+_mimetype=('image/bmp;image/gif;image/png;image/x-tga;image/tiff')
 
 build() {
-  cd "$srcdir/$pkgname/src"
-
-  msg2 "Compiling..."
+  cd "$srcdir"
+  gendesk -n
+  setconf "$pkgname.desktop" Categories 'Graphics;2DGraphics;RasterGraphics'
+  cd "$pkgname/src"
   make
 }
 
 package() {
   cd "$srcdir/$pkgname/src"
 
-  msg2 "Packaging files..."
   make prefix="/usr" DESTDIR="$pkgdir" install
-  msg2 "Packaging shortcut..."
   install -Dm644 "$srcdir/$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
-  msg2 "Packaging documentation..."
   install -Dm644 "$srcdir/$pkgname/doc/README.txt" \
     "$pkgdir/usr/share/doc/$pkgname/readme.txt"
-  msg2 "Packaging license..."
   install -Dm644 "$srcdir/$pkgname/doc/gpl-2.0.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  msg2 "Cleaning up..."
-  rmdir "$pkgdir/usr/share/grafx2/scripts/libs"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/grafx2/grafx2.install b/community/grafx2/grafx2.install
index 12589796c..ef816a666 100644
--- a/community/grafx2/grafx2.install
+++ b/community/grafx2/grafx2.install
@@ -1,5 +1,3 @@
-pkgname=grafx2
-
 post_upgrade() {
   gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
   update-desktop-database -q
diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD
index 1c9ac43ec..e30fdc0a5 100644
--- a/community/gummi/PKGBUILD
+++ b/community/gummi/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68592 2012-03-28 22:12:45Z arodseth $
+# $Id: PKGBUILD 72952 2012-06-25 13:05:56Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Sergio A. Morales <sergiomorales@archlinux.cl>
 # Contributor: soeren <nonick@posteo.de>
 
 pkgname=gummi
-pkgver=0.6.3
+pkgver=0.6.4
 pkgrel=1
 pkgdesc='Simple LaTex editor for GTK users'
 arch=('x86_64' 'i686' 'mips64el')
@@ -15,7 +15,7 @@ depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib' 'desktop-file
 makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool')
 install=$pkgname.install
 source=("http://dev.midnightcoding.org/projects/$pkgname/latest.tar.gz")
-sha256sums=('d44196e56ed61e125bba01e5949be0928cf09919fdb80e62e6a41999a478f0ed')
+sha256sums=('ac5c1de476f8689040a185b01515544a5e53da45ff4e10a072b8944e9de8a6ff')
  
 build() {
   cd "$pkgname-$pkgver"
diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD
index bc99009fa..bc0323466 100644
--- a/community/libextractor/PKGBUILD
+++ b/community/libextractor/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71278 2012-05-26 07:55:04Z pschmitz $
+# $Id: PKGBUILD 72973 2012-06-25 18:51:29Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s@gmail.com>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libextractor
 pkgver=0.6.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A library used to extract meta-data from files of arbitrary type"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
diff --git a/community/libnetfilter_acct/PKGBUILD b/community/libnetfilter_acct/PKGBUILD
new file mode 100644
index 000000000..3f105d946
--- /dev/null
+++ b/community/libnetfilter_acct/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 71613 2012-05-31 08:51:38Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
+# Maintainer: Filip Wojciechowski, filip at loka dot pl
+
+pkgname=libnetfilter_acct
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="userspace library providing interface to extended accounting infrastructure"
+arch=('i686' 'x86_64')
+url="http://www.netfilter.org/projects/libnetfilter_acct/index.html"
+license=('GPL')
+depends=('libnfnetlink' 'libmnl')
+makedepends=('pkgconfig')
+options=('!libtool')
+source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
+md5sums=('246e97feb9cf98f7ddf70d71a3813336')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=$pkgdir install
+}
diff --git a/community/libnetfilter_log/PKGBUILD b/community/libnetfilter_log/PKGBUILD
new file mode 100644
index 000000000..37027d898
--- /dev/null
+++ b/community/libnetfilter_log/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 71613 2012-05-31 08:51:38Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
+# Maintainer: Filip Wojciechowski, filip at loka dot pl
+
+pkgname=libnetfilter_log
+pkgver=1.0.1
+pkgrel=1
+pkgdesc="userspace library providing interface to packets that have been logged by the kernel packet filter"
+arch=('i686' 'x86_64')
+url="http://www.netfilter.org/projects/libnetfilter_log/index.html"
+license=('GPL')
+depends=('libnfnetlink')
+makedepends=('pkgconfig')
+options=('!libtool')
+source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
+md5sums=('2a4bb0654ae675a52d2e8d1c06090b94')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=$pkgdir install
+}
diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD
index d0b4a9644..a67df55bf 100644
--- a/community/moreutils/PKGBUILD
+++ b/community/moreutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69438 2012-04-16 10:51:02Z spupykin $
+# $Id: PKGBUILD 72927 2012-06-25 09:00:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
@@ -7,7 +7,7 @@ pkgver=0.46
 pkgrel=1
 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://kitenet.net/~joey/code/moreutils.html"
+url="http://joeyh.name/code/moreutils/"
 license=('GPL')
 makedepends=('docbook2x' 'docbook-xml' 'perl-xml-sax')
 depends=('perl')
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index 38fa509ea..e079d256a 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70838 2012-05-17 15:56:46Z spupykin $
+# $Id: PKGBUILD 72940 2012-06-25 10:53:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
-pkgver=3.0.12
+pkgver=3.0.13
 pkgrel=1
-_pkgdlnr=76005
+_pkgdlnr=76249
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.modrails.com"
@@ -14,16 +14,13 @@ makedepends=('apache')
 install=passenger.install
 options=('!emptydirs')
 source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz
-	passenger-install-apache2-module.patch
 	build-fix-git-2012-05-17.diff)
-md5sums=('fedcf948a46b76e00ddd25527dac4b6d'
-         '3d04eba10c55a955c378678d5df8497f'
+md5sums=('1b3a65c77feee86e64891daae66c0c3d'
          'e2d3409bae3676232f411f03abac440c')
 
 build(){
   cd $srcdir/passenger-$pkgver
-#  patch bin/passenger-install-apache2-module <$srcdir/passenger-install-apache2-module.patch
-  patch -p1 <$srcdir/build-fix-git-2012-05-17.diff
+#  patch -p1 <$srcdir/build-fix-git-2012-05-17.diff
   ./bin/passenger-install-apache2-module -a
   rake nginx
 
diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD
index c526c5f7d..66e6000d1 100644
--- a/community/pdf2djvu/PKGBUILD
+++ b/community/pdf2djvu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71982 2012-06-04 19:27:21Z jelle $
+# $Id: PKGBUILD 72974 2012-06-25 18:51:32Z foutrelis $
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
 
 pkgname=pdf2djvu
 pkgver=0.7.13
-pkgrel=1
+pkgrel=2
 pkgdesc="Creates DjVu files from PDF files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pdf2djvu.googlecode.com"
diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD
index ecd49ef00..af904a78a 100644
--- a/community/polipo/PKGBUILD
+++ b/community/polipo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72884 2012-06-24 12:10:09Z ttopper $
+# $Id: PKGBUILD 72964 2012-06-25 17:08:53Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Jelle van der Waa <jelle vdwaa nl>
 # Contributor: Thomas Holmquist <thomas@vorget.com>
@@ -7,7 +7,7 @@
 
 pkgname=polipo
 pkgver=1.0.4.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A small and fast caching web proxy."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pps.jussieu.fr/~jch/software/polipo/"
@@ -50,6 +50,7 @@ package() {
   install -Dm 755  $srcdir/polipo.rc.d $pkgdir/etc/rc.d/polipo
   install -Dm 755  $srcdir/polipo.cron $pkgdir/usr/share/polipo/polipo.cron
   install -Dm 644  $srcdir/polipo.service $pkgdir/usr/lib/systemd/system/polipo.service
+  install -Dm 644  $srcdir/polipo.conf.d $pkgdir/etc/conf.d/polipo.conf
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/polipo/polipo.install b/community/polipo/polipo.install
index 9c1117321..bacc46377 100644
--- a/community/polipo/polipo.install
+++ b/community/polipo/polipo.install
@@ -7,8 +7,8 @@ post_install() {
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
   install -d /var/cache/polipo 2> /dev/null
-  touch /var/log/polipo 2> /dev/null
-  chown -R nobody:nobody /var/cache/polipo /var/log/polipo 2> /dev/null
+  touch /var/log/polipo.log 2> /dev/null
+  chown -R nobody:nobody /var/cache/polipo /var/log/polipo.log 2> /dev/null
 }
 
 post_upgrade() {
diff --git a/community/raptor1/PKGBUILD b/community/raptor1/PKGBUILD
new file mode 100644
index 000000000..0401aee5a
--- /dev/null
+++ b/community/raptor1/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 72968 2012-06-25 18:19:15Z andrea $
+# Maintainer:
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: eric <eric@archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+
+pkgname=raptor1
+pkgver=1.4.21
+pkgrel=4
+pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility"
+arch=('i686' 'x86_64')
+url="http://librdf.org/raptor"
+depends=('curl' 'libxslt')
+license=('LGPL')
+options=('!libtool' '!docs')
+source=("http://librdf.org/dist/source/raptor-$pkgver.tar.gz"
+        'curl.patch')
+md5sums=('992061488af7a9e2d933df6b694bb876'
+         '8fe28761645d6a6607b25c94f9ada964')
+
+build() {
+  cd "${srcdir}"/raptor-${pkgver}
+  patch -p1 -i "${srcdir}"/curl.patch
+
+  ./configure --prefix=/usr \
+    --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/raptor-${pkgver}"
+  make prefix="${pkgdir}"/usr install
+  
+  mv "${pkgdir}"/usr/bin/rapper "${pkgdir}"/usr/bin/rapperV1
+  rm -f "${pkgdir}"/usr/share/man/man1/rapper.1
+}
diff --git a/community/raptor1/curl.patch b/community/raptor1/curl.patch
new file mode 100644
index 000000000..590140536
--- /dev/null
+++ b/community/raptor1/curl.patch
@@ -0,0 +1,11 @@
+diff -up raptor-1.4.21/src/raptor_internal.h.curl raptor-1.4.21/src/raptor_internal.h
+--- raptor-1.4.21/src/raptor_internal.h.curl	2010-01-29 17:54:42.000000000 -0600
++++ raptor-1.4.21/src/raptor_internal.h	2011-07-31 11:02:44.182465296 -0500
+@@ -852,7 +852,6 @@ int raptor_utf8_is_nfc(const unsigned ch
+ 
+ #ifdef RAPTOR_WWW_LIBCURL
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+ 
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index b002d8e49..3ece04c8a 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,47 +1,48 @@
-# $Id: PKGBUILD 62776 2012-01-26 14:46:13Z spupykin $
+# $Id: PKGBUILD 72938 2012-06-25 10:44:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Sergej Pupykin <ps@lx-ltd.ru>
 
 pkgname=ulogd
-pkgver=1.24
-pkgrel=8
+pkgver=2.0.0
+pkgrel=1
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/ulogd/index.html'
 license=('GPL2')
-makedepends=('mysql' 'postgresql' 'sqlite3' 'libpcap')
+depends=('libmnl')
+makedepends=('libmysqlclient' 'postgresql-libs' 'sqlite' 'libpcap' 'libdbi'
+	     'libnetfilter_acct' 'libnetfilter_log' 'libnetfilter_conntrack')
 optdepends=('postgresql-libs'
-	    'sqlite3'
+	    'sqlite'
 	    'libpcap'
-	    'libmysqlclient')
+	    'libmysqlclient'
+	    'libdbi'
+	    'libnetfilter_acct'
+	    'libnetfilter_log'
+	    'libnetfilter_conntrack')
+options=('!libtool')
 backup=('etc/ulogd.conf')
 source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
 	'rc'
-	'logrotate'
-	'mac-addr.patch')
-md5sums=('05b4ed2926b9a22aaeaf642917bbf8ff'
+	'logrotate')
+md5sums=('211e68781e3860959606fc94b97cf22e'
          'c42230c1cabf5dd9b80bf9a0fd87ca7e'
-         'fe40b3073b7474a77e0b8b0bfd19ab63'
-         'ca41a10a9f230614cd15e2bb037e057d')
+         'fe40b3073b7474a77e0b8b0bfd19ab63')
 
 build() {
   cd $pkgname-$pkgver
-  export MAKEFLAGS="-j1"
-  patch -p0 extensions/ulogd_BASE.c <$srcdir/mac-addr.patch
-  ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-sqlite3
-  make || true
-  (cd mysql && ld -shared -L/usr/lib -L/usr/lib -L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -o ulogd_MYSQL.so ulogd_MYSQL_sh.o -lc)
+  ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi
   make
 }
 
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  chmod 644 "$pkgdir/etc/ulogd.conf"
+  install -Dm0644 ulogd.conf $pkgdir/etc/ulogd.conf
   install -d -m 755 "$pkgdir/usr/share/ulogd"
-  install -m644 doc/*.table "$pkgdir/usr/share/ulogd"
+  install -m644 doc/*.{table,sql} "$pkgdir/usr/share/ulogd"
   install -D -m644 "$srcdir/logrotate" "$pkgdir/etc/logrotate.d/ulogd"
   install -D -m755 "$srcdir/rc" "$pkgdir/etc/rc.d/ulogd"
 }