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

Conflicts:
	community-testing/conntrack-tools/01-config-file-path.patch
	community-testing/conntrack-tools/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/gigi/PKGBUILD
	community-testing/glob2/PKGBUILD
	community-testing/megaglest/PKGBUILD
	community-testing/openimageio/PKGBUILD
	community/gtk2hs-buildtools/PKGBUILD
	community/haddock/PKGBUILD
	community/haskell-dataenc/PKGBUILD
	community/haskell-ghc-paths/PKGBUILD
	community/haskell-haskeline/PKGBUILD
	community/haskell-hslogger/PKGBUILD
	community/haskell-tar/PKGBUILD
	community/haskell-terminfo/PKGBUILD
	community/haskell-utf8-string/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/libnetfilter_acct/PKGBUILD
	community/libnetfilter_conntrack/PKGBUILD
	community/libnetfilter_queue/PKGBUILD
	community/libnfnetlink/PKGBUILD
	community/sfk/PKGBUILD
	extra/cabal-install/PKGBUILD
	extra/claws-mail/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/nx/PKGBUILD
	extra/ocaml/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-dbus-core/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-libxcb/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	social/squirm/PKGBUILD
	staging/kdebindings-python/PKGBUILD
	testing/curl/PKGBUILD
	testing/dnsutils/PKGBUILD
	testing/dnsutils/remove-bind.patch
	testing/mesa/PKGBUILD
	testing/openldap/PKGBUILD
	testing/pam/PKGBUILD
	testing/subversion/PKGBUILD
	testing/systemd/PKGBUILD
	testing/sysvinit/PKGBUILD

1 files changed, 30 insertions, 35 deletions

diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index d32b424bb..e78329277 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,62 +1,57 @@
-# $Id: PKGBUILD 75920 2012-09-05 14:02:57Z spupykin $
+# $Id: PKGBUILD 77483 2012-10-10 23:43:02Z seblu $
 # 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=2.0.0
-pkgrel=5
+pkgver=2.0.1
+pkgrel=3
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/ulogd/index.html'
 license=('GPL2')
-depends=('libmnl')
+depends=('libmnl' 'libnfnetlink')
 backup=('etc/ulogd.conf')
-makedepends=('libmysqlclient' 'postgresql-libs' 'sqlite' 'libpcap' 'libdbi'
-	     'libnetfilter_acct' 'libnetfilter_log' 'libnetfilter_conntrack'
-	     'linuxdoc-tools' 'groff' 'texlive-core')
-optdepends=('postgresql-libs'
-	    'sqlite'
-	    'libpcap'
-	    'libmysqlclient'
-	    'libdbi'
-	    'libnetfilter_acct'
-	    'libnetfilter_log'
-	    'libnetfilter_conntrack')
+makedepends=('libmysqlclient'
+             'libnetfilter_acct'
+             'libnetfilter_conntrack'
+             'libnetfilter_log'
+             'libpcap'
+             'libdbi'
+             'postgresql-libs'
+             'sqlite')
+optdepends=("${makedepends[@]}")
 options=('!libtool')
 source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-	'rc'
-	'logrotate'
-	'ulogd.conf.min'
-	'ulogd.service')
-md5sums=('211e68781e3860959606fc94b97cf22e'
+	      "$pkgname.rc"
+	      "$pkgname.logrotate"
+	      "$pkgname.conf"
+	      "$pkgname.service")
+md5sums=('2f4b1a58955fcad4ebf22f0d00885fc9'
          'c42230c1cabf5dd9b80bf9a0fd87ca7e'
          'dd32eeee0949adff4188544419acd17e'
          'c21531312f95e790ed19aa267a17d35a'
-         '13a1227052322b4c17b258ed358f055e')
+         '42fc2c0568ff89ec00c2f0797280f296')
+
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi
   make
-  (cd doc && make)
 }
 
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  install -dm0755 "$pkgdir/usr/share/doc/ulogd"
-  install -Dm0644 ulogd.conf $pkgdir/usr/share/doc/ulogd/ulogd.conf.sample
-  install -Dm0644 doc/ulogd.{dvi,html,ps,sgml,txt} "$pkgdir/usr/share/doc/ulogd"
-
-  install -dm0755 "$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"
-
-  install -Dm0644 $srcdir/ulogd.conf.min $pkgdir/etc/ulogd.conf
-  install -Dm0644 $srcdir/ulogd.service $pkgdir/usr/lib/systemd/system/ulogd.service
+  install -dm755 "$pkgdir/usr/share/doc/ulogd"
+  install -Dm644 ulogd.conf "$pkgdir/usr/share/doc/ulogd/ulogd.conf"
+  install -m644 doc/*.{table,sql} "$pkgdir/usr/share/doc/ulogd"
+  cd "$srcdir"
+  install -Dm755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+  install -Dm644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -Dm644 $pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname"
+  install -Dm644 $pkgname.conf "$pkgdir/etc/$pkgname.conf"
 }
+
+# vim:set ts=2 sw=2 et: