closes bug 4603

6 files changed, 37 insertions, 39 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index be84419d254e..6825120b766a 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.5 2002/07/09 11:23:14 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.6 2002/07/12 20:40:42 g2boojum Exp $
+
+*tightvnc-1.2.3-r2 (12 Jul 2002)
+
+  12 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+
+  closes bug #4603; thanks to Ivan C.
 
 *tightvnc-1.2.3-r1 (3 June 2002)
 
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.3-r1 b/net-misc/tightvnc/files/digest-tightvnc-1.2.3-r1
deleted file mode 100644
index eef258320fd2..000000000000
--- a/net-misc/tightvnc/files/digest-tightvnc-1.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 35a2561f83eeabec7b0c91c251fbcfb4 tightvnc-1.2.3_unixsrc.tar.bz2 1688195
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.3 b/net-misc/tightvnc/files/digest-tightvnc-1.2.3-r2
index eef258320fd2..eef258320fd2 100644
--- a/net-misc/tightvnc/files/digest-tightvnc-1.2.3
+++ b/net-misc/tightvnc/files/digest-tightvnc-1.2.3-r2
diff --git a/net-misc/tightvnc/files/tightvnc-gentoo.diff b/net-misc/tightvnc/files/tightvnc-gentoo.diff
new file mode 100644
index 000000000000..4dc5dac14bc3
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-gentoo.diff
@@ -0,0 +1,18 @@
+--- vncserver	Wed Mar 20 00:40:46 2002
++++ vncserver-gentoo	Sat Jul  6 10:38:22 2002
+@@ -35,12 +35,12 @@
+ $geometry = "1024x768";
+ $depth = 24;
+ $desktopName = "X";
+-$vncClasses = "/usr/local/vnc/classes";
++$vncClasses = "/usr/share/tightvnc/classes";
+ $vncUserDir = "$ENV{HOME}/.vnc";
+-$fontPath = "unix/:7100";
++#$fontPath = "unix/:7100";
+ 
+ # Here is another example of setting the font path:
+-# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
++$fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
+ 
+ # X colors database path is optional, uncomment and edit to use:
+ # $colorPath = "/usr/lib/X11/rgb";
diff --git a/net-misc/tightvnc/tightvnc-1.2.3-r1.ebuild b/net-misc/tightvnc/tightvnc-1.2.3-r2.ebuild
index 2f8ea73590c8..daed31f5cf70 100644
--- a/net-misc/tightvnc/tightvnc-1.2.3-r1.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.2.3-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.3-r1.ebuild,v 1.5 2002/07/11 06:30:49 drobbins Exp $
+# Author Bart Verwilst <verwilst@gentoo.org>
+# Modified by Ivan C.  <navi_@hotmail.com>
+# $ Header: $
 
 S="${WORKDIR}/vnc_unixsrc"
 DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
@@ -33,6 +35,14 @@ src_install() {
 	mkdir -p ${D}/usr/man
 	mkdir -p ${D}/usr/man/man1
 	mkdir -p ${D}/usr/bin
-	./vncinstall ${D}/usr/bin ${D}/usr/man || die
 
+	# fix the web based interface, it needs the java class files
+	mkdir -p ${D}/usr/share/tightvnc
+	mkdir -p ${D}/usr/share/tightvnc/classes
+	insinto /usr/share/tightvnc/classes ; doins classes/*
+
+	# and then patch vncserver to point to /usr/share/tightvnc/classes
+	patch -p0 < ${FILESDIR}/tightvnc-gentoo.diff || die
+
+	./vncinstall ${D}/usr/bin ${D}/usr/man || die
 }
diff --git a/net-misc/tightvnc/tightvnc-1.2.3.ebuild b/net-misc/tightvnc/tightvnc-1.2.3.ebuild
deleted file mode 100644
index ab277ec63a82..000000000000
--- a/net-misc/tightvnc/tightvnc-1.2.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.3.ebuild,v 1.4 2002/07/11 06:30:49 drobbins Exp $
-
-S="${WORKDIR}/vnc_unixsrc"
-DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
-SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2"
-HOMEPAGE="http://www.tightvnc.com"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-SLOT="0"
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.1.0
-	>=sys-devel/perl-5.6.1
-	>=sys-libs/zlib-1.1.4"
-
-RDEPEND=$DEPEND
-
-src_compile() {
-
-	cd ${S}
-	xmkmf || die
-	make World || die
-	cd Xvnc
-	make World || die
-
-}
-
-src_install() {
-
-	cd ${S}
-	mkdir -p ${D}/usr/bin
-	./vncinstall ${D}/usr/bin || die
-
-}