more fixes

3 files changed, 31 insertions, 16 deletions

diff --git a/net-www/htdig/ChangeLog b/net-www/htdig/ChangeLog
index 2516999f30e0..36ad7bfb1031 100644
--- a/net-www/htdig/ChangeLog
+++ b/net-www/htdig/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-www/htdig
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/htdig/ChangeLog,v 1.6 2002/04/25 16:14:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/htdig/ChangeLog,v 1.7 2002/05/22 22:51:14 seemant Exp $
+
+*htdig-3.1.6-r3 (22 May 2002)
+
+  22 May 2002; Seemant Kulleen <seemant@gentoo.org> htdig-3.1.6-r3.ebuild
+  files/digest-htdig-3.1.6-r3 :
+
+  Fixes the /var/htdig/db directory, and pkg_postinst() now runs the first
+  run of rundig.  Thanks to steve_flack@ntlworld.com (Steve Flack) in bug
+  #986.
 
 *htdig-3.1.6-r2 (25 Apr 2002)
 
diff --git a/net-www/htdig/files/digest-htdig-3.1.6 b/net-www/htdig/files/digest-htdig-3.1.6-r3
index a44fa14c97b5..a44fa14c97b5 100644
--- a/net-www/htdig/files/digest-htdig-3.1.6
+++ b/net-www/htdig/files/digest-htdig-3.1.6-r3
diff --git a/net-www/htdig/htdig-3.1.6.ebuild b/net-www/htdig/htdig-3.1.6-r3.ebuild
index ce1f625d318c..e3b2497247ee 100644
--- a/net-www/htdig/htdig-3.1.6.ebuild
+++ b/net-www/htdig/htdig-3.1.6-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/htdig/htdig-3.1.6.ebuild,v 1.1 2002/04/15 11:12:07 seemant Exp ${PN}/${PN}-3.1.5-r2.ebuild,v 1.2 2002/03/15 12:10:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/htdig/htdig-3.1.6-r3.ebuild,v 1.1 2002/05/22 22:51:24 seemant Exp ${PN}/${PN}-3.1.5-r2.ebuild,v 1.2 2002/03/15 12:10:18 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="HTTP/HTML indexing and searching system"
@@ -17,13 +17,10 @@ cd ${S}
 	./configure \
 		--prefix=/usr \
 		--with-config-dir=/etc/${PN} \
-		--with-image-dir=/home/httpd/htdocs/${PN} \
-		--with-search-dir=/home/httpd/htdocs/${PN} \
-		--with-cgi-bin-dir=/home/httpd \
+		--with-cgi-bin-dir=/home/httpd/cgi-bin \
 		--with-common-dir=/usr/share/${PN} \
-		--with-database-dir=/var/${PN} \
-		--with-image-dir=/home/httpd/images/${PN} \
-		--with-search-dir=/home/httpd/htdocs/${PN} \
+		--with-database-dir=/var/${PN}/db \
+		--with-image-dir=/home/httpd/htdocs/${PN} \
 		--with-default-config-file=/etc/${PN}/${PN}.conf \
 		|| die
 
@@ -34,17 +31,15 @@ cd ${S}
 src_install () {
 
 	make 	\
-		DESTDIR=${D} 	\
+		DESTDIR=${D} \
 		CONFIG_DIR=${D}/etc/${PN} \
-		IMAGE_DIR=${D}/home/httpd/htdocs/${PN} \
 		SEARCH_DIR=${D}/home/httpd/htdocs/${PN} \
-		CGIBIN_DIR=${D}/home/httpd \
+		CGIBIN_DIR=${D}/home/httpd/cgi-bin \
 		COMMON_DIR=${D}/usr/share/${PN} \
-		DATABASE_DIR=${D}/var/${PN} \
-		IMAGE_DIR=${D}/home/httpd/images/${PN} \
-		SEARCH_DIR=${D}/home/httpd/htdocs/htdig \
+		DATABASE_DIR=${D}/var/${PN}/db \
+		IMAGE_DIR=${D}/home/httpd/htdocs/${PN} \
 		DEFAULT_CONFIG_FILE=${D}/etc/${PN}/${PN}.conf \
-		exec_prefix=${D}/usr/bin \
+		exec_prefix=${D}/usr \
 		install || die
 	
 	dodoc ChangeLog COPYING README
@@ -53,6 +48,17 @@ src_install () {
 	insinto /etc/conf.d
 	doins installdir/htdig.conf
 	
-	dosed /etc/httpd/htdig.conf
+	dosed /etc/htdig/htdig.conf
 	dosed /usr/bin/rundig
+
+	touch ${D}/var/htdig/db/word2root.db 
+	touch ${D}/var/htdig/db/root2word.db
+
+}
+
+pkg_postinst() {
+	
+	einfo "Generating initial database"
+	rundig
+
 }