Bug fixes

6 files changed, 137 insertions, 6 deletions

diff --git a/net-misc/nx-x11/ChangeLog b/net-misc/nx-x11/ChangeLog
index 1ad708a9b037..aecf87a917df 100644
--- a/net-misc/nx-x11/ChangeLog
+++ b/net-misc/nx-x11/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/nx-x11
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/ChangeLog,v 1.3 2004/09/07 20:48:50 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/ChangeLog,v 1.4 2004/09/12 09:28:14 stuart Exp $
+
+*nx-x11-1.4.0-r2 (12 Sep 2004)
+
+  12 Sep 2004; Stuart Herbert <stuart@gentoo.org>
+  +files/nx-x11-1.4.0.xprint.patch, nx-x11-1.4.0-r1.ebuild,
+  +nx-x11-1.4.0-r2.ebuild:
+  Switched to using libXcomp-1.4.0 (for problem reported in the forums)
+  Corrected description (bug #62297)
+  Corrected homepage (bug #62297)
+  Fix for missing libXp (bug #63522)
 
 *nx-x11-1.4.0-r1 (07 Sep 2004)
 
diff --git a/net-misc/nx-x11/Manifest b/net-misc/nx-x11/Manifest
index f7c68160221a..bd33762da244 100644
--- a/net-misc/nx-x11/Manifest
+++ b/net-misc/nx-x11/Manifest
@@ -1,6 +1,9 @@
-MD5 853ab12f5400c1ee4e59f46bb8736536 ChangeLog 635
+MD5 75e856f5701c6499e277a06e630ee306 ChangeLog 985
 MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
 MD5 0b65ce6ab6116489fb06ca8851607f9a nx-x11-1.4.0.ebuild 2429
-MD5 148f9e87a6fdaed54860af85a452a33e nx-x11-1.4.0-r1.ebuild 2429
+MD5 021ef1d57aeb5ed60d8500f59f99c8b7 nx-x11-1.4.0-r1.ebuild 2536
+MD5 4361c5c3e668b6ae9731316576a18343 nx-x11-1.4.0-r2.ebuild 2589
 MD5 eb14e3a21decffbcb4e290c0419bbf3f files/digest-nx-x11-1.4.0 538
 MD5 6164854275d3f2f7c032776cabb5fca5 files/digest-nx-x11-1.4.0-r1 538
+MD5 fabad2586a6b5100bedc1c5bc5ef2c44 files/digest-nx-x11-1.4.0-r2 539
+MD5 d2caae40bdf5748d68ca46ad1d0ec951 files/nx-x11-1.4.0.xprint.patch 341
diff --git a/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r2 b/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r2
new file mode 100644
index 000000000000..6fdc98480b92
--- /dev/null
+++ b/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r2
@@ -0,0 +1,8 @@
+MD5 9ea3175d3c7ba81603aef53528ba00af nx-X11-1.4.0-3.tar.gz 32306338
+MD5 d15c60ecec428da9e6c6d9650bd4c4db nxagent-1.4.0-47.tar.gz 302273
+MD5 ea3b8b2b1b31c8cb33b47821ee1958a3 nxauth-1.4.0-1.tar.gz 23085
+MD5 3c45afe2a911468a2b07f69fd7123a59 nxcomp-1.4.0-23.tar.gz 452882
+MD5 ab12f1f32329f5da0f53dd0969fe897e nxcompext-1.4.0-3.tar.gz 111409
+MD5 1a323b08280863efbcd8ba0cc8197f22 nxviewer-1.4.0-2.tar.gz 84443
+MD5 adfc84a6a6ccd1a6b3b8ff4212b34980 nxdesktop-1.4.0-36.tar.gz 223822
+MD5 b30d7d94e6d98bb503750bab77c19295 nxesd-1.4.0-1.tar.gz 621023
diff --git a/net-misc/nx-x11/files/nx-x11-1.4.0.xprint.patch b/net-misc/nx-x11/files/nx-x11-1.4.0.xprint.patch
new file mode 100644
index 000000000000..4c0c3ba140e0
--- /dev/null
+++ b/net-misc/nx-x11/files/nx-x11-1.4.0.xprint.patch
@@ -0,0 +1,11 @@
+--- config/cf/X11.tmpl.orig	2004-09-12 09:57:39.081261320 +0100
++++ config/cf/X11.tmpl	2004-09-12 09:57:57.543454640 +0100
+@@ -469,7 +469,7 @@
+ #endif
+ #endif
+ #ifndef BuildXprintLib
+-#define BuildXprintLib		(BuildXprint && !BuildServersOnly)
++#define BuildXprintLib		YES
+ #endif
+ #ifndef BuildScreenSaverExt
+ #define BuildScreenSaverExt	NO
diff --git a/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild b/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild
index e6fae9308502..08ec5016b8c2 100644
--- a/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild
+++ b/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild,v 1.1 2004/09/07 20:48:50 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild,v 1.2 2004/09/12 09:28:14 stuart Exp $
+
+inherit eutils
 
 MY_PN="${PN//x11/X11}"
 MY_PV="${PV}-3"
-DESCRIPTION="This is a sample skeleton ebuild file"
-HOMEPAGE="http://www.nomachine.com/developers/"
+DESCRIPTION="Special version of the X11 libraries support NX compression technology"
+HOMEPAGE="http://www.nomachine.com/developers.php"
 URI_BASE="http://www.nomachine.com/download/snapshot/nxsources/"
 URI_BASE2="http://www.nomachine.com/download/nxsources/"
 SRC_NX_X11="${MY_PN}-${MY_PV}.tar.gz"
@@ -36,6 +38,9 @@ src_unpack() {
 	unpack ${SRC_NXVIEWER}
 	unpack ${SRC_NXDESKTOP}
 	unpack ${SRC_NXESD}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-${PV}.xprint.patch
 }
 
 src_compile() {
diff --git a/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild b/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..f7c745fc5d3b
--- /dev/null
+++ b/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild,v 1.1 2004/09/12 09:28:14 stuart Exp $
+
+inherit eutils
+
+MY_PN="${PN//x11/X11}"
+MY_PV="${PV}-3"
+DESCRIPTION="A special version of the X11 libraries supporting NX compression technology"
+HOMEPAGE="http://www.nomachine.com/developers.php"
+URI_BASE="http://www.nomachine.com/download/snapshot/nxsources/"
+URI_BASE2="http://www.nomachine.com/download/nxsources/"
+SRC_NX_X11="${MY_PN}-${MY_PV}.tar.gz"
+SRC_NXAGENT="nxagent-1.4.0-47.tar.gz"
+SRC_NXAUTH="nxauth-1.4.0-1.tar.gz"
+SRC_NXCOMP="nxcomp-1.4.0-23.tar.gz"
+SRC_NXCOMPEXT="nxcompext-1.4.0-3.tar.gz"
+SRC_NXVIEWER="nxviewer-1.4.0-2.tar.gz"
+SRC_NXDESKTOP="nxdesktop-1.4.0-36.tar.gz"
+SRC_NXESD="nxesd-1.4.0-1.tar.gz"
+SRC_URI="$URI_BASE/${SRC_NX_X11} $URI_BASE/${SRC_NXAGENT} $URI_BASE/${SRC_NXAUTH} $URI_BASE/${SRC_NXCOMP} $URI_BASE/${SRC_NXCOMPEXT} $URI_BASE/${SRC_NXVIEWER} $URI_BASE/${SRC_NXDESKTOP} $URI_BASE/${SRC_NXESD}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+#RESTRICT="nostrip"
+DEPEND="virtual/x11"
+#RDEPEND=""
+S=${WORKDIR}/${MY_PN}
+
+src_unpack() {
+	# we can't use ${A} because of bug #61977
+	unpack ${SRC_NX_X11}
+	unpack ${SRC_NXAGENT}
+	unpack ${SRC_NXAUTH}
+	unpack ${SRC_NXCOMP}
+	unpack ${SRC_NXCOMPEXT}
+	unpack ${SRC_NXVIEWER}
+	unpack ${SRC_NXDESKTOP}
+	unpack ${SRC_NXESD}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-${PV}.xprint.patch
+}
+
+src_compile() {
+	emake World || die "unable to build nx-11"
+
+	cd ../nxviewer
+	xmkmf || die "unable to create makefile for nxviewer"
+	emake World || die "unable to make nxviewer"
+
+	cd ../nxdesktop
+	./configure --prefix=/usr/NX --mandir=/usr/share/man --sharedir=/usr/share || die "Unable to configure nxdesktop"
+	emake || die "Unable to build nxdesktop"
+
+	return
+
+	# mxesd support will have to wait for a later release
+
+	cd ../nxesd
+	econf --prefix=/usr/NX || die "Unable to configure nxesd"
+	emake || die "Unable to build nxesd"
+}
+
+src_install() {
+	into /usr/NX
+
+	dobin programs/Xserver/nxagent
+	dobin programs/nxauth/nxauth
+	dobin ../nxviewer/nxviewer/nxviewer
+	dobin ../nxviewer/nxpasswd/nxpasswd
+	dobin ../nxdesktop/nxdesktop
+
+	dolib ../nxcomp/libXcomp.so
+	dolib ../nxcompext/libXcompext.so
+	dolib lib/X11/libX11.so
+	dolib lib/Xext/libXext.so
+	dolib lib/Xrender/libXrender.so
+
+	preplib /usr/NX
+
+	into /usr/X11R6/include
+	doins ../nxcomp/NX.h
+
+	dodir /var/lib/nxserver
+
+	return
+
+	# nxesd support will have to wait for a later release
+
+	cd ../nxesd
+	emake DESTDIR=${D} install || die "unable to install nxesd"
+}