Fixing patch for online help. Closes #23985.

4 files changed, 60 insertions, 3 deletions

diff --git a/app-text/htmldoc/ChangeLog b/app-text/htmldoc/ChangeLog
index 2e52ad300ee0..995e12f61e4c 100644
--- a/app-text/htmldoc/ChangeLog
+++ b/app-text/htmldoc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/htmldoc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/ChangeLog,v 1.7 2003/02/15 07:18:03 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/ChangeLog,v 1.8 2003/07/08 21:04:57 mholzer Exp $
+
+*htmldoc-1.8.20-r1 (08 Jul 2003)
+
+  08 Jul 2003; Martin Holzer <mholzer@gentoo.org> htmldoc-1.8.20-r1.ebuild:
+  Fixing patch for online help. Closes #23985.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 62e16aea348e..0131ae1f677c 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,6 +1,7 @@
-MD5 dea0a62d085be3950a22fcce57992d4c ChangeLog 1129
+MD5 391dab33d8459237751e2ebdf5248414 ChangeLog 1290
 MD5 abe826fd46eac9003d74a37944e0f57c htmldoc-1.8.19.ebuild 831
-MD5 f509627b82f9151de7aca84815631e67 htmldoc-1.8.20-r1.ebuild 1372
+MD5 2901732d26ec1bbfe24d3b1573fe4838 htmldoc-1.8.20.ebuild 1149
+MD5 d4222d88c149b729bbc21869e719bba1 htmldoc-1.8.20-r1.ebuild 1378
 MD5 86ae7168499a7aed0980b69d04839ea7 files/digest-htmldoc-1.8.19 75
 MD5 4fd3b7ec1b30af0be9c2fd4695062c0c files/digest-htmldoc-1.8.20 77
 MD5 06678439bd4de915b822ec99aa90b426 files/fonts.diff 353
diff --git a/app-text/htmldoc/files/digest-htmldoc-1.8.20-r1 b/app-text/htmldoc/files/digest-htmldoc-1.8.20-r1
new file mode 100644
index 000000000000..d37a79e5a0b2
--- /dev/null
+++ b/app-text/htmldoc/files/digest-htmldoc-1.8.20-r1
@@ -0,0 +1 @@
+MD5 6cca08007f686b3bff07882f01162c47 htmldoc-1.8.20-1-source.tar.bz2 2314154
diff --git a/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild b/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild
new file mode 100644
index 000000000000..de11c3135478
--- /dev/null
+++ b/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild,v 1.1 2003/07/08 21:04:57 mholzer Exp $
+
+DESCRIPTION="Convert HTML pages into a PDF document"
+SRC_URI="ftp://ftp.easysw.com/pub/htmldoc/1.8.20/${P}-1-source.tar.bz2"
+HOMEPAGE="http://www.easysw.com/htmldoc/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc ppc"
+
+DEPEND="virtual/x11"
+RDEPEND=">=dev-libs/openssl-0.9.6e
+	>=x11-libs/fltk-1.0.11"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/fonts.diff || die "patch failed"
+	## fix path for online-help:
+	cp -a configure configure.org
+	cat configure.org |\
+		sed -e "s@^#define DOCUMENTATION \"\$prefix/share/doc/htmldoc\"@#define DOCUMENTATION \"\$prefix/share/doc/${PF}/html\"@" \
+		> configure
+}
+
+src_compile() {
+	econf \
+		--with-x \
+		--with-gui \
+		--with-openssl-libs=/usr/lib \
+		--with-openssl-includes=/usr/include/openssl
+	
+	# Add missing -lfltk_images to LIBS
+	mv Makedefs Makedefs.orig
+	sed -e 's/-lfltk /-lfltk -lfltk_images /g' \
+		Makedefs.orig > Makedefs || die "failed to detect -lfltk"
+
+	make || die
+}
+
+src_install() {
+	einstall
+
+	# Minor cleanups
+	mv ${D}/usr/share/doc/htmldoc ${D}/usr/share/doc/${PF}
+	dodir /usr/share/doc/${P}/html
+	mv ${D}/usr/share/doc/${P}/*.html ${D}/usr/share/doc/${PF}/html
+}