cleanup

5 files changed, 68 insertions, 62 deletions

diff --git a/net-www/htdig/ChangeLog b/net-www/htdig/ChangeLog
index 8145b0441f1a..9cae6a5a053d 100644
--- a/net-www/htdig/ChangeLog
+++ b/net-www/htdig/ChangeLog
@@ -1,6 +1,14 @@
 # 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.4 2002/04/15 11:12:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/htdig/ChangeLog,v 1.5 2002/04/24 18:59:23 seemant Exp $
+
+*htdig-3.1.6-r1 (22 Apr 2002)
+
+  22 Apr 2002; Seemant Kulleen <seemant@gentoo.org> htdig-3.1.6-r1.ebuild
+  files/digest-htdig-3.1.6-r1:
+
+  stuart@palette.plala.or.jp (Stuart Bouyer) in bug report #1970 pointed
+  out that things were being installed into /usr/bin/bin instead of /usr/bin.
 
 *htdig-3.1.6 (15 Apr 2002)
 
diff --git a/net-www/htdig/files/digest-htdig-3.1.5-r2 b/net-www/htdig/files/digest-htdig-3.1.5-r2
deleted file mode 100644
index b8ec447d2f8d..000000000000
--- a/net-www/htdig/files/digest-htdig-3.1.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cbf4a0f2b703d9822db555a14dc96ed3 htdig-3.1.5.tar.gz 1960580
-MD5 99538310638935aff7cacc98b430f6bb htdig_3_1_x.diff.zip 1521
-MD5 c9b976f90a0f5cf68802770d0183c906 htdig_3_1_x_noindex.diff.zip 530
diff --git a/net-www/htdig/files/digest-htdig-3.1.6-r1 b/net-www/htdig/files/digest-htdig-3.1.6-r1
new file mode 100644
index 000000000000..a44fa14c97b5
--- /dev/null
+++ b/net-www/htdig/files/digest-htdig-3.1.6-r1
@@ -0,0 +1 @@
+MD5 7a2f20d8d6149efd8d119bb2ebf55f23 htdig-3.1.6.tar.gz 2068675
diff --git a/net-www/htdig/htdig-3.1.5-r2.ebuild b/net-www/htdig/htdig-3.1.5-r2.ebuild
deleted file mode 100644
index d2f2507187fd..000000000000
--- a/net-www/htdig/htdig-3.1.5-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2000 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.5-r2.ebuild,v 1.2 2002/03/15 12:10:18 danarmak Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="HTTP/HTML indexing and searching system"
-SRC_URI="http://www.htdig.org/files/${P}.tar.gz
-	 http://www.ibiblio.org/gentoo/htdig_3_1_x.diff.zip
-	 http://www.ibiblio.org/gentoo/htdig_3_1_x_noindex.diff.zip"
-	 #http://www.geocities.com/alexismikhailov/htdig_3_1_x.diff.zip
-	 #http://www.geocities.com/alexismikhailov/htdig_3_1_x_noindex.diff.zip
-HOMEPAGE="http://www.htdig.org"
-
-DEPEND="virtual/glibc
-        >=sys-devel/gcc-2.95.2
-	>=sys-libs/zlib-1.1.3
-	app-arch/unzip"
-
-src_unpack() {
-
-  unpack ${P}.tar.gz
-
-  cp ${FILESDIR}/CONFIG.in ${S}
-
-  cd ${S}
-  for x in htdig_3_1_{x,x_noindex}.diff.zip; do
-    cp ${DISTDIR}/${x} .
-    unzip ${x}  
-    patch -p1 < ${x//.zip}
-  done
-
-}
-
-src_compile() {
-
-    cd ${S}
-    ./configure --prefix=/usr --host=${CHOST} \
-	--with-cgi-bin-dir=/usr/bin \
-	--with-image-dir=/usr/local/httpd/images/htdig \
-	--with-search-dir=/usr/local/httpd/htdocs/htdig || die "died configuring"
-    emake || die "died making"
-
-}
-
-src_install () {
-
-    cd ${S}
-    make DESTDIR=${D} CGIBIN_DIR=${D}/usr/bin \
-	SEARCH_DIR=${D}/usr/local/httpd/htdocs/htdig \
-	IMAGE_DIR=${D}/usr/local/httpd/htdocs/images/htdig \
-	exec_prefix=${D}/usr install || die "died making install"
-    dosed /etc/httpd/htdig.conf /usr/bin/rundig
-    dodoc ChangeLog COPYING README
-
-}
-
-
diff --git a/net-www/htdig/htdig-3.1.6-r1.ebuild b/net-www/htdig/htdig-3.1.6-r1.ebuild
new file mode 100644
index 000000000000..dd611a0114f1
--- /dev/null
+++ b/net-www/htdig/htdig-3.1.6-r1.ebuild
@@ -0,0 +1,58 @@
+# 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-r1.ebuild,v 1.1 2002/04/24 18:59:23 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"
+SRC_URI="http://www.htdig.org/files/${P}.tar.gz"
+HOMEPAGE="http://www.htdig.org"
+
+DEPEND=">=sys-libs/zlib-1.1.3
+	app-arch/unzip"
+
+src_compile() {
+
+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-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-default-config-file=/etc/${PN}/${PN}.conf \
+		|| die
+
+	emake || die
+
+}
+
+src_install () {
+
+	make 	\
+		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 \
+		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 \
+		DEFAULT_CONFIG_FILE=${D}/etc/${PN}/${PN}.conf \
+		exec_prefix=${D}/usr \
+		install || die
+	
+	dodoc ChangeLog COPYING README
+	dohtml -r htdoc
+	
+	insinto /etc/conf.d
+	doins installdir/htdig.conf
+	
+	dosed /etc/httpd/htdig.conf
+	dosed /usr/bin/rundig
+}