Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apcupsd/PKGBUILD
	community/bmp-musepack/PKGBUILD
	community/bmp-wma/PKGBUILD
	community/bonnie++/PKGBUILD
	community/cantata/PKGBUILD
	community/checkinstall/PKGBUILD
	community/chrootuid/PKGBUILD
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/compiz/PKGBUILD
	community/compizconfig-backend-gconf/PKGBUILD
	community/compizconfig-python/PKGBUILD
	community/ekg2/PKGBUILD
	community/emerald/PKGBUILD
	community/fbgetty/PKGBUILD
	community/flumotion/PKGBUILD
	community/leafnode/PKGBUILD
	community/libcompizconfig/PKGBUILD
	community/libdnet/PKGBUILD
	community/libee/PKGBUILD
	community/libtxc_dxtn/PKGBUILD
	community/linux-tools/PKGBUILD
	community/openntpd/PKGBUILD
	community/osiris/PKGBUILD
	community/perl-package-stash-xs/PKGBUILD
	community/perl-params-util/PKGBUILD
	community/procstatd/PKGBUILD
	community/scponly/PKGBUILD
	community/sniffit/PKGBUILD
	community/synergy/PKGBUILD
	community/turbojpeg/PKGBUILD
	community/unbound/PKGBUILD
	community/uucp/PKGBUILD
	core/gawk/PKGBUILD
	core/ifenslave/PKGBUILD
	core/jfsutils/PKGBUILD
	core/openldap/PKGBUILD
	core/rfkill/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	core/xinetd/PKGBUILD
	extra/avahi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/flac/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libdmx/PKGBUILD
	extra/libfs/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxfixes/PKGBUILD
	extra/licq/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-guard/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pigeonhole/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/python/PKGBUILD
	extra/samba/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vde2/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/xscreensaver-libre/PKGBUILD

3 files changed, 11 insertions, 8 deletions

diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD
index dd35bcb2f..6345b3475 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' 'mips64el')
 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 --build=$CHOST
+  sed -i "s|/sbin|/bin|g" src/install/install.sh.in
+
+  ./configure --prefix=/usr --sbindir=/usr/bin --build=$CHOST \
+    --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