Wed May 29 01:29:24 PDT 2013

50 files changed, 205 insertions, 203 deletions

diff --git a/community/anyfs-tools/PKGBUILD b/community/anyfs-tools/PKGBUILD
index f0ff30bf5..d88e91149 100644
--- a/community/anyfs-tools/PKGBUILD
+++ b/community/anyfs-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66269 2012-02-23 06:54:24Z spupykin $
+# $Id: PKGBUILD 91828 2013-05-28 17:03:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=anyfs-tools
 pkgver=0.85.1c
-pkgrel=3
+pkgrel=4
 pkgdesc="unix-way toolset for recovering and converting filesystems"
 arch=('i686' 'x86_64')
 url="http://anyfs-tools.sourceforge.net/"
@@ -17,6 +17,11 @@ source=(http://downloads.sourceforge.net/sourceforge/anyfs-tools/${pkgname}-${pk
 md5sums=('d3da0004cd0f037ec3e926acd3f520c2'
          '5ea91297b605d51b03243adda1efed27')
 
+prepare() {
+  cd $srcdir/$pkgname-${pkgver}
+  find . -name Makefile.in -exec sed -i 's|$(INSTALLPATH)/sbin|$(INSTALLPATH)/bin|g' {} \;
+}
+
 build() {
   cd $srcdir/$pkgname-${pkgver}
 
@@ -25,8 +30,13 @@ build() {
   patch -p1 <$srcdir/disable-build-ext2fs.patch
 
   #Dirty Arch64 fix which doesn't affect i686
-  CFLAGS="-DNO_INLINE_FUNCS -D_INLINE_=static" ./configure --prefix=/usr --build=i686-linux-gnu
+  CFLAGS="-DNO_INLINE_FUNCS -D_INLINE_=static" \
+    ./configure --prefix=/usr --build=i686-linux-gnu
   make -j1
   sed -i 's|ldconfig||' src/anysurrect/Makefile
+}
+
+package() {
+  cd $srcdir/$pkgname-${pkgver}
   make INSTALLPATH=$pkgdir/usr install
 }
diff --git a/community/checkinstall/PKGBUILD b/community/checkinstall/PKGBUILD
index f5bebd03e..31f879e1c 100644
--- a/community/checkinstall/PKGBUILD
+++ b/community/checkinstall/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65086 2012-02-20 03:34:38Z spupykin $
+# $Id: PKGBUILD 91846 2013-05-28 17:24:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=checkinstall
 pkgver=1.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc="spy for 'make install' and build rpm or deb"
 arch=('i686' 'x86_64')
 url="http://asic-linux.com.mx/~izto/checkinstall/"
@@ -13,11 +13,15 @@ backup=(etc/checkinstall/checkinstallrc)
 source=(http://asic-linux.com.mx/~izto/checkinstall/files/source/$pkgname-$pkgver.tar.gz
 	build-fix.patch)
 md5sums=('d7b43c92001e68243a93bcce8b1e5480'
-         '5c68cb7e29cf6da4b845ce57fb5ea080')
+         'eac0c843781c300e7bc15c55be262e51')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np1 <../build-fix.patch
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/checkinstall/build-fix.patch b/community/checkinstall/build-fix.patch
index 341b7dfca..9ab00cde5 100644
--- a/community/checkinstall/build-fix.patch
+++ b/community/checkinstall/build-fix.patch
@@ -134,7 +134,7 @@ diff -wbBur checkinstall-1.6.2/Makefile checkinstall-1.6.2.my/Makefile
 -LCDIR=$(PREFIX)/lib/checkinstall/locale
 -CONFDIR=$(PREFIX)/lib/checkinstall
 +PREFIX=/usr
-+BINDIR=$(DESTDIR)/$(PREFIX)/sbin
++BINDIR=$(DESTDIR)/$(PREFIX)/bin
 +LCDIR=$(DESTDIR)/$(PREFIX)/share/locale
 +CONFDIR=$(DESTDIR)/etc/checkinstall
  
diff --git a/community/chrootuid/PKGBUILD b/community/chrootuid/PKGBUILD
index 21bd8e3f0..9b6f9a7ee 100644
--- a/community/chrootuid/PKGBUILD
+++ b/community/chrootuid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65090 2012-02-20 03:36:03Z spupykin $
+# $Id: PKGBUILD 91848 2013-05-28 17:25:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Frop Doe <mrmr@rizla.org>
 # Contributor: Guillermo A. Amaral <me@guillermoamaral.com> (thewonka)
@@ -6,7 +6,7 @@
 
 pkgname=chrootuid
 pkgver=1.3
-pkgrel=5
+pkgrel=6
 arch=(i686 x86_64)
 pkgdesc="Runs a command in a restricted environment."
 url="ftp://ftp.porcupine.org/pub/security/index.html"
@@ -20,7 +20,11 @@ md5sums=('15510abadf5de189e1c22a1544dc926a'
 build() {
   cd $srcdir/$pkgname$pkgver
   make
-  install -D -m755 $srcdir/$pkgname$pkgver/chrootuid $pkgdir/usr/sbin/chrootuid
+}
+
+package() {
+  cd $srcdir/$pkgname$pkgver
+  install -D -m755 $srcdir/$pkgname$pkgver/chrootuid $pkgdir/usr/bin/chrootuid
   install -D -m644 $srcdir/$pkgname$pkgver/chrootuid.1 $pkgdir/usr/share/man/man1/chrootuid.1
   install -D -m644 $srcdir/chrootuid_license $pkgdir/usr/share/licenses/$pkgname/license
 }
diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD
index b6fe2544f..094e95b38 100644
--- a/community/dante/PKGBUILD
+++ b/community/dante/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90649 2013-05-13 14:18:47Z spupykin $
+# $Id: PKGBUILD 91850 2013-05-28 17:25:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Guillem Rieu <guillemr@gmx.net>
 
 pkgname=dante
 pkgver=1.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc="SOCKS v4 and v5 compatible proxy server and client"
 url="http://www.inet.no/dante"
 arch=(i686 x86_64)
@@ -16,11 +16,12 @@ options=('!libtool')
 source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz
 	sockd.service)
 md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd'
-         'ceb86b5bd97f7e3ceff28c6e6172a25b')
+         '9bb18a0165764092bd01da0ff6303fbf')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc \
+	--sbindir=/usr/bin \
 	--disable-libwrap
   make
 }
diff --git a/community/dante/sockd.service b/community/dante/sockd.service
index a2a964304..68201577a 100644
--- a/community/dante/sockd.service
+++ b/community/dante/sockd.service
@@ -5,8 +5,8 @@ After=network.target
 [Service]
 Type=forking
 EnvironmentFile=/etc/conf.d/sockd.conf
-PIDFile=/var/run/sockd.pid
-ExecStart=/usr/sbin/sockd $SOCKD_OPTS
+PIDFile=/run/sockd.pid
+ExecStart=/usr/bin/sockd $SOCKD_OPTS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/darkhttpd/PKGBUILD b/community/darkhttpd/PKGBUILD
index 525cdccb8..d6c7f1f84 100644
--- a/community/darkhttpd/PKGBUILD
+++ b/community/darkhttpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89410 2013-04-29 10:56:40Z spupykin $
+# $Id: PKGBUILD 91852 2013-05-28 17:25:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=darkhttpd
 pkgver=1.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A small, static webserver"
 arch=('i686' 'x86_64')
 url="http://dmr.ath.cx/net/darkhttpd/"
@@ -20,7 +20,7 @@ build() {
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/sbin/darkhttpd
+  install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/bin/darkhttpd
   mkdir -p $pkgdir/usr/share/licenses/$pkgname
   head -n 18 darkhttpd.c >$pkgdir/usr/share/licenses/$pkgname/license
 }
diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD
index 4ef26c787..52526ad81 100644
--- a/community/darkstat/PKGBUILD
+++ b/community/darkstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90651 2013-05-13 14:19:19Z spupykin $
+# $Id: PKGBUILD 91854 2013-05-28 17:26:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=darkstat
 pkgver=3.0.715
-pkgrel=9
+pkgrel=10
 pkgdesc="Network statistics gatherer (packet sniffer)"
 url="http://dmr.ath.cx/net/darkstat/"
 license=("GPL")
@@ -20,7 +20,7 @@ md5sums=('5b7abc7538dcd8e30667dac150e81d77'
 
 build() {
   cd $srcdir/darkstat-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index bd7e3a97c..5868dbd20 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90013 2013-05-06 19:36:35Z foutrelis $
+# $Id: PKGBUILD 91822 2013-05-28 13:42:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
 
 pkgname=darktable
-pkgver=1.2
+pkgver=1.2.1
 _pkgver=1.2
-pkgrel=4
+pkgrel=1
 pkgdesc="Utility to organize and develop raw images"
 arch=('i686' 'x86_64')
 url=http://darktable.sf.net/
@@ -19,7 +19,7 @@ optdepends=('librsvg')
 install=darktable.install
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz)
-md5sums=('31bfd13d4786aac4f99d5155a811602b')
+md5sums=('f970573777752b1b4447997d1f1f65fa')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/delegate/PKGBUILD b/community/delegate/PKGBUILD
index 7fbf1b030..e9b4f9a87 100644
--- a/community/delegate/PKGBUILD
+++ b/community/delegate/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65112 2012-02-20 04:49:31Z spupykin $
+# $Id: PKGBUILD 91876 2013-05-28 17:59:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=delegate
 pkgver=9.9.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Caching and converting multyprotocol proxy. For example, you may use it as NNTP web interface"
 arch=('i686' 'x86_64')
 url="http://www.delegate.org/"
@@ -18,13 +18,17 @@ md5sums=('86c833e95cd16a54d54fa3c7e4ab7929')
 build() {
   cd $srcdir/$pkgname$pkgver
   make ADMIN="root@localhost"
+}
+
+package() {
+  cd $srcdir/$pkgname$pkgver
 
   install -D -m0755 src/delegated $pkgdir/usr/bin/delegated
 
-  install -D -m0755 subin/dgbind $pkgdir/usr/sbin/dgbind
-  install -D -m0755 subin/dgchroot $pkgdir/usr/sbin/dgchroot
-  install -D -m0755 subin/dgcpnod $pkgdir/usr/sbin/dgcpnod
-  install -D -m0755 subin/dgpam $pkgdir/usr/sbin/dgpam
+  install -D -m0755 subin/dgbind $pkgdir/usr/bin/dgbind
+  install -D -m0755 subin/dgchroot $pkgdir/usr/bin/dgchroot
+  install -D -m0755 subin/dgcpnod $pkgdir/usr/bin/dgcpnod
+  install -D -m0755 subin/dgpam $pkgdir/usr/bin/dgpam
 
   install -D -m0644 doc/Manual.htm $pkgdir/usr/share/delegate/manual.htm
   install -D -m0644 doc/tutor-en.htm $pkgdir/usr/share/delegate/tutor-en.htm
diff --git a/community/delegate/delegate.install b/community/delegate/delegate.install
index f7c7096b4..39883a261 100644
--- a/community/delegate/delegate.install
+++ b/community/delegate/delegate.install
@@ -1,11 +1,6 @@
-pre_install() {
-  /bin/true
-}
-
 post_install() {
   echo "--"
   echo "-- Delegate supports too many protocols, so I did not write any rc-script"
   echo "-- Please read documentation in /usr/share/delegate/"
   echo "--"
-  /bin/true
 }
diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD
index 80c5edc16..cd5509161 100644
--- a/community/dictd/PKGBUILD
+++ b/community/dictd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90655 2013-05-13 14:21:09Z spupykin $
+# $Id: PKGBUILD 91830 2013-05-28 17:03:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: SmackleFunky <smacklefunky@optusnet.com.au>
 # Contributor: Enrico Morelli <morelli@cerm.unifi.it>
 
 pkgname=dictd
 pkgver=1.12.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Online dictionary client and server"
 url="http://sourceforge.net/projects/dict/"
 license=('GPL')
@@ -31,14 +31,14 @@ md5sums=('62696491174c22079f664830d07c0623'
          'fb72f7d8c55f84b1b37bbc8d33a8e55a'
          '64cd6ffdb40fb3367224f91ac44926ac'
          '838887fee38ae4cebd652d399b1f2266'
-         '574e316d1f08885882d7b3075e1ea522'
+         'd94fa6c43514c158c80e85f856c65365'
          'b8cabf913876e544d919c7f20ff8db9e'
-         'b7dbc9529df13ff895dae2b4abd080d6'
+         'bd3fd3f68625bad0c23754686ae2e99c'
          '978c9c079a0fc8d7d42a4cd4000190e7')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict
+  ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict --sbindir=/usr/bin
   make
 }
 
diff --git a/community/dictd/dictd.service b/community/dictd/dictd.service
index fa219f72a..f62bf275f 100644
--- a/community/dictd/dictd.service
+++ b/community/dictd/dictd.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=forking
 EnvironmentFile=-/etc/conf.d/dictd
-ExecStart=/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS
+ExecStart=/usr/bin/dictd $DICTD_ARGS -- $DICTD_EARGS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dictd/dictd.xinetd b/community/dictd/dictd.xinetd
index a3e3773dc..0ae5cb411 100644
--- a/community/dictd/dictd.xinetd
+++ b/community/dictd/dictd.xinetd
@@ -7,6 +7,6 @@ service dict
 	protocol = tcp
 	wait = no
 	user = daemon
-	server = /usr/sbin/dictd
+	server = /usr/bin/dictd
 	server_args = -c /etc/dict/dictd.conf -i --locale en_US.UTF-8
 }
diff --git a/community/fbgetty/PKGBUILD b/community/fbgetty/PKGBUILD
index ee251e138..77cc00f8e 100644
--- a/community/fbgetty/PKGBUILD
+++ b/community/fbgetty/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 65233 2012-02-20 12:23:20Z spupykin $
+# $Id: PKGBUILD 91856 2013-05-28 17:26:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=fbgetty
 pkgver=0.1.698
-pkgrel=4
+pkgrel=5
 license=("GPL")
 pkgdesc="fbgetty is a console getty like mingetty, which supports framebuffers"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ build()
 {
   cd $srcdir/$pkgname-$pkgver
 
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin
 
   patch src/options.c <<EOF
 33a34
@@ -23,6 +23,10 @@ build()
 EOF
 
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
   mv ${pkgdir}/usr/info ${pkgdir}/usr/share/
 }
diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD
index 307d2e189..44a9523b6 100644
--- a/community/flumotion/PKGBUILD
+++ b/community/flumotion/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74096 2012-07-20 19:52:13Z spupykin $
+# $Id: PKGBUILD 91878 2013-05-28 18:07:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=flumotion
 pkgver=0.10.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="A streaming media server"
 url="http://www.flumotion.net"
@@ -29,10 +29,14 @@ build() {
     sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
 
-  install -d "$pkgdir/etc/$pkgname"
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -d "$pkgdir/etc/$pkgname"
   make DESTDIR="$pkgdir" install
   cp -R conf/workers "$pkgdir/etc/$pkgname"
   cp -R conf/managers "$pkgdir/etc/$pkgname"
diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD
index 656fc7597..82100d9ab 100644
--- a/community/glusterfs/PKGBUILD
+++ b/community/glusterfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90667 2013-05-13 14:24:32Z spupykin $
+# $Id: PKGBUILD 91880 2013-05-28 18:08:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributors:
 #   Andrei Antoukh - niwi@niwi.be - http://www.niwi.be
@@ -7,7 +7,7 @@
 pkgname=glusterfs
 _basever=3.3
 pkgver=$_basever.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.'
 arch=(i686 x86_64)
 url='http://www.gluster.org/'
@@ -18,12 +18,6 @@ options=(!libtool)
 source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz
 	glusterd.service)
 sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519'
-            'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4'
-            'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7')
-sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519'
-            'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4'
-            'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7')
-sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519'
             'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7')
 
 build() {
@@ -31,6 +25,7 @@ build() {
 
   ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --mandir=/usr/share/man \
diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD
index 21370d6af..1324e7b0a 100644
--- a/community/incron/PKGBUILD
+++ b/community/incron/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90677 2013-05-13 14:26:58Z spupykin $
+# $Id: PKGBUILD 91858 2013-05-28 17:27:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 # Contributor: scj <scj(at)archlinux(dot)us>
 
 pkgname=incron
 pkgver=0.5.10
-pkgrel=4
+pkgrel=5
 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods"
 arch=('i686' 'x86_64')
 url="http://incron.aiken.cz/"
@@ -16,13 +16,18 @@ options=('emptydirs')
 source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz"
 	'incrond.service')
 md5sums=('67f8b671db8169edccc8ef11c7d2c8be'
-         '859a90af9e4efe40db381ea07167a66a')
+         '4be206ba6ecacd9d2006cdc72b4604db')
 
-build() {
+prepare() {
   cd "${srcdir}"/$pkgname-$pkgver
   sed -i '1,1i#include <unistd.h>' inotify-cxx.cpp icd-main.cpp
   sed -i '1,1i#include <stdio.h>' icd-main.cpp inotify-cxx.cpp usertable.cpp appargs.cpp
   sed -i 's|strchr(s,|(char*)strchr(s,|' incroncfg.cpp
+  sed -i 's|$(DESTDIR)$(PREFIX)/sbin/|$(DESTDIR)$(PREFIX)/bin/|g' Makefile
+}
+
+build() {
+  cd "${srcdir}"/$pkgname-$pkgver
   make
 }
 
diff --git a/community/incron/incron.install b/community/incron/incron.install
index fa42d9cdc..9cb53bbe6 100644
--- a/community/incron/incron.install
+++ b/community/incron/incron.install
@@ -8,7 +8,6 @@ post_install () {
 
 pre_remove() {
   [ -h /var/service/incron ] && rm /var/service/incron
-  /etc/rc.d/incron stop
-  usr/sbin/userdel incron >& /dev/null
-  usr/sbin/groupdel incron >& /dev/null
+  userdel incron >& /dev/null
+  groupdel incron >& /dev/null
 }
diff --git a/community/incron/incrond.service b/community/incron/incrond.service
index 54fcfa9d2..d46814bf3 100644
--- a/community/incron/incrond.service
+++ b/community/incron/incrond.service
@@ -4,7 +4,7 @@ Description=Inotify System Scheduler
 [Service]
 Type=forking
 PIDFile=/run/incrond.pid
-ExecStart=/usr/sbin/incrond
+ExecStart=/usr/bin/incrond
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD
index 802c1a5f6..bda613cf0 100644
--- a/community/inputattach/PKGBUILD
+++ b/community/inputattach/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90759 2013-05-13 16:35:21Z spupykin $
+# $Id: PKGBUILD 91882 2013-05-28 18:09:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=inputattach
 pkgver=1.24
-pkgrel=9
+pkgrel=10
 pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system"
 arch=('i686' 'x86_64')
 url="http://linuxconsole.sourceforge.net/"
@@ -23,7 +23,7 @@ md5sums=('eb595a766ca363edb3b14c25404596ce'
          '93d34d96cd3ad19ea1aeca7f68a66b4a'
          '7ca903e54829764c8241233af5069216'
          'c19b9ed38b243191cf5378b87a42a4cc'
-         '84c6463660c10bd34c0390102da087d5'
+         '7dd0690a9d2fe5e1052900650906e273'
          'f1b3ddae308351357f557cbd5c6cda81'
          '8f76908449cae24a95adbf0bc0a17721')
 
@@ -43,7 +43,7 @@ build() {
 
 package() {
   cd "$srcdir/src"
-  install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach"
+  install -Dm755 inputattach "$pkgdir/usr/bin/inputattach"
   install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl
   install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach"
   install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service
diff --git a/community/inputattach/inputattachctl b/community/inputattach/inputattachctl
index 291c531ae..05dfa4af5 100755
--- a/community/inputattach/inputattachctl
+++ b/community/inputattach/inputattachctl
@@ -5,7 +5,7 @@
 case "$1" in
 	start)
 		for i in "${IAPARAMS[@]}"; do
-			/usr/sbin/inputattach --daemon $i || exit 1
+			/usr/bin/inputattach --daemon $i || exit 1
 		done
 		;;
 	stop)
diff --git a/community/ipguard/PKGBUILD b/community/ipguard/PKGBUILD
index f8fa6796a..691be3d32 100644
--- a/community/ipguard/PKGBUILD
+++ b/community/ipguard/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65572 2012-02-21 09:01:48Z spupykin $
+# $Id: PKGBUILD 91832 2013-05-28 17:04:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ipguard
 pkgver=1.04
-pkgrel=2
+pkgrel=3
 pkgdesc="ipguard - arp<->ip relation checking tool"
 arch=(i686 x86_64)
 url="http://ipguard.deep.perm.ru/"
@@ -15,14 +15,20 @@ source=(http://ipguard.deep.perm.ru/files/$pkgname-$pkgver.tar.gz
 md5sums=('7f44f7c31876f0d68792f02047e25409'
          'b27cfc9e8ad4ef9459d7274a2e624831')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
-
   patch -Np1 <../build-fix-le.patch
+  sed -i 's|$(PREFIX)/sbin|$(PREFIX)/bin|g' Makefile
+}
 
+build() {
+  cd $srcdir/$pkgname-$pkgver
   CFLAGS="-DLIBNET_LIL_ENDIAN" make
-  make PREFIX=$pkgdir/usr install
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make PREFIX=$pkgdir/usr install
   mkdir -p $pkgdir/usr/share
   mv $pkgdir/usr/man $pkgdir/usr/share/
 }
diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD
index a5683ebc4..16bf75bdf 100644
--- a/community/ipsec-tools/PKGBUILD
+++ b/community/ipsec-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90745 2013-05-13 14:45:21Z spupykin $
+# $Id: PKGBUILD 91860 2013-05-28 17:37:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Allan Henriksen <allan.henriksen@gmail.com>
 
 pkgname=ipsec-tools
 pkgver=0.8.1
-pkgrel=2
+pkgrel=4
 pkgdesc="KAME IPSec tools ported to Linux"
 arch=('i686' 'x86_64')
 url="http://ipsec-tools.sourceforge.net/"
@@ -17,8 +17,8 @@ source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgve
 	ipsec.service
 	ipsec-tools-linux-3.7-compat.patch)
 md5sums=('d38b39f291ba2962387c3232e7335dd8'
-         '1632fce55ba5592dea1f8bf661106e7d'
-         '5bf7478590c751b465617681a31619fe'
+         '3a64a9e3b498c6da90450ffb0b758aea'
+         '387a0b0c4f10e42b2bb62282885cdc9c'
          'ae1dd20c83dcfce3dedb46ee73e83613')
 
 build() {
@@ -28,7 +28,7 @@ build() {
   sed -i 's#-Werror##' configure.ac
 
   ./bootstrap
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \
 	--enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \
 	--enable-adminport --enable-gssapi \
 	--with-kernel-headers=/lib/modules/`pacman -Q linux-headers | cut -f2 -d\ `-ARCH/build/include
diff --git a/community/ipsec-tools/ipsec.service b/community/ipsec-tools/ipsec.service
index 3a6dea38b..483a5b58d 100644
--- a/community/ipsec-tools/ipsec.service
+++ b/community/ipsec-tools/ipsec.service
@@ -5,8 +5,8 @@ After=syslog.target network.target
 [Service]
 Type=oneshot
 RemainAfterExit=true
-ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf
-ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
+ExecStart=/usr/bin/setkey -f /etc/ipsec.conf
+ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/ipsec-tools/racoon.service b/community/ipsec-tools/racoon.service
index 792cfd395..95324bd5d 100644
--- a/community/ipsec-tools/racoon.service
+++ b/community/ipsec-tools/racoon.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/racoon
+ExecStart=/usr/bin/racoon
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/libaio/PKGBUILD b/community/libaio/PKGBUILD
deleted file mode 100644
index 717473564..000000000
--- a/community/libaio/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
-# Contributor: Thomas S Hatch <thatch45 at gmail dot com>
-
-pkgname=libaio
-pkgver=0.3.109
-pkgrel=6
-pkgdesc="The Linux-native asynchronous I/O facility (aio) library"
-arch=('i686' 'x86_64')
-url="http://lse.sourceforge.net/io/aio.html"
-license=('LGPL')
-source=(http://ftp.de.debian.org/debian/pool/main/liba/$pkgname/${pkgname}_${pkgver}.orig.tar.gz)
-md5sums=('435a5b16ca6198eaf01155263d855756')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix="$pkgdir/usr" install
-}
-
diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD
index 3c4c0f057..d12544eef 100644
--- a/community/libdnet/PKGBUILD
+++ b/community/libdnet/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61173 2011-12-23 18:40:57Z spupykin $
+# $Id: PKGBUILD 91834 2013-05-28 17:04:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: James Fryman <jfryman@gmail.com>
 
 pkgname=libdnet
 pkgver=1.12
-pkgrel=6
+pkgrel=7
 pkgdesc="A simplified, portable interface to several low-level networking routines"
 arch=(i686 x86_64)
 makedepends=(python2)
@@ -19,7 +19,7 @@ build() {
   cd $srcdir/$pkgname-$pkgver
 
   autoreconf -I config --force --install
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD
index 147342e9d..f2dd94444 100644
--- a/community/libee/PKGBUILD
+++ b/community/libee/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80464 2012-11-22 10:27:21Z spupykin $
+# $Id: PKGBUILD 91836 2013-05-28 17:04:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Brian Knox <taotetek@gmail.com>
 
 pkgname=libee
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="event expression library inspired by CEE"
 url="http://www.libee.org/"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ md5sums=('7bbf4160876c12db6193c06e2badedb2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make -j1
 }
 
diff --git a/community/libseccomp/PKGBUILD b/community/libseccomp/PKGBUILD
deleted file mode 100644
index 9bdaee4fc..000000000
--- a/community/libseccomp/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Patryk Kowalczyk < patryk at kowalczyk dot ws>
-
-pkgname=libseccomp
-pkgver=2.0.0
-pkgrel=2
-pkgdesc='Enhanced seccomp library'
-arch=('i686' 'x86_64')
-license=('LGPL2.1')
-url="http://sourceforge.net/projects/libseccomp/"
-depends=('glibc')
-source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('f988feac6a3425f2c918f32b28df1caa')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD
index 127f5d907..ff830f669 100644
--- a/community/libuser/PKGBUILD
+++ b/community/libuser/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88522 2013-04-19 10:31:27Z spupykin $
+# $Id: PKGBUILD 91838 2013-05-28 17:05:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 
 pkgname=libuser
 pkgver=0.59
-pkgrel=1
+pkgrel=2
 pkgdesc='A standardized interface for manipulating and administering user and group accounts.'
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -21,6 +21,7 @@ build() {
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
+    --sbindir=/usr/bin \
     --disable-gtk-doc-html \
     --disable-rpath
   sed -i 's/SUBDIRS = po docs/SUBDIRS = po/' Makefile
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 608e854b9..6b6ba9bad 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90887 2013-05-15 08:03:43Z bpiotrowski $
+# $Id: PKGBUILD 91813 2013-05-28 11:39:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=1.0.5
-pkgrel=4
+pkgrel=5
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -55,15 +55,11 @@ build() {
 	--with-storage-lvm --without-xen --with-udev --without-hal --disable-static \
 	--with-init-script=systemd --with-audit \
 	--with-qemu-user=nobody --with-qemu-group=nobody \
-	--without-netcf --with-interface
+	--without-netcf --with-interface \
+	--with-dnsmasq-path=/usr/bin/dnsmasq
   make
 
-  sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service
-  sed -i \
-    -e 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' \
-    -e 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' \
-    -e 's|After=.*|After=syslog.target network.target libvirtd.service|' \
-    tools/libvirt-guests.service
+  sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service
   sed -i 's|@sbindir@|/usr/sbin|g' src/virtlockd.service
   sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf
 }
diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD
index f8199ecbd..163ed50ab 100644
--- a/community/osiris/PKGBUILD
+++ b/community/osiris/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90697 2013-05-13 14:32:32Z spupykin $
+# $Id: PKGBUILD 91866 2013-05-28 17:38:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: jlvsimoes
 
 pkgname=osiris
 pkgver=4.2.3
-pkgrel=6
+pkgrel=7
 pkgdesc="A file integrity management system"
 arch=('i686' 'x86_64')
 url="http://osiris.shmoo.com/"
@@ -16,13 +16,16 @@ source=(http://arch.p5n.pp.ru/~sergej/dl/2011/osiris-$pkgver.tar.gz
 	osirismd.service
 	osirisd.service)
 md5sums=('1951c7dc0fe729af9ffaf58910340d12'
-         '48644676b88b231803785b8e2da956e5'
-         'c0355b453770f6bbc6a58f5cd80766b4')
+         '8398d60bcbf0c90034473365abc3ece6'
+         '758d029a1ff53be11756330de595e77f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  ./configure --prefix=/usr --enable-fancy-cli  --with-md-root-dir=/usr/share/$pkgname
+  sed -i "s|/sbin|/bin|g" src/install/install.sh.in
+
+  ./configure --prefix=/usr --sbindir=/usr/bin \
+    --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname
   make all
 
   # Arch-ify install locations
@@ -39,7 +42,7 @@ package() {
 
   make DESTDIR=$pkgdir install
 
-  rm -rf $pkgdir/usr/osiris
+  rm -rf $pkgdir/usr/osiris $pkgdir/etc/init.d
 
   install -Dm0644 $srcdir/osirisd.service $pkgdir/usr/lib/systemd/system/osirisd.service
   install -Dm0644 $srcdir/osirismd.service $pkgdir/usr/lib/systemd/system/osirismd.service
diff --git a/community/osiris/osirisd.service b/community/osiris/osirisd.service
index 199737c9f..3b162160f 100644
--- a/community/osiris/osirisd.service
+++ b/community/osiris/osirisd.service
@@ -4,7 +4,7 @@ Description=A file integrity management system
 [Service]
 User=osiris
 Type=forking
-ExecStart=/usr/sbin/osirisd
+ExecStart=/usr/bin/osirisd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/osiris/osirismd.service b/community/osiris/osirismd.service
index d51cef22c..ec4c40702 100644
--- a/community/osiris/osirismd.service
+++ b/community/osiris/osirismd.service
@@ -4,7 +4,7 @@ Description=A file integrity management system
 [Service]
 User=osiris
 Type=forking
-ExecStart=/usr/sbin/osirismd
+ExecStart=/usr/bin/osirismd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD
index 309d9d413..aa5cb4031 100644
--- a/community/ozerocdoff/PKGBUILD
+++ b/community/ozerocdoff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69167 2012-04-09 22:11:35Z spupykin $
+# $Id: PKGBUILD 91884 2013-05-28 18:09:59Z spupykin $
 # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 
 pkgname=ozerocdoff
 pkgver=2
-pkgrel=7
+pkgrel=8
 pkgdesc="Userspace driver for Option High Speed Mobile Devices"
 arch=('i686' 'x86_64')
 url="http://www.pharscape.org/ozerocdoff.html"
@@ -15,10 +15,15 @@ source=(udev.tar.gz::"http://www.pharscape.org/forum/index.php?action=dlattach;t
 md5sums=('88a78f9380d9591f8d20a657b72e3e5c'
          '28ed1afd16fdec92de3baf66b32b0b12')
 
+prepare() {
+  cd "${srcdir}/udev"
+  patch -p1 <$srcdir/remove-old-rules.patch
+  sed -i 's|usr/sbin|usr/bin|g' Makefile
+}
+
 build() {
   cd "${srcdir}/udev"
   make clean
-  patch -p1 <$srcdir/remove-old-rules.patch
   make
 }
 
diff --git a/community/p3scan/PKGBUILD b/community/p3scan/PKGBUILD
index 92190ab71..17039ff9b 100644
--- a/community/p3scan/PKGBUILD
+++ b/community/p3scan/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90699 2013-05-13 14:33:03Z spupykin $
+# $Id: PKGBUILD 91863 2013-05-28 17:37:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: v01d <phreakuencies@gmail.com>
 
 pkgname=p3scan
 pkgver=2.3.2
-pkgrel=8
+pkgrel=9
 pkgdesc="Fully transparent POP3/SMTP proxy with Anti-Virus and SPAM protection"
 arch=('i686' 'x86_64')
 url="http://p3scan.sourceforge.net/"
@@ -15,7 +15,7 @@ source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.
 	"p3scan.service"
 	"p3scan.tmpfiles")
 md5sums=('9f8decc7d4701228788e3c8717096ca0'
-         'dc724b50963d80be7924fc4d9d4856f0'
+         '74a3a5e52e6714ac5001985061248a34'
          '265a730e20e3d8aaf0cd7816dc98ca71')
 
 build() {
@@ -25,7 +25,7 @@ build() {
   unset CFLAGS
   sed -ri "s|^CFLAGS=-Wall( -g)? -O2|CFLAGS=-Wall $CFLAGS|" Makefile ripmime/Makefile ripmime/tnef/Makefile ripmime/ripOLE/Makefile
   sed -ri 's|^LOCATION=.+$|LOCATION=/usr|' ripmime/Makefile
-  sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/sbin/|' Makefile
+  sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/bin/|' Makefile
   make
 }
 
@@ -33,7 +33,7 @@ package() {
   cd $srcdir/$pkgname-$pkgver
 
   # Create base dirs, the Makefile assumes they're there
-  install -d $pkgdir/usr/sbin $pkgdir/usr/man/man8 $pkgdir/etc/rc.d
+  install -d $pkgdir/usr/bin $pkgdir/usr/man/man8 $pkgdir/etc/rc.d
 
   # install with root set on $pkgdir
   make DESTDIR=$pkgdir install
diff --git a/community/p3scan/p3scan.service b/community/p3scan/p3scan.service
index 0bab3e7ec..bdd34b75c 100644
--- a/community/p3scan/p3scan.service
+++ b/community/p3scan/p3scan.service
@@ -3,8 +3,8 @@ Description=p3scan proxy
 
 [Service]
 Type=forking
-PIDFile=/var/run/p3scan/p3scan.pid
-ExecStart=/usr/sbin/p3scan
+PIDFile=/run/p3scan/p3scan.pid
+ExecStart=/usr/bin/p3scan
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/pam_mount/PKGBUILD b/community/pam_mount/PKGBUILD
index d652fe0c3..fb054c78f 100644
--- a/community/pam_mount/PKGBUILD
+++ b/community/pam_mount/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77500 2012-10-11 11:40:42Z spupykin $
+# $Id: PKGBUILD 91874 2013-05-28 17:46:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributors: Sirius Bakke <sirius\at/nonline.org>
 
 pkgname=pam_mount
 pkgver=2.13
-pkgrel=4
+pkgrel=5
 pkgdesc="A PAM module that can mount volumes for a user session"
 arch=('i686' 'x86_64')
 url="http://pam-mount.sourceforge.net/"
@@ -22,12 +22,13 @@ build() {
   cd -- "$srcdir/$pkgname-$pkgver"
   patch -p1 <$srcdir/$pkgname-git.patch
   aclocal
-  automake --add-missing
   libtoolize
+  automake --add-missing
   autoreconf
   ./configure \
 	--prefix=/usr \
-	--with-ssbindir=/usr/sbin \
+	--with-ssbindir=/usr/bin \
+	--sbindir=/usr/bin \
 	--with-slibdir=/usr/lib \
 	--sysconfdir=/etc \
 	--localstatedir=/var
diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD
index 90ac79303..efeee6ce8 100644
--- a/community/pound/PKGBUILD
+++ b/community/pound/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90705 2013-05-13 14:34:19Z spupykin $
+# $Id: PKGBUILD 91868 2013-05-28 17:43:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=pound
 pkgver=2.6
-pkgrel=4
+pkgrel=5
 pkgdesc="A reverse proxy, load balancer, and SSL wrapper"
 arch=('i686' 'x86_64')
 url="http://www.apsis.ch/pound/index_html"
@@ -17,13 +17,13 @@ source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz
 	pound.service
 	pound.cfg)
 md5sums=('8c913b527332694943c4c67c8f152071'
-         '4bd5e2a8d8e707eb900ae88929e00d4c'
-         '23c70776fcd1cf71572f90a8809f7408'
+         '2a555ee5871a849cb1f6e6ba2ff054df'
+         'c0d0726a96dfda0e83843362e401b3dc'
          '8937808acd22c6391ebe4340af8df854')
 
 build() {
   cd $srcdir/Pound-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc/pound
+  ./configure --prefix=/usr --sysconfdir=/etc/pound --sbindir=/usr/bin
   make
 }
 
diff --git a/community/pound/pound.runit b/community/pound/pound.runit
index ed59ea046..ae904583c 100644
--- a/community/pound/pound.runit
+++ b/community/pound/pound.runit
@@ -4,7 +4,7 @@ exec 2>&1
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-BIN=/usr/sbin/pound
+BIN=/usr/bin/pound
 OPTS="-f /etc/pound/pound.cfg -p /var/run/pound.pid"
 SVC=pound
 
diff --git a/community/pound/pound.service b/community/pound/pound.service
index 0a91f3424..5ec089c9a 100644
--- a/community/pound/pound.service
+++ b/community/pound/pound.service
@@ -3,8 +3,8 @@ Description=A reverse proxy, load balancer, and SSL wrapper
 
 [Service]
 Type=forking
-PIDFile=/var/run/pound.pid
-ExecStart=/usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid
+PIDFile=/run/pound.pid
+ExecStart=/usr/bin/pound -f /etc/pound/pound.cfg -p /run/pound.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/procstatd/PKGBUILD b/community/procstatd/PKGBUILD
index 47fce0127..d72ce0b15 100644
--- a/community/procstatd/PKGBUILD
+++ b/community/procstatd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66164 2012-02-23 02:23:03Z spupykin $
+# $Id: PKGBUILD 91870 2013-05-28 17:44:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Jason Chu <jason@archlinux.org>
 
 pkgname=procstatd
 pkgver=1.4.2
-pkgrel=6
+pkgrel=8
 pkgdesc="A daemon that can be run either from userspace or inetd that can be queried via a simple API to parse various files in /proc"
 arch=('i686 x86_64')
 license=('GPL')
@@ -17,8 +17,12 @@ md5sums=('1fdeaf05ca6337f5c02e76a76c53c407')
 build() {
   cd $srcdir/$pkgname
   # Get rid of the funky make install forever bug
-  sed -i 's/make install/echo/;s/cd watchman/echo/' Makefile
+  sed -i 's/make install/echo/;s/cd watchman/echo/;s@$(INSTDIR)/sbin@$(INSTDIR)/bin@' Makefile
   make
+}
+
+package() {
+  cd $srcdir/$pkgname
   make INSTDIR=$pkgdir/usr install
   mkdir ${pkgdir}/usr/share
   mv ${pkgdir}/usr/man ${pkgdir}/usr/share/man
diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD
index 565af8113..a3d0b2f9f 100644
--- a/community/qpxtool/PKGBUILD
+++ b/community/qpxtool/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90084 2013-05-06 19:39:19Z foutrelis $
+# $Id: PKGBUILD 91840 2013-05-28 17:05:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com>
 
 pkgname=qpxtool
 pkgver=0.7.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings."
 arch=('i686' 'x86_64')
 url="http://qpxtool.sourceforge.net/"
@@ -24,7 +24,7 @@ build() {
     -e 's|lrelease|lrelease-qt4|' \
     configure
   patch -p1 <$srcdir/libpng15.patch
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
diff --git a/community/sniffit/PKGBUILD b/community/sniffit/PKGBUILD
index 4843eb7cc..b3f38f95b 100644
--- a/community/sniffit/PKGBUILD
+++ b/community/sniffit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65453 2012-02-21 05:52:41Z spupykin $
+# $Id: PKGBUILD 91886 2013-05-28 18:10:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
 
 pkgname=sniffit
 pkgver=0.3.7.beta
-pkgrel=11
-pkgdesc="very good packet sniffer for unix with ncurses interactive mode."
+pkgrel=12
+pkgdesc="Very good packet sniffer for unix with ncurses interactive mode"
 arch=('i686' 'x86_64')
 url="http://packages.ubuntu.com/source/sniffit"
 #seems the website are out, ubuntu have all sources
@@ -27,8 +27,12 @@ build() {
   rm -f config.sub config.guess
   cp  /usr/share/libtool/config/config.{guess,sub} .
 
-  ./configure --prefix=/usr --no-recursion
+  ./configure --prefix=/usr --no-recursion --sbindir=/usr/bin
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}.${pkgver}"
   install -d -m0755 -g root -o root ${pkgdir}/usr/{sbin,share/licenses/${pkgname}}
   install -D -m0744 -g root -o root sniffit ${pkgdir}/usr/sbin/sniffit
   install -D -m0644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}
diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD
index ddbf5df79..b9ce14244 100644
--- a/community/squashfs-tools/PKGBUILD
+++ b/community/squashfs-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65461 2012-02-21 05:55:21Z spupykin $
+# $Id: PKGBUILD 91872 2013-05-28 17:44:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Original TU: Jeff Mickey <j@codemac.net>
@@ -6,7 +6,7 @@
 
 pkgname=squashfs-tools
 pkgver=4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
 url="http://squashfs.sourceforge.net"
 license=("GPL")
@@ -24,6 +24,6 @@ build() {
 
 package() {
     cd ${srcdir}/squashfs${pkgver}/${pkgname}
-    install -Dm755 mksquashfs ${pkgdir}/sbin/mksquashfs
-    install -m755 unsquashfs ${pkgdir}/sbin/unsquashfs
+    install -Dm755 mksquashfs ${pkgdir}/bin/mksquashfs
+    install -m755 unsquashfs ${pkgdir}/bin/unsquashfs
 }
diff --git a/community/synce-serial/PKGBUILD b/community/synce-serial/PKGBUILD
index 485ca054d..f89a77018 100644
--- a/community/synce-serial/PKGBUILD
+++ b/community/synce-serial/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65481 2012-02-21 06:01:39Z spupykin $
+# $Id: PKGBUILD 91842 2013-05-28 17:05:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zhukov Pavel <gelios@gmail.com>
 
 pkgname=synce-serial
 pkgver=0.11
-pkgrel=4
+pkgrel=5
 pkgdesc="provide a means of communication with a Windows CE device - helper scripts for setting up a serial connection"
 arch=('i686' 'x86_64')
 url="http://synce.sourceforge.net/"
@@ -15,10 +15,13 @@ md5sums=('a83f20eb59c845de192645158d051062')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --sbindir=/usr/bin
   make
-  make DESTDIR=$pkgdir install
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
   sed -i 's#/usr/etc/#/etc/#' $pkgdir/usr/share/synce/synce-serial-common
   sed -i 's#/usr/etc/#/etc/#' $pkgdir/usr/share/synce/synce-serial.conf
 }
diff --git a/community/twin/PKGBUILD b/community/twin/PKGBUILD
index 39725c602..6abb8de4f 100644
--- a/community/twin/PKGBUILD
+++ b/community/twin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70178 2012-05-01 12:01:36Z andrea $
+# $Id: PKGBUILD 91844 2013-05-28 17:06:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=twin
 pkgver=0.6.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A text-mode window environment"
 arch=('i686' 'x86_64')
 url='http://sourceforge.net/projects/twin/'
@@ -17,7 +17,7 @@ md5sums=('6211c8b2e655003eb96b1fc5dc37e7d9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  LDFLAGS="-lX11" ./configure --prefix=/usr \
+  LDFLAGS="-lX11" ./configure --prefix=/usr --sbindir=/usr/bin \
 	--enable-tt=yes \
 	--enable-tt-hw-twin=yes --enable-tt-hw-twin-tunnel=yes --enable-tt-hw-twin-detunnel=yes \
 	--enable-tt-hw-xml=yes
diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD
index f04ab0934..36023adbd 100644
--- a/community/unrealircd/PKGBUILD
+++ b/community/unrealircd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90731 2013-05-13 14:39:46Z spupykin $
+# $Id: PKGBUILD 91865 2013-05-28 17:38:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zerial <fernando@zerial.org>
 
 pkgname=unrealircd
 pkgver=3.2.10
-pkgrel=2
+pkgrel=4
 pkgdesc="Open Source IRC Server"
 arch=('i686' 'x86_64')
 url="http://unrealircd.com"
@@ -18,7 +18,7 @@ source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz
 	unrealircd.service
 	arch-fixes.patch)
 md5sums=('05b0bbdbfab9ffc2304f7595951d7cec'
-         '2103ce8a4a4e79f6955920bfebea0202'
+         '93276a1cd426e4a811c072c35fc31e94'
          '77807313c4578f2c30286b9f9e3fb21c')
 
 build() {
@@ -36,6 +36,7 @@ build() {
       --enable-dynamic-linking \
       --enable-ziplinks \
       --enable-ssl \
+      --enable-ipv6 \
       --enable-libcurl=/usr \
       --with-system-cares
 
diff --git a/community/unrealircd/unrealircd.service b/community/unrealircd/unrealircd.service
index 42279fae0..a81419f2a 100644
--- a/community/unrealircd/unrealircd.service
+++ b/community/unrealircd/unrealircd.service
@@ -6,7 +6,7 @@ After=network.target remote-fs.target nss-lookup.target
 Type=forking
 User=ircd
 PIDFile=/var/run/unrealircd.pid
-ExecStart=/usr/bin/unrealircd -p
+ExecStart=/usr/bin/unrealircd
 
 [Install]
 WantedBy=multi-user.target