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, 16 insertions, 11 deletions

diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD
index 818087e98..304458770 100644
--- a/core/man-db/PKGBUILD
+++ b/core/man-db/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 166836 2012-09-19 19:45:35Z andyrtr $
+# $Id: PKGBUILD 186047 2013-05-20 18:28:50Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
 
 pkgname=man-db
 pkgver=2.6.3
-pkgrel=1
+pkgrel=3
 pkgdesc="A utility for reading man pages"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/man-db/"
 license=('GPL' 'LGPL')
 groups=('base')
-depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline')
-optdepends=('less' 'gzip')
+depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline' 'less')
+optdepends=('gzip')
 backup=('etc/man_db.conf'
-	'etc/cron.daily/man-db')
+	    'etc/cron.daily/man-db')
 conflicts=('man')
 provides=('man')
 replaces=('man')
@@ -22,21 +22,26 @@ source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig
         convert-mans man-db.cron.daily)
 options=('!libtool')
 md5sums=('a593a095599ae97bcacf8d038659a146'
-         '64975c20b1a6453f9b860ff7f916bcf1'
+         'SKIP'
          '2b7662a7d5b33fe91f9f3e034361a2f6'
-         'd30c39ae47560304471b5461719e0f03')
+         '934fd047fecb915038bf4bf844ea609c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
+  ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+	--with-db=gdbm \
+	--disable-setuid \
+	--enable-mandirs=GNU \
 	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"
   make
 }
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make check
+  make -k check
 }
 
 package() {
diff --git a/core/man-db/man-db.cron.daily b/core/man-db/man-db.cron.daily
index 53e66e1e9..9b4abd894 100755
--- a/core/man-db/man-db.cron.daily
+++ b/core/man-db/man-db.cron.daily
@@ -12,7 +12,7 @@ IONICE_PRIORITY=7
 UPDATEMANDB="/usr/bin/mandb --quiet"
 
 # Update the "whatis" database
-#/usr/sbin/makewhatis -u -w
+#/usr/bin/makewhatis -u -w
 
 # taken from Debian
 # man-db cron daily