summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-04-08 23:12:13 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-04-08 23:12:13 +0000
commite92cc7c2221d3fc302ae7c9a431a8d49c12dfff7 (patch)
treed9d1b37097194b4827384b7cd1071fd438412d2a /net-misc/nxserver-2xterminalserver
parentsrc_compile cleanups in 2X server (diff)
downloadnx-e92cc7c2221d3fc302ae7c9a431a8d49c12dfff7.tar.gz
nx-e92cc7c2221d3fc302ae7c9a431a8d49c12dfff7.tar.bz2
nx-e92cc7c2221d3fc302ae7c9a431a8d49c12dfff7.zip
2X server install cleanup, part 1
svn path=/testing/; revision=162
Diffstat (limited to 'net-misc/nxserver-2xterminalserver')
-rw-r--r--net-misc/nxserver-2xterminalserver/Manifest8
-rw-r--r--net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild36
2 files changed, 24 insertions, 20 deletions
diff --git a/net-misc/nxserver-2xterminalserver/Manifest b/net-misc/nxserver-2xterminalserver/Manifest
index f2f76a5..595fe1b 100644
--- a/net-misc/nxserver-2xterminalserver/Manifest
+++ b/net-misc/nxserver-2xterminalserver/Manifest
@@ -31,10 +31,10 @@ 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 4766 RMD160 b85b05b2183688cd763b8fb589484115c545d256 SHA1 f2fb1e456147e02368d1c22fc2939603a5fc0492 SHA256 c87693f5b6cc79db578959c0df0848dfa0515aa25226ab94cc45ae61ce00c5b2
-MD5 3a49f8fec4491526302d8513c80111ac nxserver-2xterminalserver-1.5.0.ebuild 4766
-RMD160 b85b05b2183688cd763b8fb589484115c545d256 nxserver-2xterminalserver-1.5.0.ebuild 4766
-SHA256 c87693f5b6cc79db578959c0df0848dfa0515aa25226ab94cc45ae61ce00c5b2 nxserver-2xterminalserver-1.5.0.ebuild 4766
+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
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 b6258b8..4269caa 100644
--- a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
+++ b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
@@ -92,6 +92,7 @@ src_compile() {
}
src_install() {
+ # Main binaries
into /usr/NX
dobin ${S}/common/nx-X11/programs/Xserver/nxagent
dobin ${S}/server/nxsensor/nxsensor
@@ -107,6 +108,21 @@ src_install() {
dobin ${S}/server/nxviewer/nxpasswd/nxpasswd
fi
+ # Libraries
+ cp -P common/nxcompext/libXcompext.so* \
+ 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
+ newexe ${S}/server/nxnode/bin/nxnodeenv.csh nxenv.csh
+ exeinto /usr/NX/scripts/restricted
+ 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
+
+ # The server itself (and wrappers and perl modules)
dobin ${S}/server/nxnode/src/nxnode.pl
dobin ${S}/server/nxnode/src/nxserver.pl
@@ -116,28 +132,16 @@ src_install() {
dodir /usr/NX/lib/perl
cd ${S}/server/nxnode/src
cp -RH *.pm Config Exception NXShellDialogs handlers 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
done
- cd ${S}
- cp -P common/nxcompext/libXcompext.so* \
- common/nx-X11/lib/X11/libX11.so* ${D}/usr/NX/lib || die
-
- exeinto /usr/NX/scripts
- newexe ${S}/server/nxnode/bin/nxnodeenv.sh nxenv.sh
- newexe ${S}/server/nxnode/bin/nxnodeenv.csh nxenv.csh
- exeinto /usr/NX/scripts/restricted
- 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 server/nxnode/home ${D}/usr/NX || die
+ cp -R ${S}/server/nxnode/share ${D}/usr/NX || die
+ cp -R ${S}/server/nxnode/home ${D}/usr/NX || die
dodir /usr/NX/var/log
dodir /usr/NX/var/run
dodir /usr/NX/var/db/closed