--- /home/pacman/abs/extra/system/mlocate/PKGBUILD	2006-12-03 09:46:02.000000000 +0000
+++ PKGBUILD	2007-04-08 23:21:59.000000000 +0100
@@ -4,23 +4,23 @@
 
 pkgname=mlocate
 pkgver=0.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Faster merging drop-in for slocate"
 arch=(i686 x86_64)
 url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate"
 license="GPL"
 conflicts=('slocate')
 depends=('glibc')
-backup=('etc/updatedb.conf' 'usr/var/mlocate/mlocate.db')
+backup=('etc/updatedb.conf')
 install=mlocate.install
 source=(http://people.redhat.com/mitr/mlocate/mlocate-$pkgver.tar.gz \
-	updatedb.conf updatedb.cron.daily mlocate.db)
+	updatedb.conf updatedb.cron.daily)
     
 build() {
   cd $startdir/src/$pkgname-$pkgver
 
   # Build!
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
   make || return 1
 
   # Set up a default updatedb.conf and a daily cronjob
@@ -29,12 +29,13 @@
 
   # Install Mlocate
   make DESTDIR=$startdir/pkg install
-  (cd $startdir/pkg/usr/bin && ln -sf locate slocate)
 
-  # Install dummy database - ensure permissions are correct
-  install -cD -m640 ../mlocate.db $startdir/pkg/usr/var/mlocate/mlocate.db
-  chmod 750 $startdir/pkg/usr/var/mlocate
+  cd "$startdir"/pkg
+  ln -sv locate usr/bin/slocate
+  chgrp -v 21 var/lib/mlocate usr/bin/locate
+  chmod -v 750 var/lib/mlocate
+  chmod -v 2755 usr/bin/locate
 }
 
 md5sums=('e650c1ec5e180c982c9f52ca9a289d61' '0b12d7a78c8fcbd5fea7f3c9dc55c1bd'\
-         'eee7f9db8c6145724313af6fd5fe9d66' 'd41d8cd98f00b204e9800998ecf8427e')
+         'eee7f9db8c6145724313af6fd5fe9d66')
--- /home/pacman/abs/extra/system/mlocate/mlocate.install	2006-04-07 14:19:34.000000000 +0100
+++ mlocate.install	2007-04-08 23:21:09.000000000 +0100
@@ -1,9 +1,6 @@
 # arg 1:  the new package version
 post_install() {
-  sbin/ldconfig -r . &>/dev/null
-  usr/sbin/groupadd -g 21 mlocate &>/dev/null
-  chown root:mlocate /usr/var/mlocate /usr/var/mlocate/mlocate.db /usr/bin/locate
-  chmod 2711 /usr/bin/locate
+  post_upgrade "$1" "$1"
   echo "mlocate command is technically locate, but slocate is symlinked and still works."
   echo "You should now run updatedb as root."
 }
@@ -12,8 +9,6 @@
 # arg 2:  the old package version
 post_upgrade() {
   usr/sbin/groupadd -g 21 mlocate &>/dev/null
-  chown root:mlocate /usr/var/mlocate /usr/var/mlocate/mlocate.db /usr/bin/locate
-  chmod 2711 /usr/bin/locate
 }
 
 # arg 1:  the old package version