Server mostly loads and installs now

svn path=/testing/; revision=142

3 files changed, 129 insertions, 25 deletions

diff --git a/net-misc/nxserver-2xterminalserver/Manifest b/net-misc/nxserver-2xterminalserver/Manifest
index 1c622ba..48f1c7c 100644
--- a/net-misc/nxserver-2xterminalserver/Manifest
+++ b/net-misc/nxserver-2xterminalserver/Manifest
@@ -38,15 +38,19 @@ AUX 1.5.0/nxserver-2xterminalserver-1.5.0-external-nxcomp.patch 4292 RMD160 96e7
 MD5 e57a3488bd3a8a2d5905038e89faa9a1 files/1.5.0/nxserver-2xterminalserver-1.5.0-external-nxcomp.patch 4292
 RMD160 96e7b372c9539b0c6041925ce28e86db9931b36b files/1.5.0/nxserver-2xterminalserver-1.5.0-external-nxcomp.patch 4292
 SHA256 895d3fddb8497bf2063f3ce8fe8c8b72e0309e912145747c2f472ba5cdf114a9 files/1.5.0/nxserver-2xterminalserver-1.5.0-external-nxcomp.patch 4292
+AUX 1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2579 RMD160 4844f44ad2533816ea0ad1e2744ff473c80fa2b5 SHA1 77b45fdd02df32efa1bcf033a6382ac69fff4fcc SHA256 0b915ebded83250f06fc3fc2ae93de676110b9a3e1bc49a10bb7372bae70fd3f
+MD5 532f9dcf1a887c60bfbdc395963840d4 files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2579
+RMD160 4844f44ad2533816ea0ad1e2744ff473c80fa2b5 files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2579
+SHA256 0b915ebded83250f06fc3fc2ae93de676110b9a3e1bc49a10bb7372bae70fd3f files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2579
 AUX 1.5.0/nxviewer-1.5.0-insitu.patch 2034 RMD160 8e0f91e1ce41e87b6a8f9d80ec83124780423152 SHA1 a8286e4aafe5a874a6fb2bfb73ae8b2aea848c26 SHA256 f7b9a75ea81e0bb735fde26e7816ddf0cd3e9a77bf8ba1df9e7577f0a1f031fc
 MD5 a45d969ed6d2c7afe9d4097f31027f0f files/1.5.0/nxviewer-1.5.0-insitu.patch 2034
 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 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
+EBUILD nxserver-2xterminalserver-1.5.0.ebuild 4966 RMD160 5ad96e97945ac597e219b6423f68c463d0ca15b6 SHA1 632a972d0dbc51a72f7d5b92cb10ff3c7c27a765 SHA256 c68f4a96fd38317b3f9bbe18b91e9fdf2d10785704d89663df2be589e1b853d4
+MD5 1fb4e37df93068f17ccb6e8761ad92d1 nxserver-2xterminalserver-1.5.0.ebuild 4966
+RMD160 5ad96e97945ac597e219b6423f68c463d0ca15b6 nxserver-2xterminalserver-1.5.0.ebuild 4966
+SHA256 c68f4a96fd38317b3f9bbe18b91e9fdf2d10785704d89663df2be589e1b853d4 nxserver-2xterminalserver-1.5.0.ebuild 4966
 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/files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch
new file mode 100644
index 0000000..29609a1
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch
@@ -0,0 +1,84 @@
+--- server/nxnode/setup/nxsetup.orig	2007-03-10 02:05:10.000000000 +0100
++++ server/nxnode/setup/nxsetup	2007-03-10 02:10:58.000000000 +0100
+@@ -840,6 +840,10 @@
+ 
+ removeNXinit () {
+ 
++  if [ "$system" = "gentoo" ]; then
++    return
++  fi
++
+   runCommand "$RMCOMMAND -f /etc/init.d/nxserver" "Unable to remove '/etc/init.d/nxserver'" "warn"
+ 
+   if [ "$system" = "solaris" ];
+@@ -896,6 +900,9 @@
+       then
+       runCommand "$RMCOMMAND -f /etc/rc0.d/K99nxserver" "Unable to remove '/etc/rc0.d/K99nxserver'" "warn"
+       fi
++  elif [ "$system" = "gentoo" ]; then
++    # do nothing; this is handled by Gentoo ebuild
++    echo > /dev/null
+   else
+       if [ -f /etc/rc.d/rc3.d/S99nxserver ];
+       then
+@@ -919,6 +926,10 @@
+ 
+ 
+ addNXinit () {
++ 
++ if [ "$system" = "gentoo" ] ; then
++   return;
++ fi
+ 
+  runCommand "cat /usr/NX/scripts/restricted/nxaddinitd.sh > /etc/init.d/nxserver" "Unable to create: '/etc/init.d/nxserver'" "warn"
+  runCommand "chmod +x /etc/init.d/nxserver" "Cannot set permissions of '/etc/init.d/nxserver' file" "warn"
+@@ -1064,6 +1075,10 @@
+ }
+ 
+ addNXUserLinux () {
++  # does the NX user already exist?
++  if id nx > /dev/null 2>&1 ; then
++    return
++  fi
+ 
+   if [ "x$system" = "xmandrake" -o "x$system" = "xfedora" ];
+   then
+@@ -1909,6 +1924,10 @@
+   system=fedora
+ fi
+ 
++if [ -d /usr/portage ]; then
++  system=gentoo
++fi
++
+ if [ "x$system" = "x" -a -f /etc/release ];
+ then
+   system=solaris
+@@ -1941,6 +1960,7 @@
+     "fedora"             ) ;;
+     "debian"             ) ;;
+     "solaris"             ) ;;
++    "gentoo"             ) ;;
+     ""                 ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unable to autodetect the operating system type, please specify it" ;;
+     *                  ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unsupported operating system '$system'" ;;
+   esac
+@@ -2094,18 +2114,7 @@
+   result=$?
+   if [ "$result" = 0 ];
+   then
+-    txt=`/bin/bash -c "su - nx < /dev/null 2>&1 | /bin/grep -c 'NXSERVER'" 2>&1`
+-    if [ "$?" != 0 ];
+-    then
+-      if [ "$txt" = "0" ];
+-      then
+-        echo "$PREFIX $ERROR ERROR: User 'nx' already exist but is not used by nxserver."
+-        echo "$PREFIX $ERROR ERROR: Delete user 'nx' and run $NODE_ROOT/bin/nxsetup --install"
+-        exit 1
+-      else
+-        echo "$PREFIX $ERROR ERROR: Error when checking if user nx is used by nx server: '$txt'"
+-      fi
+-    elif [ -f "$NODE_ROOT/etc/node.conf" -o  -f "$NODE_ROOT/etc/node.cfg" ];
++    if [ -f "$NODE_ROOT/etc/node.conf" -o  -f "$NODE_ROOT/etc/node.cfg" ];
+     then
+       procedureUpdate
+       return 0
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 d385bf8..bcd1f21 100644
--- a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
+++ b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
@@ -17,7 +17,10 @@ IUSE="rdesktop vnc"
 DEPEND="
 	dev-libs/glib
 	dev-libs/openssl
-	media-libs/gd
+	dev-perl/BSD-Resource
+	dev-perl/GDGraph
+	dev-perl/Passwd-Linux
+	dev-perl/Unix-Syslog
 	media-libs/jpeg
 	media-libs/libpng
 	net-print/cups
@@ -46,6 +49,7 @@ src_unpack() {
 	epatch ${FILESDIR}/1.5.0/nxsensor-1.5.0-insitu.patch || die
 	epatch ${FILESDIR}/1.5.0/nxnode-1.5.0-insitu.patch || die
 	epatch ${FILESDIR}/1.5.0/${P}-external-nxcomp.patch || die
+	epatch ${FILESDIR}/1.5.0/${P}-setup.patch || die
 }
 
 build_nxagent()
@@ -132,8 +136,8 @@ build_nxserver()
 
 	cd ${S}/server/nxnode/src
 	./configure || die
-	emake setversion || die
-	emake || die
+	make setversion
+	make nxnode.pl nxserver.pl || die
 }
 
 src_compile() {
@@ -153,14 +157,13 @@ src_compile() {
 
 src_install() {
 	# Missing nxnode/nxserver
-	into /usr/NX/bin
+	into /usr/NX
 	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
@@ -169,26 +172,39 @@ src_install() {
 		dobin ${S}/server/nxviewer/nxpasswd/nxpasswd
 	fi
 
-	dodir /usr/NX/lib
-	cp -P common/nxcompext/libXcompext.so* ${D}/usr/NX/lib || die
-	
+	dobin ${S}/server/nxnode/src/nxnode.pl
+	dobin ${S}/server/nxnode/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
 	dodir /usr/NX/etc
-	#TODO
+	perl MakeConfigFile.pl DEBIAN > ${D}/usr/NX/etc/node-gentoo.cfg.sample
+	
+	cd ${S}
+	cp -P common/nxcompext/libXcompext.so* ${D}/usr/NX/lib || die
 
-	into /usr/NX/scripts
-	newbin ${S}/server/nxnode/bin/nxnodeenv.sh nxenv.sh
-	newbin ${S}/server/nxnode/bin/nxnodeenv.csh nxenv.csh
+	exeinto /usr/NX/scripts
+	newexe ${S}/server/nxnode/bin/nxnodeenv.sh nxenv.sh
+	newexe ${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
+	doexe ${S}/server/nxnode/bin/nxaddinitd.sh
+	doexe ${S}/server/nxnode/scripts/nxinit.sh
+	newexe ${S}/server/nxnode/bin/nxprinter.sh-LINUX nxprinter.sh
+	doexe ${S}/server/nxnode/bin/nxsessreg.sh
+	doexe ${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?
-
+	cp -R server/nxnode/home ${D}/usr/NX || die
+	dodir /usr/NX/var/log
+	dodir /usr/NX/var/run
+	dodir /usr/NX/var/db/closed
+	dodir /usr/NX/var/db/failed
+	dodir /usr/NX/var/db/nxstat
+	dodir /usr/NX/var/db/running
 }
 
 pkg_postinst() {