slight cleanup

4 files changed, 40 insertions, 28 deletions

diff --git a/sys-apps/slocate/ChangeLog b/sys-apps/slocate/ChangeLog
index c42d6ab50668..27e69463f48f 100644
--- a/sys-apps/slocate/ChangeLog
+++ b/sys-apps/slocate/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for sys-apps/slocate
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.10 2003/04/12 11:15:36 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.11 2003/04/12 16:22:11 seemant Exp $
 
 *slocate-2.7 (02 Feb 2003)
 
+  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> slocate-2.7.ebuild,
+  files/updatedb.conf:
+  some cleanups, and install a blank config file with a note about the doc'd
+  sample config file
+
   12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
   slocate-2.6.ebuild, slocate-2.7.ebuild:
   added other arches
diff --git a/sys-apps/slocate/Manifest b/sys-apps/slocate/Manifest
index 25dc5faf7bcc..8c7ba1f041c1 100644
--- a/sys-apps/slocate/Manifest
+++ b/sys-apps/slocate/Manifest
@@ -1,6 +1,6 @@
-MD5 b5ad9cf72814da64197522583db5acf5 slocate-2.7.ebuild 1606
+MD5 deed52f5c90674617b64da43fdb30719 slocate-2.7.ebuild 1790
 MD5 c70139b84478e8c4a547eb310a9c8770 slocate-2.6.ebuild 1543
-MD5 1cd4fd9b4cdef1db4d3f8d8e676c0d86 ChangeLog 1053
+MD5 99cc61f71f28b7d894afc57dc457c056 ChangeLog 1247
 MD5 2831adc800599b2ae5ee340beafc4e31 files/digest-slocate-2.6 62
 MD5 f03ed3063ac796dbf26187038a928db8 files/digest-slocate-2.7 62
-MD5 f2c61fd26cb4497626447746ac9189c6 files/updatedb.conf 634
+MD5 cd00fa09325061c98ee3f81fefa61014 files/updatedb.conf 578
diff --git a/sys-apps/slocate/files/updatedb.conf b/sys-apps/slocate/files/updatedb.conf
index 611ac0398dbd..5be1c0889fa3 100644
--- a/sys-apps/slocate/files/updatedb.conf
+++ b/sys-apps/slocate/files/updatedb.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/files/updatedb.conf,v 1.2 2003/03/30 19:55:40 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/files/updatedb.conf,v 1.3 2003/04/12 16:22:11 seemant Exp $
 
 # This file sets environment variables which are used by updatedb
 
@@ -13,8 +13,3 @@ export PRUNEPATHS
 # netpaths which are added
 NETPATHS=""
 export NETPATHS
-
- netpaths which are added
-NETPATHS=""
-export NETPATHS
-
diff --git a/sys-apps/slocate/slocate-2.7.ebuild b/sys-apps/slocate/slocate-2.7.ebuild
index 518ed4793f39..f3b7a0773a57 100644
--- a/sys-apps/slocate/slocate-2.7.ebuild
+++ b/sys-apps/slocate/slocate-2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7.ebuild,v 1.5 2003/04/12 15:47:54 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7.ebuild,v 1.6 2003/04/12 16:22:11 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Secure locate provides a secure way to index and quickly search for files on your system (drop-in replacement for 'locate')"
@@ -14,29 +14,37 @@ KEYWORDS="x86 ppc sparc ~alpha ~hppa ~mips"
 DEPEND="virtual/glibc"
 
 src_install() {
-	# make install for this package is blocked by sandbox
-	dobin slocate
-	dosym /usr/bin/slocate /usr/bin/locate
-	dosym /usr/bin/slocate /usr/bin/updatedb
 
-	dodir /var/lib/slocate ; touch ${D}/var/lib/slocate/.keep
+	dodir /usr/share/man/man1
+
+	make DESTDIR=${D} install || die
 
-	insinto /etc/cron.daily
-        doins slocate.cron
-        fperms 0755 /etc/cron.daily/slocate.cron
+	# make install for this package is blocked by sandbox
+#	dobin slocate
+	dosym slocate /usr/bin/locate
+	dosym slocate /usr/bin/updatedb
+	fperms 0755 /etc/cron.daily/slocate.cron
+#
+#	dosym slocate.1.gz /usr/share/man/man1/locate.1.gz
+#
+	dodir /var/lib/slocate ; touch ${D}/var/lib/slocate/.keep
 
-	# man pages are already compressed for us
-	insinto /usr/share/man/man1
-	mv doc/slocate.1.linux.gz doc/slocate.1.gz
-	doins doc/slocate.1.gz doc/updatedb.1.gz
-	dosym /usr/share/man/man1/slocate.1.gz /usr/share/man/man1/locate.1.gz
+	touch ${D}/etc/updatedb.conf
 
 	dodoc INSTALL LICENSE COPYING AUTHORS NEWS README ChangeLog
+
+
+	# man page fixing
+	rm -rf ${D}/usr/share/man/man1/locate.1.gz
+	dosym slocate.1.gz /usr/share/man/man1/locate.1.gz
+
+	echo "# There is a sample config file in :" > updatedb.conf
+	echo "# /usr/share/doc/${P}/updatedb.conf.gz" >> updatedb.conf
+	insinto /etc
+	doins updatedb.conf
+	fperms 0644 /etc/updatedb.conf
+
 	dodoc ${FILESDIR}/updatedb.conf
-	einfo ""
-	einfo "You can find a sample config file in"
-	einfo "/usr/share/doc/${P}/updatedb.conf.gz"
-	einfo ""
 }
 
 pkg_postinst() {
@@ -48,4 +56,8 @@ pkg_postinst() {
 
 	chown root.slocate /var/lib/slocate
 	chmod 0750 /var/lib/slocate
+
+	einfo "Please note that the /etc/updatedb.conf file is EMPTY"
+	einfo "There is a sample configuration file in"
+	einfo "/usr/share/doc/${P}"
 }