More install work (still lacks nxserver itself though)

svn path=/testing/; revision=141

2 files changed, 70 insertions, 16 deletions

diff --git a/net-misc/nxserver-2xterminalserver/Manifest b/net-misc/nxserver-2xterminalserver/Manifest
index 43701f4..1c622ba 100644
--- a/net-misc/nxserver-2xterminalserver/Manifest
+++ b/net-misc/nxserver-2xterminalserver/Manifest
@@ -43,10 +43,10 @@ MD5 a45d969ed6d2c7afe9d4097f31027f0f files/1.5.0/nxviewer-1.5.0-insitu.patch 203
 RMD160 8e0f91e1ce41e87b6a8f9d80ec83124780423152 files/1.5.0/nxviewer-1.5.0-insitu.patch 2034
 SHA256 f7b9a75ea81e0bb735fde26e7816ddf0cd3e9a77bf8ba1df9e7577f0a1f031fc files/1.5.0/nxviewer-1.5.0-insitu.patch 2034
 DIST linuxterminalserver-1.5.0-r21-src.tar.gz 112952553 RMD160 0e0e96243419d03b5d290ebba286b61b06edc75e SHA1 0a3e9c0babdeaafe36e72d139c1eed19ddb86921 SHA256 e0b48e4f917cb84115c2c653f88aa33d3915901fff0a6cb2e779066c54b269d5
-EBUILD nxserver-2xterminalserver-1.5.0.ebuild 2768 RMD160 4a04ca25336f7340c2250abd721c350694d3e387 SHA1 3ff19738e01844517632b6b82c795354be244a5c SHA256 b7692de4f58ddc8d9e747d6e5d77929309641202741dcc2b7ee2fd984909fc86
-MD5 6d99275d702aa017e7c9b53d970d091a nxserver-2xterminalserver-1.5.0.ebuild 2768
-RMD160 4a04ca25336f7340c2250abd721c350694d3e387 nxserver-2xterminalserver-1.5.0.ebuild 2768
-SHA256 b7692de4f58ddc8d9e747d6e5d77929309641202741dcc2b7ee2fd984909fc86 nxserver-2xterminalserver-1.5.0.ebuild 2768
+EBUILD nxserver-2xterminalserver-1.5.0.ebuild 4226 RMD160 5c8df2907555d3638142858186938914e85f7f30 SHA1 2c0985ba758428dc3cc3116c11893de624a59af0 SHA256 e65401f52c5eebc199732b1dd21ce4bd3b048a3cd0ae8eb61e598880e01243e4
+MD5 e884896e78cc633d7687095918f89944 nxserver-2xterminalserver-1.5.0.ebuild 4226
+RMD160 5c8df2907555d3638142858186938914e85f7f30 nxserver-2xterminalserver-1.5.0.ebuild 4226
+SHA256 e65401f52c5eebc199732b1dd21ce4bd3b048a3cd0ae8eb61e598880e01243e4 nxserver-2xterminalserver-1.5.0.ebuild 4226
 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 eb2341d..d385bf8 100644
--- a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
+++ b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.2x.com/release/linuxterminalserver/src/linuxterminalserver-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+IUSE="rdesktop vnc"
 
 # TODO: need cups?
 DEPEND="
@@ -27,8 +27,11 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"
 
-src_unpack()
-{
+pkg_preinst() {
+	enewuser nx -1 -1 /usr/NX/home/nx
+}
+
+src_unpack() {
 	unpack ${A}
 	
 	cd ${S}
@@ -133,13 +136,64 @@ build_nxserver()
 	emake || die
 }
 
-src_compile()
-{
-	build_nxagent || die
-	build_nxdesktop || die
-	build_nxviewer || die
-	build_nxspool || die
-	build_nxsensor || die
-	build_nxuexec || die
-	build_nxserver || die
+src_compile() {
+	build_nxagent
+	if use rdesktop; then
+		build_nxdesktop
+	fi
+	build_nxdesktop
+	if use vnc; then
+		build_nxviewer
+	fi
+	build_nxspool
+	build_nxsensor
+	build_nxuexec
+	build_nxserver
+}
+
+src_install() {
+	# Missing nxnode/nxserver
+	into /usr/NX/bin
+	dobin ${S}/common/nx-X11/programs/Xserver/hw/nxagent
+	dobin ${S}/server/nxsensor/nxsensor
+	#TODO: this one should be patched
+	dobin ${S}/server/nxnode/setup/nxsetup
+	newbin ${S}/server/nxspool/source/bin/smbspool nxspool
+	dobin ${S}/server/nxuexec/nxuexec
+
+	if use rdesktop; then
+		dobin ${S}/client/nxdesktop/nxdesktop
+	fi
+	if use vnc; then
+		dobin ${S}/server/nxviewer/nxviewer/nxviewer
+		dobin ${S}/server/nxviewer/nxpasswd/nxpasswd
+	fi
+
+	dodir /usr/NX/lib
+	cp -P common/nxcompext/libXcompext.so* ${D}/usr/NX/lib || die
+	
+	dodir /usr/NX/etc
+	#TODO
+
+	into /usr/NX/scripts
+	newbin ${S}/server/nxnode/bin/nxnodeenv.sh nxenv.sh
+	newbin ${S}/server/nxnode/bin/nxnodeenv.csh nxenv.csh
+	into /usr/NX/scripts/restricted
+	dobin ${S}/server/nxnode/bin/nxaddinitd.sh
+	dobin ${S}/server/nxnode/scripts/nxinit.sh
+	newbin ${S}/server/nxnode/bin/nxprinter.sh-LINUX nxprinter.sh
+	dobin ${S}/server/nxnode/bin/nxsessreg.sh
+	dobin ${S}/server/nxnode/bin/nxuseradd.sh
+
+	cp -R server/nxnode/share ${D}/usr/NX || die
+	cp -R home ${D}/usr/NX || die
+	#TODO: need to create var?
+
+}
+
+pkg_postinst() {
+	usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
+	usermod -d /usr/NX/home/nx nx || die "Unable to set home directory of nx user!!"
+	# only run install when no configuration file is found
+	#TODO
 }