6 files changed, 121 insertions, 4 deletions
diff --git a/app-text/tkman/ChangeLog b/app-text/tkman/ChangeLog
index 01dcd31a971d..80a72b1e9812 100644
--- a/app-text/tkman/ChangeLog
+++ b/app-text/tkman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/tkman
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tkman/ChangeLog,v 1.10 2003/11/01 08:00:15 brandy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tkman/ChangeLog,v 1.11 2003/12/07 12:39:17 lanius Exp $
+
+*tkman-2.2 (07 Dec 2003)
+
+  07 Dec 2003; Heinrich Wendel <lanius@gentoo.org> tkman-2.2.ebuild,
+  files/tkman-2.2-gentoo.diff, files/tkman.desktop:
+  bump
 
   01 Nov 2003; Brandy Westcott brandy@gentoo.org tkman-2.1-r1.ebuild:
   Fix incompatibility between groff-1.18.x and tkman.
diff --git a/app-text/tkman/Manifest b/app-text/tkman/Manifest
index 64d5453e882f..f54edbf6ce53 100644
--- a/app-text/tkman/Manifest
+++ b/app-text/tkman/Manifest
@@ -1,11 +1,11 @@
-MD5 15cf28b423fd418773cd1d431848ffeb tkman-2.2.ebuild 881
+MD5 45d2a5ec86fe311befe73b0d72f60819 tkman-2.2.ebuild 878
 MD5 56ac7454c382f740960b74bcb2828b78 tkman-2.1-r1.ebuild 894
 MD5 6025486be014b98fce8a18e2b7e254c6 tkman-2.1.ebuild 687
-MD5 3ab55a4d8d93a1c8535f4cbd26561977 ChangeLog 1066
+MD5 8db27f3e354aee3b0fff1f7c42fbf856 ChangeLog 1221
 MD5 6dc154cf725411019c116b98964cf4b1 files/digest-tkman-2.1 57
 MD5 2f9ec15dc7adfb43f6d12d38464492ab files/digest-tkman-2.2 61
 MD5 f3de4484b7c0f0ab66c744133fd44897 files/tkman-2.1-r1-gentoo.diff 2497
-MD5 02104763dfaac403e43f585decd81749 files/tkman-2.2.-gentoo.diff 1791
 MD5 719b88e835a3a6a36336e60822f5bd8e files/tkman-2.1-gentoo.diff 2500
+MD5 717278de4baf51d3c2dbffc25d655202 files/tkman-2.2-gentoo.diff 2311
 MD5 6dc154cf725411019c116b98964cf4b1 files/digest-tkman-2.1-r1 57
 MD5 9ab3ff04efb292dcd9ea297bd290eb80 files/tkman.desktop 160
diff --git a/app-text/tkman/files/digest-tkman-2.2 b/app-text/tkman/files/digest-tkman-2.2
new file mode 100644
index 000000000000..be57b06d6825
--- /dev/null
+++ b/app-text/tkman/files/digest-tkman-2.2
@@ -0,0 +1 @@
+MD5 0e81735c93ab2500d6105ff33095c3e8 tkman-2.2.tar.gz 229273
diff --git a/app-text/tkman/files/tkman-2.2-gentoo.diff b/app-text/tkman/files/tkman-2.2-gentoo.diff
new file mode 100644
index 000000000000..426cf5445c12
--- /dev/null
+++ b/app-text/tkman/files/tkman-2.2-gentoo.diff
@@ -0,0 +1,62 @@
+--- tkman-2.2/Makefile.org	2003-12-07 13:26:37.642164439 +0100
++++ tkman-2.2/Makefile	2003-12-07 13:30:39.135540314 +0100
+@@ -25,13 +25,13 @@
+ 
+ ### you need to localize the paths on these lines
+ 
+-WISH = /usr/local/bin/wish8.4
++WISH = /usr/bin/wish
+ #WISH = /usr/sww/tcl-8.4/bin/wish
+ #WISH = /private/share/bin/wish8.4
+ 
+ # the executable `tkman' is placed in BINDIR
+ # this should be a directory that's in your bin PATH
+-BINDIR = /usr/local/bin
++BINDIR = /usr/bin
+ #BINDIR = /private/share/bin
+ 
+ 
+@@ -80,7 +80,7 @@
+ # will examine for matches if a search in the usual locations fails while searching
+ # for a man pages and displaying its associated binaries (if any).
+ # Use this feature carefully as a large number of directories can slow down startup.
+-mastermen = "/usr/man /usr/local/man"
++mastermen = "/usr/share/man /usr/local/man"
+ #mastermen = "/usr/man /usr/local/man /usr/sww/man /usr/share/man /usr/kerberos/man"
+ masterbin = "/usr/bin /usr/local/bin"
+ #masterbin = "/usr/bin /usr/local/bin /usr/sww/bin /usr/sww/share/bin /usr/sww/share/X11R5/bin"
+@@ -203,7 +203,7 @@
+ # BY DEFAULT OFF
+ glimpse = ""
+ # Glimpse on, with Boolean scope set to entire file
+-glimpse = "glimpse -W"
++#glimpse = "glimpse -W"
+ # give the full path, if you'd like
+ #glimpse = /usr/sww/bin/glimpse
+ # variations (refer to the Glimpse manual page)
+@@ -228,11 +228,11 @@
+ #glimpseindex = "glimpseindex -o -B"
+ # To shorten most index build times by incrementally building index when possible.
+ # For me, this drops indexing time from ~25 minutes to ~3 minutes, depending
+-glimpseindex = "glimpseindex -o -B -f"
++#glimpseindex = "glimpseindex -o -B -f"
+ # -M 8 gives 8MB of main memory instead of default 2, which speeds up indexing, maybe
+ #glimpseindex = "glimpseindex -o -B -f -M 8"
+ # if you don't want give the power to index, disable glimpseindex here
+-#glimpseindex = ""
++glimpseindex = ""
+ #glimpseindex = "/usr/sww/bin/glimpseindex -o -B"
+ # compressed manual pages are handled automatically; don't add -z to above
+ 
+@@ -289,9 +289,9 @@
+ rman = rman
+ #rman = /usr/local/bin/rman
+ 
+-apropos = {man -k}
++#apropos = {man -k}
+ # Linux uses a shell script instead:
+-#apropos = apropos
++apropos = apropos
+ # if don't have apropos (maybe on Windoze)
+ #apropos = ""
+ 
diff --git a/app-text/tkman/files/tkman.desktop b/app-text/tkman/files/tkman.desktop
new file mode 100644
index 000000000000..3c34d5808df6
--- /dev/null
+++ b/app-text/tkman/files/tkman.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=TkMan
+Comment=Graphical man page and info viewer
+Exec=tkman
+Icon=TkMan.gif
+Terminal=false
+Type=Application
+Categories=Application;Utility
+
diff --git a/app-text/tkman/tkman-2.2.ebuild b/app-text/tkman/tkman-2.2.ebuild
new file mode 100644
index 000000000000..7d23a4926d6b
--- /dev/null
+++ b/app-text/tkman/tkman-2.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tkman/tkman-2.2.ebuild,v 1.1 2003/12/07 12:39:17 lanius Exp $
+
+DESCRIPTION="TkMan man and info page browser"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://tkman.sourceforge.net/"
+KEYWORDS="~x86 ~ppc ~sparc "
+SLOT="0"
+LICENSE="Artistic"
+IUSE=""
+
+DEPEND=">=app-text/rman-3.1
+	>=dev-lang/tcl-8.4
+	>=dev-lang/tk-8.4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${WORKDIR}
+	patch -p0 <${FILESDIR}/${PF}-gentoo.diff || die
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install () {
+	mkdir -p ${D}/usr/bin
+
+	make DESTDIR=${D} install || die
+
+	dodoc ANNOUNCE-tkman.txt CHANGES README-tkman manual.html
+
+	insinto /usr/share/icons
+	doins contrib/TkMan.gif
+
+	insinto /usr/share/applications
+	doins ${FILESDIR}/tkman.desktop
+}