Updated nxagent

5 files changed, 106 insertions, 4 deletions

diff --git a/net-misc/nx-x11/ChangeLog b/net-misc/nx-x11/ChangeLog
index 5ec007d97814..1ad708a9b037 100644
--- a/net-misc/nx-x11/ChangeLog
+++ b/net-misc/nx-x11/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2004/08/30 20:59:42 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/ChangeLog,v 1.3 2004/09/07 20:48:50 stuart Exp $
+
+*nx-x11-1.4.0-r1 (07 Sep 2004)
+
+  07 Sep 2004; Stuart Herbert <stuart@gentoo.org> +nx-x11-1.4.0-r1.ebuild,
+  nx-x11-1.4.0.ebuild:
+  Uses latest nxagent
 
   30 Aug 2004; Stuart Herbert <stuart@gentoo.org> nx-x11-1.4.0.ebuild:
   Fixed use of incorrect version of nxcomp
diff --git a/net-misc/nx-x11/Manifest b/net-misc/nx-x11/Manifest
index db9f13133dbc..1341837eb49d 100644
--- a/net-misc/nx-x11/Manifest
+++ b/net-misc/nx-x11/Manifest
@@ -1,4 +1,6 @@
 MD5 d1d11920d13db4c0655511db6b5f2616 ChangeLog 482
 MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
-MD5 13eb5a592e504d91f6bf22a02efc342a nx-x11-1.4.0.ebuild 2426
+MD5 66f2633a800e2243d4e221f4435c760d nx-x11-1.4.0.ebuild 2429
+MD5 037520339b2e9cd66ab72c5ba85d6acf nx-x11-1.4.0-r1.ebuild 2429
 MD5 eb14e3a21decffbcb4e290c0419bbf3f files/digest-nx-x11-1.4.0 538
+MD5 6164854275d3f2f7c032776cabb5fca5 files/digest-nx-x11-1.4.0-r1 538
diff --git a/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r1 b/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r1
new file mode 100644
index 000000000000..6b9e40f84345
--- /dev/null
+++ b/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r1
@@ -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 1790feafa93c3ca58af117ab6f1f5bca nxcomp-1.3.2-4.tar.gz 432456
+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/nx-x11-1.4.0-r1.ebuild b/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..e6fae9308502
--- /dev/null
+++ b/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild
@@ -0,0 +1,86 @@
+# 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 $
+
+MY_PN="${PN//x11/X11}"
+MY_PV="${PV}-3"
+DESCRIPTION="This is a sample skeleton ebuild file"
+HOMEPAGE="http://www.nomachine.com/developers/"
+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.3.2-4.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_BASE2/${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}
+}
+
+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
+
+	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"
+}
diff --git a/net-misc/nx-x11/nx-x11-1.4.0.ebuild b/net-misc/nx-x11/nx-x11-1.4.0.ebuild
index d38e9b2eeab0..6fd35cee3768 100644
--- a/net-misc/nx-x11/nx-x11-1.4.0.ebuild
+++ b/net-misc/nx-x11/nx-x11-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2004/08/30 20:59:42 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0.ebuild,v 1.3 2004/09/07 20:48:50 stuart Exp $
 
 MY_PN="${PN//x11/X11}"
 MY_PV="${PV}-3"
@@ -61,7 +61,7 @@ src_compile() {
 src_install() {
 	into /usr/NX
 
-	dobin programs/Xserver/nxagent
+	dobin programs/Xserver/hw/nxagent
 	dobin programs/nxauth/nxauth
 	dobin ../nxviewer/nxviewer/nxviewer
 	dobin ../nxviewer/nxpasswd/nxpasswd