new revision that closes bug #946. It uses some patches that enable it to work well with the kdevelop

documentation.

5 files changed, 68 insertions, 45 deletions

diff --git a/net-www/htdig/ChangeLog b/net-www/htdig/ChangeLog
index a7ce4e88a314..a26ef55b28cb 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.1 2002/02/01 21:53:36 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/htdig/ChangeLog,v 1.2 2002/03/07 20:00:48 danarmak Exp $
+
+*htdig-3.1.5-r2 (7 Mar 2002)
+
+  7 Mar 2002; Dan Armak <danarmak@gentoo.org> Changelog:
+  
+  Added patches to make htdig work with kdevelop. This si only a temporary remedy and 
+  a big overhaul of the ebuild will come as soon as there's a new maintainer (not me!).
+  This closes bug #946.
 
 *htdig-3.1.5-r1 (1 Feb 2002)
 
diff --git a/net-www/htdig/files/digest-htdig-3.1.5-r1 b/net-www/htdig/files/digest-htdig-3.1.5-r1
deleted file mode 100644
index 9808e371a3eb..000000000000
--- a/net-www/htdig/files/digest-htdig-3.1.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cbf4a0f2b703d9822db555a14dc96ed3 htdig-3.1.5.tar.gz 1960580
diff --git a/net-www/htdig/files/digest-htdig-3.1.5-r2 b/net-www/htdig/files/digest-htdig-3.1.5-r2
new file mode 100644
index 000000000000..b8ec447d2f8d
--- /dev/null
+++ b/net-www/htdig/files/digest-htdig-3.1.5-r2
@@ -0,0 +1,3 @@
+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/htdig-3.1.5-r1.ebuild b/net-www/htdig/htdig-3.1.5-r1.ebuild
deleted file mode 100644
index 7614ac50459a..000000000000
--- a/net-www/htdig/htdig-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,43 +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-r1.ebuild,v 1.2 2001/05/28 14:32:32 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="WWW index and searching system"
-SRC_URI="http://www.htdig.org/files/${A}"
-HOMEPAGE="http://www.htdig.org"
-
-DEPEND="virtual/glibc
-        >=sys-devel/gcc-2.95.2
-	>=sys-libs/zlib-1.1.3"
-
-src_unpack() {
-  unpack ${A}
-  cp ${FILESDIR}/CONFIG.in ${S}
-}
-
-src_compile() {
-
-    cd ${S}
-    try ./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
-    try make
-
-}
-
-src_install () {
-
-    cd ${S}
-    try 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
-    dosed /etc/httpd/htdig.conf /usr/bin/rundig
-    dodoc ChangeLog COPYING README
-
-}
-
diff --git a/net-www/htdig/htdig-3.1.5-r2.ebuild b/net-www/htdig/htdig-3.1.5-r2.ebuild
new file mode 100644
index 000000000000..44843a1d6d60
--- /dev/null
+++ b/net-www/htdig/htdig-3.1.5-r2.ebuild
@@ -0,0 +1,56 @@
+# 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.1 2002/03/07 20:00:49 danarmak Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="HTTP/HTML indexing and searching system"
+SRC_URI="http://www.htdig.org/files/${P}.tar.gz
+	 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
+
+}
+
+