2X server install cleanup, part 2

svn path=/testing/; revision=163

3 files changed, 22 insertions, 13 deletions

diff --git a/net-misc/nxserver-2xterminalserver/Manifest b/net-misc/nxserver-2xterminalserver/Manifest
index 595fe1b..6a2acff 100644
--- a/net-misc/nxserver-2xterminalserver/Manifest
+++ b/net-misc/nxserver-2xterminalserver/Manifest
@@ -31,10 +31,14 @@ MD5 1eb7778fcae558d88ca6a16dc85e58e7 files/1.5.0/nxserver-2xterminalserver-1.5.0
 RMD160 1399d4e0a1e2da8f1e2c9203465bece738be6452 files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2775
 SHA256 f521231e67fe9e9aa1cbaa82a679483b5c4cdc01aac27b02cd72d5de350edfc6 files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2775
 DIST linuxterminalserver-1.5.0-r21-src.tar.gz 112952553 RMD160 0e0e96243419d03b5d290ebba286b61b06edc75e SHA1 0a3e9c0babdeaafe36e72d139c1eed19ddb86921 SHA256 e0b48e4f917cb84115c2c653f88aa33d3915901fff0a6cb2e779066c54b269d5
-EBUILD nxserver-2xterminalserver-1.5.0.ebuild 4895 RMD160 f5782559e7ca45c5cd26e725292e0f44000f4984 SHA1 17295d49a8f50b294a1feeebf629bccb9a5f8349 SHA256 e14713359c2a33a874c34096804bed89a66c4c51fd4e799c781470aa1abab336
-MD5 d3d9bfd9386cf568de105e8f279180ae nxserver-2xterminalserver-1.5.0.ebuild 4895
-RMD160 f5782559e7ca45c5cd26e725292e0f44000f4984 nxserver-2xterminalserver-1.5.0.ebuild 4895
-SHA256 e14713359c2a33a874c34096804bed89a66c4c51fd4e799c781470aa1abab336 nxserver-2xterminalserver-1.5.0.ebuild 4895
+EBUILD nxserver-2xterminalserver-1.5.0.ebuild 5052 RMD160 5318249081d35263e4ba51ba114cd80f28328733 SHA1 54d66ce921e1229fc80ebd4e9eed6fc38ded1630 SHA256 ad1a61ca3f84ab21dbfbdce206af32e627f1e7023b8569df99f30ed929a32322
+MD5 23bb7a903ae4f39fcf55ed50aa18f1f9 nxserver-2xterminalserver-1.5.0.ebuild 5052
+RMD160 5318249081d35263e4ba51ba114cd80f28328733 nxserver-2xterminalserver-1.5.0.ebuild 5052
+SHA256 ad1a61ca3f84ab21dbfbdce206af32e627f1e7023b8569df99f30ed929a32322 nxserver-2xterminalserver-1.5.0.ebuild 5052
+MISC .nxserver-2xterminalserver-1.5.0.ebuild.swp 16384 RMD160 2620396727a171a40b91476214cc9e688fb9ba4a SHA1 3c449cfa9c468b46d30146d2bba5fe015f0a1672 SHA256 fafdd78832d5bd0650eeb8ddf43582f542ca2ba7294e116e3644d76400c30237
+MD5 85c4582de6b2611905513b4f5cd91628 .nxserver-2xterminalserver-1.5.0.ebuild.swp 16384
+RMD160 2620396727a171a40b91476214cc9e688fb9ba4a .nxserver-2xterminalserver-1.5.0.ebuild.swp 16384
+SHA256 fafdd78832d5bd0650eeb8ddf43582f542ca2ba7294e116e3644d76400c30237 .nxserver-2xterminalserver-1.5.0.ebuild.swp 16384
 MD5 9ce3d064f488428d2ca91d7fddbd898f files/digest-nxserver-2xterminalserver-1.5.0 310
 RMD160 9863e56c29cc5e2c78c52e616149f338bc192306 files/digest-nxserver-2xterminalserver-1.5.0 310
 SHA256 827043de6eaf9a30d0256b9479470b9bb20d2deb9bf5dc82c1d9eb9e02ec047b files/digest-nxserver-2xterminalserver-1.5.0 310
diff --git a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
index 4269caa..3b7f1f3 100644
--- a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
+++ b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
@@ -89,9 +89,12 @@ src_compile() {
 	./configure || die
 	make setversion
 	make nxnode.pl nxserver.pl || die
+	perl MakeConfigFile.pl DEBIAN > node-gentoo.cfg.sample
 }
 
 src_install() {
+	NODE_SRC=${S}/server/nxnode/src
+
 	# Main binaries
 	into /usr/NX
 	dobin ${S}/common/nx-X11/programs/Xserver/nxagent
@@ -109,8 +112,9 @@ src_install() {
 	fi
 
 	# Libraries
-	cp -P common/nxcompext/libXcompext.so* \
-		common/nx-X11/lib/X11/libX11.so* ${D}/usr/NX/lib || die
+	dodir /usr/NX/lib
+	cp -P ${S}/common/nxcompext/libXcompext.so* \
+		${S}/common/nx-X11/lib/X11/libX11.so* ${D}/usr/NX/lib || die
 	# And helper scripts
 	exeinto /usr/NX/scripts
 	newexe ${S}/server/nxnode/bin/nxnodeenv.sh nxenv.sh
@@ -123,22 +127,22 @@ src_install() {
 	doexe ${S}/server/nxnode/bin/nxuseradd.sh
 
 	# The server itself (and wrappers and perl modules)
-	dobin ${S}/server/nxnode/src/nxnode.pl
-	dobin ${S}/server/nxnode/src/nxserver.pl
-
+	dobin ${NODE_SRC}/nxnode.pl
+	dobin ${NODE_SRC}/nxserver.pl
 	make_wrapper nxnode "perl -I/usr/NX/lib/perl /usr/NX/bin/nxnode.pl" /usr/NX/bin /usr/NX/lib /usr/NX/bin
 	make_wrapper nxserver "perl -I/usr/NX/lib/perl /usr/NX/bin/nxserver.pl" /usr/NX/bin /usr/NX/lib /usr/NX/bin
 
 	dodir /usr/NX/lib/perl
-	cd ${S}/server/nxnode/src
-	cp -RH *.pm Config Exception NXShellDialogs handlers nxstat ${D}/usr/NX/lib/perl || die
+	cp -RH ${NODE_SRC}/*.pm ${NODE_SRC}/Config ${NODE_SRC}/Exception \
+		${NODE_SRC}/NXShellDialogs ${NODE_SRC}/handlers ${NODE_SRC}/nxstat \
+		${D}/usr/NX/lib/perl/ || die
 
 	# etc, var, home, ...
 	dodir /usr/NX/etc/keys
-	perl MakeConfigFile.pl DEBIAN > ${D}/usr/NX/etc/node-gentoo.cfg.sample
 	for x in passwords users administrators; do
-		cp ../etc/${x} ${D}/usr/NX/etc/${x}.db.sample
+		cp ${S}/server/nxnode/etc/${x} ${D}/usr/NX/etc/${x}.db.sample
 	done
+	cp ${NODE_SRC}/node-gentoo.cfg.sample ${D}/usr/NX/etc/ || die
 
 	cp -R ${S}/server/nxnode/share ${D}/usr/NX || die
 	cp -R ${S}/server/nxnode/home ${D}/usr/NX || die
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
new file mode 100644
index 0000000..8bf4738
--- /dev/null
+++ b/profiles/use.local.desc
@@ -0,0 +1 @@
+net-misc/nxserver-2xterminalserver:vnc - Add support for vnc to remote servers