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

2 files changed, 11 insertions, 10 deletions

diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD
index 5bee80902..fbdf3d48d 100644
--- a/core/xinetd/PKGBUILD
+++ b/core/xinetd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162234 2012-06-24 05:44:41Z tpowa $
+# $Id: PKGBUILD 186292 2013-05-24 07:53:31Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=xinetd
 pkgver=2.3.15
-pkgrel=2
+pkgrel=3
 pkgdesc="A secure replacement for inetd"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xinetd.org/"
@@ -13,30 +13,31 @@ optdepends=('perl: for xconv.pl script')
 backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services')
 source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz
         xinetd.conf
-        xinetd
         servers
         services
         xinetd.service)
 md5sums=('77358478fd58efa6366accae99b8b04c'
          'f109f699a07bc8cfb5791060f5e87f9e'
-         'ea37a2794f202e6b953d9b6956dad16a'
          '21f47b4aa20921cfaddddd9f9a407f81'
          '9fa2061dc7dd738c8424251deb86f81e'
-         '08466ed714ea8ba42ad81f6fb3aa62e7')
+         '38be35b6e7146dc59902e243d9063b4c')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   sed -i "s#${prefix}/man#${prefix}/share/man#" configure
-  ./configure --prefix=/usr --without-libwrap \
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --sbindir=/usr/bin --without-libwrap \
               --build=${CHOST} --host=${CHOST}
   make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
+  make prefix=$pkgdir/usr DAEMONDIR=$pkgdir/usr/bin install
   
-  install -Dm755 $srcdir/xinetd $pkgdir/etc/rc.d/xinetd
   install -Dm644 $srcdir/xinetd.conf $pkgdir/etc/xinetd.conf
   install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers
   install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services
diff --git a/core/xinetd/xinetd.service b/core/xinetd/xinetd.service
index c6f6271fd..1c587e291 100644
--- a/core/xinetd/xinetd.service
+++ b/core/xinetd/xinetd.service
@@ -3,7 +3,7 @@ Description=A secure replacement for inetd
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/xinetd -dontfork
+ExecStart=/usr/bin/xinetd -dontfork
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]