Move 2xlinuxterminalserver to nxserver-2xterminalserver

svn path=/testing/; revision=136

15 files changed, 961 insertions, 0 deletions

diff --git a/net-misc/nxserver-2xterminalserver/2xlinuxterminalserver-1.5.0.ebuild b/net-misc/nxserver-2xterminalserver/2xlinuxterminalserver-1.5.0.ebuild
new file mode 100644
index 0000000..9384315
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/2xlinuxterminalserver-1.5.0.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION=""
+HOMEPAGE=""
+SRC_URI="http://code.2x.com/release/linuxterminalserver/src/linuxterminalserver-1.5.0-r21-src.tar.gz"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/glib
+	dev-libs/openssl
+	media-libs/gd
+	media-libs/jpeg
+	media-libs/libpng
+	net-print/cups
+	sys-libs/zlib
+	=x11-libs/qt-3*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_unpack()
+{
+	# step 1 - unpack the main tarball
+	unpack ${A}
+
+	# step 2 - unpack the bundled perl + additional modules
+	#
+	# NOTE - we cannot use unpack here because it incorrectly reports
+	#        these tar files as not existing
+	# cd ${S}/components
+	# tar -zxf perl-5.6.2.tar.gz || die
+	# tar -zxf BSD-Resource-1.23.tar.gz || die
+	# tar -zxf Data-Dumper-2.121.tar.gz || die
+	# tar -zxf DateManip-5.42a.tar.gz || die
+	# tar -zxf DBD-SQLite-1.07.tar.gz || die
+	# tar -zxf DBI-1.45.tar.gz || die
+	# tar -zxf Digest-MD5-2.33.tar.gz || die
+	# tar -zxf Error-0.15.tar.gz || die
+	# tar -zxf GD-2.19.tar.gz || die
+	# tar -zxf GDGraph-1.43.tar.gz || die
+	# tar -zxf GDTextUtil-0.86.tar.gz || die
+	# tar -zxf Passwd-Linux-0.70.tar.gz || die
+	# tar -zxf Tie-IxHash-1.21.tar.gz || die
+	# tar -zxf Time-HiRes-1.68.tar.gz || die
+	# tar -zxf Unix-Syslog-0.99.tar.gz || die
+
+	# step 3 - apply patches
+	cd ${S}
+	epatch ${FILESDIR}/1.5.0/nxcomp-1.5.0-gcc4.patch || die
+	epatch ${FILESDIR}/1.5.0/nxcomp-1.5.0-pic.patch || die
+	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-amd64.patch || die
+	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch || die
+	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-tmp-exec.patch || die
+	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch || die
+	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-windows-linux-resume.patch || die
+	epatch ${FILESDIR}/1.5.0/nxcompext-1.5.0-insitu.patch || die
+	epatch ${FILESDIR}/1.5.0/nxdesktop-1.5.0-insitu.patch || die
+	epatch ${FILESDIR}/1.5.0/nxviewer-1.5.0-insitu.patch || die
+	epatch ${FILESDIR}/1.5.0/nxsensor-1.5.0-insitu.patch || die
+	epatch ${FILESDIR}/1.5.0/nxnode-1.5.0-insitu.patch || die
+}
+
+# ------------------------------------------------------------------------
+# Functions to build single parts of 2xlinuxterminalserver
+#
+# These functions follow the same naming convention that 2X's build
+# script uses, to make it easy for us to compare what we do with what
+# they do
+
+build_perl()
+{
+	einfo
+	einfo "Building perl"
+	einfo
+
+	cd ${S}/components/perl-5.6.2 || die
+	./Configure -des -Uafs -Ud_csh -Duseshrplib -Dprefix="${S}/perl" -Uuse5005threads -Uusethreads -Ui_db -Ui_gdbm _Ui_ndbm -Ui_dbm -Ui_sdbm -Duseopcode || die
+	make || die
+
+	# we have to install at this stage, because we need to use this copy
+	# of perl to build other components
+	#
+	# I will be much happier when we can use the system Perl instance
+	make install || die
+}
+
+build_nxcomp()
+{
+	einfo
+	einfo "Building nxcomp"
+	einfo
+
+	cd ${S}/common/nxcomp || die
+	./configure || die
+	emake || die
+}
+
+build_nxssh()
+{
+	einfo
+	einfo "Building nxssh"
+	einfo
+
+	cd ${S}/common/nxssh || die
+	./configure || die
+	emake || die
+}
+
+build_nxesd()
+{
+	einfo
+	einfo "Building nxesd"
+	einfo
+
+	cd ${S}/client/nxesd || die
+	./configure || die
+	emake || die
+}
+
+build_qt_libraries_and_client()
+{
+	# we do not need to build qt ... it is installed as part of the system
+	# we do not need to build cups ... it is installed as part of the system
+
+	einfo
+	einfo "Building nxclient"
+	einfo
+
+	cd ${S}/client/nxclient || die
+	./configure || die
+	emake || die
+
+	einfo
+	einfo "Building nxprint"
+	einfo
+
+	cd ${S}/client/nxclient/nxprint || die
+	emake || die
+}
+
+build_nxagent()
+{
+	einfo
+	einfo "Building nx-X11"
+	einfo
+
+	cd ${S}/common/nx-X11 || die
+	emake World || die
+
+	einfo
+	einfo "Building nxcompext"
+	einfo
+
+	cd ${S}/common/nxcompext || die
+	emake || die
+}
+
+build_nxdesktop()
+{
+	einfo
+	einfo "Building nxdesktop"
+	einfo
+
+	cd ${S}/client/nxdesktop || die
+	./configure || die
+	sed -e 's|/usr/X11R6/lib|../../common/nx-X11/lib/X11|g;' -i Makeconf || die
+	sed -e 's|/usr/X11R6/include|../../common/nx-X11/lib/X11|g;' -i Makeconf || die
+	emake || die
+}
+
+build_nxviewer()
+{
+	einfo
+	einfo "Building nxviewer"
+	einfo
+
+	cd ${S}/server/nxviewer || die
+	xmkmf || die
+
+	# Imakefile needs patching to find the libraries in the right place
+
+	emake World || die
+}
+
+build_nxspool()
+{
+	einfo
+	einfo "Building nxspool"
+	einfo
+
+	cd ${S}/server/nxspool/source || die
+	econf --without-ldap --without-krb5 || die
+	# We can't use emake here - it doesn't trigger the right target
+	# for some reason
+	make || die
+}
+
+build_nxsensor()
+{
+	einfo
+	einfo "Building nxsensor"
+	einfo
+
+	cd ${S}/server/nxsensor || die
+	emake glib12=1 || die
+}
+
+build_nxuexec()
+{
+	einfo
+	einfo "Building nxuexec"
+	einfo
+
+	cd ${S}/server/nxuexec || die
+	emake || die
+}
+
+build_nxserver()
+{
+	einfo
+	einfo "Building nxserver"
+	einfo
+
+	cd ${S}/server/nxnode/src || die
+	./configure || die
+	emake setversion || die
+	emake || die
+}
+
+build_client()
+{
+	build_nxcomp || die
+	build_nxssh || die
+	build_nxesd || die
+	build_qt_libraries_and_client || die
+	build_nxagent || die
+	build_nxdesktop || die
+}
+
+build_server()
+{
+	build_nxviewer || die
+	build_nxspool || die
+	build_nxsensor || die
+	build_nxuexec || die
+	build_nxserver || die
+}
+
+src_compile()
+{
+	build_client || die
+	build_server || die
+}
diff --git a/net-misc/nxserver-2xterminalserver/Manifest b/net-misc/nxserver-2xterminalserver/Manifest
new file mode 100644
index 0000000..7ba3cf2
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/Manifest
@@ -0,0 +1,56 @@
+AUX 1.5.0/nx-x11-1.5.0-amd64.patch 522 RMD160 7ddb4ea671f01b9dfd9afba794c90d6180ce39cc SHA1 d7601f7accf1d3161933e98c37e0a679ccf481e7 SHA256 3da7bba55c801258359f9208ad63ea7d2a7a7a42c9aedd2e397f22b82147975b
+MD5 bfb13eece1a30e367cea52a4e34b19c8 files/1.5.0/nx-x11-1.5.0-amd64.patch 522
+RMD160 7ddb4ea671f01b9dfd9afba794c90d6180ce39cc files/1.5.0/nx-x11-1.5.0-amd64.patch 522
+SHA256 3da7bba55c801258359f9208ad63ea7d2a7a7a42c9aedd2e397f22b82147975b files/1.5.0/nx-x11-1.5.0-amd64.patch 522
+AUX 1.5.0/nx-x11-1.5.0-plastik-render-fix.patch 1095 RMD160 4131c9b6e4b37e1ccf67cf36577afc01ebe4455c SHA1 96fd62bd8ffcc2fff37d052515790b86ffe30eff SHA256 20ff4bec5bd300a7d0324766e390b9f57312e74e154a6934fac8122120b05616
+MD5 0b90061cefb43ecd4e0c80f232ed09e1 files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch 1095
+RMD160 4131c9b6e4b37e1ccf67cf36577afc01ebe4455c files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch 1095
+SHA256 20ff4bec5bd300a7d0324766e390b9f57312e74e154a6934fac8122120b05616 files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch 1095
+AUX 1.5.0/nx-x11-1.5.0-tmp-exec.patch 363 RMD160 5c79c55a9a50620f8d7feefe9a3264691b25ea96 SHA1 5e573ae6ba8c2f7ba3ac188613ebceb486594f82 SHA256 5ff39018f527c9054c09cd7904f448c852e8ee0066842776c6beb94082acdab3
+MD5 c3ebd6330e7de2da0cab80e6d1143882 files/1.5.0/nx-x11-1.5.0-tmp-exec.patch 363
+RMD160 5c79c55a9a50620f8d7feefe9a3264691b25ea96 files/1.5.0/nx-x11-1.5.0-tmp-exec.patch 363
+SHA256 5ff39018f527c9054c09cd7904f448c852e8ee0066842776c6beb94082acdab3 files/1.5.0/nx-x11-1.5.0-tmp-exec.patch 363
+AUX 1.5.0/nx-x11-1.5.0-windows-linux-resume.patch 1383 RMD160 b2ea2200632ff5f6e9e238fab085bef15e9fd553 SHA1 5a95d58625418b8bda3ce13acb15af1fc629197d SHA256 060e2aa1fd05bcf0aa291782c35e795f43db62fead057360aae72ab7c4099fc8
+MD5 0ee863bb251aa2f6c1093cca5ddd68bd files/1.5.0/nx-x11-1.5.0-windows-linux-resume.patch 1383
+RMD160 b2ea2200632ff5f6e9e238fab085bef15e9fd553 files/1.5.0/nx-x11-1.5.0-windows-linux-resume.patch 1383
+SHA256 060e2aa1fd05bcf0aa291782c35e795f43db62fead057360aae72ab7c4099fc8 files/1.5.0/nx-x11-1.5.0-windows-linux-resume.patch 1383
+AUX 1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch 17973 RMD160 66193b7b9dc2d2ec2d7072a02f6f55c1232b3937 SHA1 b3a5c294516bb59c4f90a7942d2cc0abd632286e SHA256 4b511644a1cb6e0e0c1bb09c78983e2b8a3e6dc865da68f5803ab7e97e2f4412
+MD5 2051746e37750e40b82ce418f204b6ac files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch 17973
+RMD160 66193b7b9dc2d2ec2d7072a02f6f55c1232b3937 files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch 17973
+SHA256 4b511644a1cb6e0e0c1bb09c78983e2b8a3e6dc865da68f5803ab7e97e2f4412 files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch 17973
+AUX 1.5.0/nxcomp-1.5.0-gcc4.patch 329 RMD160 03065afd0dd2b0345a170bcc1ebd8da333004df4 SHA1 cdaf51133f34486e2d9cbc6cf61482eea8b3e9a0 SHA256 097b34afa77d40919e20f54a6b99ea10e2780720e58e72d4d7871303004749e3
+MD5 efb5695f79fc13d2ba55a2dd661fb798 files/1.5.0/nxcomp-1.5.0-gcc4.patch 329
+RMD160 03065afd0dd2b0345a170bcc1ebd8da333004df4 files/1.5.0/nxcomp-1.5.0-gcc4.patch 329
+SHA256 097b34afa77d40919e20f54a6b99ea10e2780720e58e72d4d7871303004749e3 files/1.5.0/nxcomp-1.5.0-gcc4.patch 329
+AUX 1.5.0/nxcomp-1.5.0-pic.patch 523 RMD160 5552146e4539f33cf61e1f6c3f323f51057e2e75 SHA1 95147d1e0a53df86c4f192fb6ee700303eb5f8bf SHA256 fe17e3e36b75fb0d4ac5ad74ff0ecc76ccb91e14b5d2f1a65cfd8c2bfc32cc62
+MD5 4694bf261e3ae8352908598bdaf39561 files/1.5.0/nxcomp-1.5.0-pic.patch 523
+RMD160 5552146e4539f33cf61e1f6c3f323f51057e2e75 files/1.5.0/nxcomp-1.5.0-pic.patch 523
+SHA256 fe17e3e36b75fb0d4ac5ad74ff0ecc76ccb91e14b5d2f1a65cfd8c2bfc32cc62 files/1.5.0/nxcomp-1.5.0-pic.patch 523
+AUX 1.5.0/nxcompext-1.5.0-insitu.patch 509 RMD160 4ca225be3064116a14a4fe26f372d62d62e13014 SHA1 744a00bffa429699d4489eba11116a73ba016640 SHA256 e3dada2031f14b504e2a181aa80cbe2dfe67884ac23a87c9c6f096ec4d5e4c4b
+MD5 d431bf1fefd4587961bb11bd39807d44 files/1.5.0/nxcompext-1.5.0-insitu.patch 509
+RMD160 4ca225be3064116a14a4fe26f372d62d62e13014 files/1.5.0/nxcompext-1.5.0-insitu.patch 509
+SHA256 e3dada2031f14b504e2a181aa80cbe2dfe67884ac23a87c9c6f096ec4d5e4c4b files/1.5.0/nxcompext-1.5.0-insitu.patch 509
+AUX 1.5.0/nxdesktop-1.5.0-insitu.patch 658 RMD160 a916d327a489d62147108444cd47f0f6bcf55ebb SHA1 4e59713ef5b10e100c2a70fe4bc7ca2f4667c22f SHA256 72f2fe9289bfbf88f37193810611c0c790c16d089480c365ef585afef0f4c3fa
+MD5 13f0e49aab83e8e306938791de024c92 files/1.5.0/nxdesktop-1.5.0-insitu.patch 658
+RMD160 a916d327a489d62147108444cd47f0f6bcf55ebb files/1.5.0/nxdesktop-1.5.0-insitu.patch 658
+SHA256 72f2fe9289bfbf88f37193810611c0c790c16d089480c365ef585afef0f4c3fa files/1.5.0/nxdesktop-1.5.0-insitu.patch 658
+AUX 1.5.0/nxnode-1.5.0-insitu.patch 421 RMD160 4d85334e35dff78e60e98ff6e2eece550ddd37cb SHA1 bbde67714dac1d1ee6e4e973deb4cfc83375c598 SHA256 72eb3314597835be5a6b53ea70cf859bd2cf2d2c0a73d05a5a8868feb6c02592
+MD5 01a1aed9557c9a4f8b8ff88c5c07c710 files/1.5.0/nxnode-1.5.0-insitu.patch 421
+RMD160 4d85334e35dff78e60e98ff6e2eece550ddd37cb files/1.5.0/nxnode-1.5.0-insitu.patch 421
+SHA256 72eb3314597835be5a6b53ea70cf859bd2cf2d2c0a73d05a5a8868feb6c02592 files/1.5.0/nxnode-1.5.0-insitu.patch 421
+AUX 1.5.0/nxsensor-1.5.0-insitu.patch 1419 RMD160 6006a1f1cf130088c5813dd9db8fbcd0e119ac6f SHA1 7264a6ccf8a168715312c19fe28e629348669d96 SHA256 64d980cde3dcf674b43e5759bb161f0efc546c4d5896a0d44ce0dd1bf1d49ea3
+MD5 9c146218a7fae0fbbcc15180bb7f2b32 files/1.5.0/nxsensor-1.5.0-insitu.patch 1419
+RMD160 6006a1f1cf130088c5813dd9db8fbcd0e119ac6f files/1.5.0/nxsensor-1.5.0-insitu.patch 1419
+SHA256 64d980cde3dcf674b43e5759bb161f0efc546c4d5896a0d44ce0dd1bf1d49ea3 files/1.5.0/nxsensor-1.5.0-insitu.patch 1419
+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 2xlinuxterminalserver-1.5.0.ebuild 5321 RMD160 975824e83ec7020e34fe43cbf375a066e3b26d1d SHA1 8e37498efbf5c927d580d163384aac15c96c121a SHA256 6bcf7415613ac0b6f6935cb644da3f3056f8c40738878be5223ba6169447e386
+MD5 2b36fe8f3744633e550f6e884a9ba740 2xlinuxterminalserver-1.5.0.ebuild 5321
+RMD160 975824e83ec7020e34fe43cbf375a066e3b26d1d 2xlinuxterminalserver-1.5.0.ebuild 5321
+SHA256 6bcf7415613ac0b6f6935cb644da3f3056f8c40738878be5223ba6169447e386 2xlinuxterminalserver-1.5.0.ebuild 5321
+MD5 9ce3d064f488428d2ca91d7fddbd898f files/digest-2xlinuxterminalserver-1.5.0 310
+RMD160 9863e56c29cc5e2c78c52e616149f338bc192306 files/digest-2xlinuxterminalserver-1.5.0 310
+SHA256 827043de6eaf9a30d0256b9479470b9bb20d2deb9bf5dc82c1d9eb9e02ec047b files/digest-2xlinuxterminalserver-1.5.0 310
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-amd64.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-amd64.patch
new file mode 100644
index 0000000..638fc92
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-amd64.patch
@@ -0,0 +1,15 @@
+diff -ru nx-X11-orig/lib/X11/XlcDL.c nx-X11/lib/X11/XlcDL.c
+--- common/nx-X11-orig/lib/X11/XlcDL.c	2006-10-04 16:51:54.000000000 -0600
++++ common/nx-X11/lib/X11/XlcDL.c	2006-10-04 16:52:55.000000000 -0600
+@@ -58,10 +58,8 @@
+ #ifdef _LP64
+ # if defined(__sparcv9)
+ #  define	_MACH64_NAME		"sparcv9"
+-# elif defined(__ia64__) 
+-#  undef MACH64_NAME
+ # else
+-#  error "Unknown architecture"
++#  undef MACH64_NAME
+ # endif /* defined(__sparcv9) */
+ # ifdef _MACH64_NAME
+ #  define	_MACH64_NAME_LEN	(sizeof (_MACH64_NAME) - 1)
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch
new file mode 100644
index 0000000..d896f97
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch
@@ -0,0 +1,29 @@
+--- common/nx-X11/programs/Xserver/hw/nxagent/GCOps.c.orig	2006-11-22 21:59:13.000000000 +0000
++++ common/nx-X11/programs/Xserver/hw/nxagent/GCOps.c	2006-11-22 22:03:12.000000000 +0000
+@@ -2399,7 +2399,7 @@
+   {
+     if ((pDrawable)->type == DRAWABLE_PIXMAP)
+     {
+-      miPolySegment(nxagentVirtualDrawable(pDrawable), pGC, nSegments, pSegments);
++      fbPolySegment(nxagentVirtualDrawable(pDrawable), pGC, nSegments, pSegments);
+     }
+ 
+     return;
+@@ -2435,7 +2435,7 @@
+       XDrawSegments(nxagentDisplay, nxagentDrawable(pDrawable), nxagentGC(pGC),
+                     (XSegment *)pSegments, nSegments);
+     }
+-    miPolySegment(nxagentVirtualDrawable(pDrawable), pGC, nSegments, pSegments);
++    fbPolySegment(nxagentVirtualDrawable(pDrawable), pGC, nSegments, pSegments);
+     return;
+   }
+   else
+@@ -2454,7 +2454,7 @@
+   {
+     if ((pDrawable)->type == DRAWABLE_PIXMAP)
+     {
+-      miPolyRectangle(nxagentVirtualDrawable(pDrawable), pGC, nRectangles, pRectangles);
++      fbPolyRectangle(nxagentVirtualDrawable(pDrawable), pGC, nRectangles, pRectangles);
+     }
+ 
+     return;
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch
new file mode 100644
index 0000000..40f5faa
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch
@@ -0,0 +1,11 @@
+--- common/nx-X11/config/imake/imake.c.orig	2006-11-05 00:10:49.000000000 +0000
++++ common/nx-X11/config/imake/imake.c	2006-11-05 00:11:49.000000000 +0000
+@@ -974,7 +974,7 @@
+ static void
+ get_libc_version(FILE *inFile)
+ {
+-  char aout[] = "/tmp/imakeXXXXXX";
++  char aout[] = "./imakeXXXXXX";
+   FILE *fp;
+   const char *format = "%s -o %s -x c -";
+   char *cc;
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-windows-linux-resume.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-windows-linux-resume.patch
new file mode 100644
index 0000000..7f4a6bb
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-windows-linux-resume.patch
@@ -0,0 +1,37 @@
+--- common/nx-X11/programs/Xserver/hw/nxagent/Display.c.orig	2005-07-29 09:01:11.000000000 -0700
++++ common/nx-X11/programs/Xserver/hw/nxagent/Display.c	2005-07-30 07:16:06.000000000 -0700
+@@ -1531,11 +1531,12 @@
+   reconnectDisplayState = NOTHING;
+ }
+ 
++#define WARNING
+ static Bool reloadVisuals(int flexibility)
+ {
+   int i, nitems;
+   XVisualInfo *newVisuals, *vi;
+-  unsigned long mask = VisualAllMask & ~VisualIDMask;
++  unsigned long mask = VisualAllMask & ~VisualIDMask & ~VisualBitsPerRGBMask;
+ 
+   newVisuals = malloc(sizeof(XVisualInfo) * nxagentNumVisuals);
+ 
+@@ -1577,6 +1578,10 @@
+     }
+   }
+ 
++        #ifdef WARNING
++        fprintf(stderr, "matched for %d visuals and found %d matching\n", nxagentNumVisuals,i);
++        #endif
++
+   if (i == nxagentNumVisuals)
+   {
+     nxagentVisuals = newVisuals;
+--- common/nx-X11/programs/Xserver/hw/nxagent/Visual.c.orig	2005-07-30 07:17:40.000000000 -0700
++++ common/nx-X11/programs/Xserver/hw/nxagent/Visual.c	2005-07-30 07:17:44.000000000 -0700
+@@ -48,7 +48,6 @@
+   for (i = 0; i < nxagentNumVisuals; i++)
+   {
+     if (pVisual->class == nxagentVisuals[i].class &&
+-        pVisual->bitsPerRGBValue == nxagentVisuals[i].bits_per_rgb &&
+         pVisual->ColormapEntries == nxagentVisuals[i].colormap_size &&
+         pVisual->nplanes == nxagentVisuals[i].depth &&
+         pVisual->redMask == nxagentVisuals[i].red_mask &&
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch
new file mode 100644
index 0000000..77c4887
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch
@@ -0,0 +1,394 @@
+diff -uBb --recursive common.orig/nx-X11/lib/fontconfig/fonts.conf.in common/nx-X11/lib/fontconfig/fonts.conf.in
+--- common.orig/nx-X11/lib/fontconfig/fonts.conf.in	2006-11-22 22:13:28.000000000 +0000
++++ common/nx-X11/lib/fontconfig/fonts.conf.in	2006-11-22 22:17:43.000000000 +0000
+@@ -24,7 +24,7 @@
+   Common X11R6 font directories
+ -->
+ 
+-	<dir>/usr/X11R6/lib/X11/fonts</dir>
++	<dir>/usr/share/fonts</dir>
+  	<dir>/usr/share/fonts</dir>
+ 	<dir>~/.fonts</dir>
+ 
+diff -uBb --recursive common.orig/nx-X11/lib/fontconfig/src/fontconfig.man common/nx-X11/lib/fontconfig/src/fontconfig.man
+--- common.orig/nx-X11/lib/fontconfig/src/fontconfig.man	2006-11-22 22:13:28.000000000 +0000
++++ common/nx-X11/lib/fontconfig/src/fontconfig.man	2006-11-22 22:17:44.000000000 +0000
+@@ -1352,8 +1352,8 @@
+ <!-- 
+ 	Find fonts in these directories
+ -->
+-<dir>/usr/X11R6/lib/X11/fonts/truetype</dir>
+-<dir>/usr/X11R6/lib/X11/fonts/Type1</dir>
++<dir>/usr/share/fonts/truetype</dir>
++<dir>/usr/share/fonts/Type1</dir>
+ 
+ <!--
+ 	Accept deprecated 'mono' alias, replacing it with 'monospace'
+diff -uBb --recursive common.orig/nx-X11/programs/mkcfm/mkcfm.c common/nx-X11/programs/mkcfm/mkcfm.c
+--- common.orig/nx-X11/programs/mkcfm/mkcfm.c	2006-11-22 22:13:27.000000000 +0000
++++ common/nx-X11/programs/mkcfm/mkcfm.c	2006-11-22 22:17:30.000000000 +0000
+@@ -48,7 +48,7 @@
+ static void CIDFillVals(FontScalablePtr);
+ static Bool DoDirectory(char *dirName);
+  
+-#define DEFAULTCID "/usr/X11R6/lib/X11/fonts/CID"
++#define DEFAULTCID "/usr/share/fonts/CID"
+ #define DECIPOINTSPERINCH 722.7
+ #define DEFAULTRES 75
+ #define DEFAULTPOINTSIZE 120
+diff -uBb --recursive common.orig/nx-X11/programs/mkcfm/mkcfm.man common/nx-X11/programs/mkcfm/mkcfm.man
+--- common.orig/nx-X11/programs/mkcfm/mkcfm.man	2006-11-22 22:13:27.000000000 +0000
++++ common/nx-X11/programs/mkcfm/mkcfm.man	2006-11-22 22:17:30.000000000 +0000
+@@ -24,7 +24,7 @@
+ [\fICID-font-directory-name\fP]
+ .SH DESCRIPTION
+ There is usually only one CID font directory on the X font path. It is
+-usually called \fI/usr/X11R6/lib/X11/fonts/CID\fP. If you do not specify
++usually called \fI/usr/share/fonts/CID\fP. If you do not specify
+ an argument, \fImkcfm\fP will try to go through the subdirectories of
+ that directory, and create one summary of font metric files for each
+ CIDFont (character descriptions) file and each CMap (Character Maps) file
+diff -uBb --recursive common.orig/nx-X11/programs/xfs/xfs.man common/nx-X11/programs/xfs/xfs.man
+--- common.orig/nx-X11/programs/xfs/xfs.man	2006-11-22 22:13:27.000000000 +0000
++++ common/nx-X11/programs/xfs/xfs.man	2006-11-22 22:17:29.000000000 +0000
+@@ -186,9 +186,9 @@
+ XCOMM the first is a set of Speedo outlines, the second is a set of 
+ XCOMM misc bitmaps and the last is a set of 100dpi bitmaps
+ XCOMM
+-catalogue = /usr/X11R6/lib/X11/fonts/speedo,
+-	/usr/X11R6/lib/X11/fonts/misc,
+-	/usr/X11R6/lib/X11/fonts/100dpi/
++catalogue = /usr/share/fonts/speedo,
++	/usr/share/fonts/misc,
++	/usr/share/fonts/100dpi/
+ 
+ XCOMM in 12 points, decipoints
+ default-point-size = 120
+diff -uBb --recursive common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/Install common/nx-X11/programs/Xserver/hw/xfree86/doc/Install
+--- common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/Install	2006-11-22 22:13:24.000000000 +0000
++++ common/nx-X11/programs/Xserver/hw/xfree86/doc/Install	2006-11-22 22:17:13.000000000 +0000
+@@ -318,7 +318,7 @@
+      chmod ug-w /usr/X11R6/lib           # Make sure the permissions are OK
+      /sbin/ldconfig /usr/X11R6/lib       # For Linux
+      /sbin/ldconfig -m /usr/X11R6/lib    # For FreeBSD, NetBSD, OpenBSD
+-     /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
++     /usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
+ 
+ 4.2  Installing over an old installation
+ 
+@@ -378,7 +378,7 @@
+      chmod ug-w /usr/X11R6/lib           # Make sure the permissions are OK
+      /sbin/ldconfig /usr/X11R6/lib       # For Linux
+      /sbin/ldconfig -m /usr/X11R6/lib    # For FreeBSD, NetBSD, OpenBSD
+-     /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
++     /usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
+ 
+      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.17 2003/02/24 17:09:16 dawes Exp $
+ 
+diff -uBb --recursive common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man common/nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man
+--- common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man	2006-11-22 22:13:24.000000000 +0000
++++ common/nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man	2006-11-22 22:17:13.000000000 +0000
+@@ -99,16 +99,16 @@
+ .\" X11R6 allows the X server to request fonts from a font server.  A
+ .\" font server is specified by placing a "<trans>/<hostname>:<port_number>"
+ .\" entry into the fontpath.  For example, the fontpath
+-.\" "/usr/X11R6/lib/X11/fonts/misc/,tcp/zok:7100" tells the X server
++.\" "/usr/share/fonts/misc/,tcp/zok:7100" tells the X server
+ .\" to first try to locate the font in the local directory
+-.\" /usr/X11R6/lib/X11/fonts/misc.  If that fails, then request the
++.\" /usr/share/fonts/misc.  If that fails, then request the
+ .\" font from the \fIfont server\fP running on machine zok listening
+ .\" for connections on TCP port number 7100.
+ X11R6 ¤Ï X ¥µ¡¼¥Ð¤¬¥Õ¥©¥ó¥È¥µ¡¼¥Ð¤Ë¥Õ¥©¥ó¥È¤òÍ׵᤹¤ë¤³¤È¤¬²Äǽ
+ ¤Ë¤Ê¤ê¤Þ¤·¤¿¡£¥Õ¥©¥ó¥È¥µ¡¼¥Ð¤Ï¾ì½ê¤ò "<trans>/<hostname>:<port_number>"
+ ¤È¥Õ¥©¥ó¥È¥Ñ¥¹¤Ë»ØÄꤷ¤Þ¤¹¡£Î㤨¤Ð¡¢¥Õ¥©¥ó¥È¥Ñ¥¹
+-"/usr/X11R6/lib/X11/fonts/misc/,tcp/zok:7100" ¤Ï¤Þ¤ººÇ½é¤Ë¥í¡¼¥«¥ë
+-¥Ç¥£¥ì¥¯¥È¥ê /usr/X11R6/lib/X11/fonts/misc ¤ò X ¥µ¡¼¥Ð¤ËÅÁ¤¨¤Þ¤¹¡£
++"/usr/share/fonts/misc/,tcp/zok:7100" ¤Ï¤Þ¤ººÇ½é¤Ë¥í¡¼¥«¥ë
++¥Ç¥£¥ì¥¯¥È¥ê /usr/share/fonts/misc ¤ò X ¥µ¡¼¥Ð¤ËÅÁ¤¨¤Þ¤¹¡£
+ ¤³¤ì¤¬¼ºÇÔ¤·¤¿¤È¤­¤Ë¡¢¥Ý¡¼¥ÈÈÖ¹æ 7100 ¤«¤é TCP ¤ÇÀܳ¤·¤Æʹ¤¤¤Æ
+ (listening) ¤¤¤ë zok ¤È¤¤¤¦¥Û¥¹¥È¤ÇÆ°ºî¤·¤Æ¤¤¤ë \fI¥Õ¥©¥ó¥È¥µ¡¼¥Ð\fP 
+ ¤Ë¥Õ¥©¥ó¥È¤òÍ׵ᤷ¤Þ¤¹¡£
+diff -uBb --recursive common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml common/nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml
+--- common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml	2006-11-22 22:13:24.000000000 +0000
++++ common/nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml	2006-11-22 22:17:13.000000000 +0000
+@@ -1372,7 +1372,7 @@
+ 3.1.2D (or are not sure if you installed it), you should run the following:
+ 
+ <tscreen><verb>
+-	/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
++	/usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
+ </verb></tscreen>
+  
+ An up-to-date version of the xterm termcap and terminfo entries is
+diff -uBb --recursive common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/README.fonts common/nx-X11/programs/Xserver/hw/xfree86/doc/README.fonts
+--- common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/README.fonts	2006-11-22 22:13:24.000000000 +0000
++++ common/nx-X11/programs/Xserver/hw/xfree86/doc/README.fonts	2006-11-22 22:17:13.000000000 +0000
+@@ -253,7 +253,7 @@
+ 
+ The CIDFont code in XFree86 requires a very rigid directory structure.  The
+ main directory must be called `CID' (its location defaults to
+-`/usr/X11R6/lib/X11/fonts/CID' but it may be located anywhere), and it should
++`/usr/share/fonts/CID' but it may be located anywhere), and it should
+ contain a subdirectory for every CID collection.  Every subdirectory must
+ contain subdirectories called CIDFont (containing the actual CIDFont files),
+ CMap (containing all the needed CMaps), AFM (containing the font metric
+@@ -398,7 +398,7 @@
+ 
+ For example, the font file
+ 
+-     /usr/X11R6/lib/X11/fonts/misc/6x13.bdf
++     /usr/share/fonts/misc/6x13.bdf
+ 
+ with XLFD
+ 
+@@ -442,7 +442,7 @@
+ 
+ and resides in the font file
+ 
+-     /usr/X11R6/lib/X11/fonts/misc/cu12.pcf.gz
++     /usr/share/fonts/misc/cu12.pcf.gz
+ 
+ Additional ClearlyU fonts include
+ 
+@@ -480,7 +480,7 @@
+ 
+ and reside in the font files
+ 
+-     /usr/X11R6/lib/X11/fonts/Type1/cour*.pfa
++     /usr/share/fonts/Type1/cour*.pfa
+ 
+ The Adobe Utopia set of fonts only cover ISO 8859-1 as well as Adobe Standard
+ Encoding.  These fonts have XLFD
+@@ -489,7 +489,7 @@
+ 
+ and reside in the font files
+ 
+-     /usr/X11R6/lib/X11/fonts/Type1/UT*.pfa
++     /usr/share/fonts/Type1/UT*.pfa
+ 
+ Finally, XFree86 also comes with Type 1 versions of Bitstream Courier and
+ Charter.  These fonts have XLFD
+@@ -499,7 +499,7 @@
+ 
+ and reside in the font files
+ 
+-     /usr/X11R6/lib/X11/fonts/Type1/c*bt_.pfb
++     /usr/share/fonts/Type1/c*bt_.pfb
+ 
+ 3.3.2  Standard Speedo fonts
+ 
+@@ -515,7 +515,7 @@
+ 
+ and reside in the font files
+ 
+-     /usr/X11R6/lib/X11/fonts/Speedo/font*.spd
++     /usr/share/fonts/Speedo/font*.spd
+ 
+ 3.4  The Bigelow & Holmes Luxi family
+ 
+@@ -699,7 +699,7 @@
+ In order to use a font in an encoding that the font backend does not know
+ about, you need to have an `encodings.dir' file either in the same directory
+ as the font file used or in a system-wide location
+-(`/usr/X11R6/lib/X11/fonts/encodings/' by default).
++(`/usr/share/fonts/encodings/' by default).
+ 
+ The `encodings.dir' file has a similar format to `fonts.dir'.  Its first line
+ specifies the number of encodings, while every successive line has two
+@@ -709,9 +709,9 @@
+ ple,
+ 
+      3
+-     mulearabic-0 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-0.enc
+-     mulearabic-1 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-1.enc
+-     mulearabic-2 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-2.enc
++     mulearabic-0 /usr/share/fonts/encodings/mulearabic-0.enc
++     mulearabic-1 /usr/share/fonts/encodings/mulearabic-1.enc
++     mulearabic-2 /usr/share/fonts/encodings/mulearabic-2.enc
+ 
+ The name of an encoding must be specified in the encoding file's `STARTENCOD-
+ ING' or `ALIAS' line.  It is not enough to create an `encodings.dir' entry.
+diff -uBb --recursive common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/README.SVR4 common/nx-X11/programs/Xserver/hw/xfree86/doc/README.SVR4
+--- common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/README.SVR4	2006-11-22 22:13:24.000000000 +0000
++++ common/nx-X11/programs/Xserver/hw/xfree86/doc/README.SVR4	2006-11-22 22:17:13.000000000 +0000
+@@ -295,9 +295,9 @@
+                 for i in *pc???.bdf
+                 do
+                     /usr/X11R6/bin/bdftopcf $i > \
+-                          /usr/X11R6/lib/X11/fonts/misc/`basename $i .bdf`.pcf
++                          /usr/share/fonts/misc/`basename $i .bdf`.pcf
+                 done
+-                cd /usr/X11R6/lib/X11/fonts/misc
++                cd /usr/share/fonts/misc
+                 /usr/X11R6/bin/mkfontdir
+                 # Do this only if the server is already running.
+                 /usr/X11R6/bin/xset fp rehash
+diff -uBb --recursive common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml common/nx-X11/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml
+--- common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml	2006-11-22 22:13:24.000000000 +0000
++++ common/nx-X11/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml	2006-11-22 22:17:14.000000000 +0000
+@@ -296,7 +296,7 @@
+ 
+ The CIDFont code in XFree86 requires a very rigid directory
+ structure.  The main directory must be called `<tt/CID/' (its location
+-defaults to `<tt>/usr/X11R6/lib/X11/fonts/CID</tt>' but it may be
++defaults to `<tt>/usr/share/fonts/CID</tt>' but it may be
+ located anywhere), and it should contain a subdirectory for every CID
+ collection.  Every subdirectory <it/must/ contain subdirectories
+ called <tt/CIDFont/ (containing the actual CIDFont files), <tt/CMap/
+@@ -457,7 +457,7 @@
+ 
+ For example, the font file
+ <tscreen><verb>
+-/usr/X11R6/lib/X11/fonts/misc/6x13.bdf
++/usr/share/fonts/misc/6x13.bdf
+ </verb></tscreen>
+ with XLFD
+ <tscreen><verb>
+@@ -502,7 +502,7 @@
+ </verb></tscreen>
+ and resides in the font file
+ <tscreen><verb>
+-/usr/X11R6/lib/X11/fonts/misc/cu12.pcf.gz 
++/usr/share/fonts/misc/cu12.pcf.gz 
+ </verb></tscreen>
+ Additional ClearlyU fonts include
+ <tscreen><verb>
+@@ -542,7 +542,7 @@
+ </verb></tscreen>
+ and reside in the font files
+ <tscreen><verb>
+-/usr/X11R6/lib/X11/fonts/Type1/cour*.pfa
++/usr/share/fonts/Type1/cour*.pfa
+ </verb></tscreen>
+ 
+ The Adobe Utopia set of fonts only cover ISO&nbsp;8859-1 as well as
+@@ -552,7 +552,7 @@
+ </verb></tscreen>
+ and reside in the font files
+ <tscreen><verb>
+-/usr/X11R6/lib/X11/fonts/Type1/UT*.pfa
++/usr/share/fonts/Type1/UT*.pfa
+ </verb></tscreen>
+ 
+ Finally, XFree86 also comes with Type&nbsp;1 versions of Bitstream
+@@ -563,7 +563,7 @@
+ </verb></tscreen>
+ and reside in the font files
+ <tscreen><verb>
+-/usr/X11R6/lib/X11/fonts/Type1/c*bt_.pfb
++/usr/share/fonts/Type1/c*bt_.pfb
+ </verb></tscreen>
+ 
+ <sect2>Standard Speedo fonts
+@@ -581,7 +581,7 @@
+ </verb></tscreen>
+ and reside in the font files
+ <tscreen><verb>
+-/usr/X11R6/lib/X11/fonts/Speedo/font*.spd
++/usr/share/fonts/Speedo/font*.spd
+ </verb></tscreen>
+ 
+ <sect1>The Bigelow &amp; Holmes Luxi family
+@@ -770,7 +770,7 @@
+ <p>In order to use a font in an encoding that the font backend does
+ not know about, you need to have an `<tt/encodings.dir/' file either
+ in the same directory as the font file used or in a system-wide
+-location (`<tt>/usr/X11R6/lib/X11/fonts/encodings/</tt>' by default).
++location (`<tt>/usr/share/fonts/encodings/</tt>' by default).
+ 
+ The `<tt/encodings.dir/' file has a similar format to
+ `<tt/fonts.dir/'.  Its first line specifies the number of encodings,
+@@ -781,9 +781,9 @@
+ 
+ <tscreen><verb>
+ 3
+-mulearabic-0 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-0.enc
+-mulearabic-1 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-1.enc
+-mulearabic-2 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-2.enc
++mulearabic-0 /usr/share/fonts/encodings/mulearabic-0.enc
++mulearabic-1 /usr/share/fonts/encodings/mulearabic-1.enc
++mulearabic-2 /usr/share/fonts/encodings/mulearabic-2.enc
+ </verb></tscreen>
+ 
+ The name of an encoding <it/must/ be specified in the encoding file's
+diff -uBb --recursive common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml common/nx-X11/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml
+--- common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml	2006-11-22 22:13:24.000000000 +0000
++++ common/nx-X11/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml	2006-11-22 22:17:13.000000000 +0000
+@@ -432,7 +432,7 @@
+ chmod ug-w /usr/X11R6/lib           # Make sure the permissions are OK
+ /sbin/ldconfig /usr/X11R6/lib       # For Linux
+ /sbin/ldconfig -m /usr/X11R6/lib    # For FreeBSD, NetBSD, OpenBSD
+-/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
++/usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
+ </verb></tscreen>
+ 
+ <sect1>Installing over an old installation
+@@ -511,7 +511,7 @@
+ chmod ug-w /usr/X11R6/lib           # Make sure the permissions are OK
+ /sbin/ldconfig /usr/X11R6/lib       # For Linux
+ /sbin/ldconfig -m /usr/X11R6/lib    # For FreeBSD, NetBSD, OpenBSD
+-/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
++/usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
+ </verb></tscreen>
+ 
+ ]]>
+diff -uBb --recursive common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml common/nx-X11/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml
+--- common.orig/nx-X11/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml	2006-11-22 22:13:24.000000000 +0000
++++ common/nx-X11/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml	2006-11-22 22:17:13.000000000 +0000
+@@ -328,9 +328,9 @@
+ 	for i in *pc???.bdf
+ 	do
+ 	    /usr/X11R6/bin/bdftopcf $i > \
+-			/usr/X11R6/lib/X11/fonts/misc/`basename $i .bdf`.pcf
++			/usr/share/fonts/misc/`basename $i .bdf`.pcf
+ 	done
+-	cd /usr/X11R6/lib/X11/fonts/misc
++	cd /usr/share/fonts/misc
+ 	/usr/X11R6/bin/mkfontdir
+ 	# Do this only if the server is already running.
+ 	/usr/X11R6/bin/xset fp rehash
+diff -uBb --recursive common.orig/nx-X11/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy common/nx-X11/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy
+--- common.orig/nx-X11/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy	2006-11-22 22:13:24.000000000 +0000
++++ common/nx-X11/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy	2006-11-22 22:17:17.000000000 +0000
+@@ -52,15 +52,15 @@
+ # as well as specifying multiple comma-separated entries in one FontPath
+ # command (or a combination of both methods)
+ 
+-    FontPath	"/usr/X11R6/lib/X11/fonts/local/"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/misc/"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/Type1/"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/CID/"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/Speedo/"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/75dpi/"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/100dpi/"
++    FontPath	"/usr/share/fonts/local/"
++    FontPath	"/usr/share/fonts/misc/"
++    FontPath	"/usr/share/fonts/75dpi/:unscaled"
++    FontPath	"/usr/share/fonts/100dpi/:unscaled"
++    FontPath	"/usr/share/fonts/Type1/"
++    FontPath	"/usr/share/fonts/CID/"
++    FontPath	"/usr/share/fonts/Speedo/"
++    FontPath	"/usr/share/fonts/75dpi/"
++    FontPath	"/usr/share/fonts/100dpi/"
+ 
+ # ModulePath can be used to set a search path for the X server modules.
+ # The default path is shown here.
+diff -uBb --recursive common.orig/nx-X11/programs/Xserver/hw/xfree86/etc/install.sv3 common/nx-X11/programs/Xserver/hw/xfree86/etc/install.sv3
+--- common.orig/nx-X11/programs/Xserver/hw/xfree86/etc/install.sv3	2006-11-22 22:13:24.000000000 +0000
++++ common/nx-X11/programs/Xserver/hw/xfree86/etc/install.sv3	2006-11-22 22:17:22.000000000 +0000
+@@ -549,9 +549,9 @@
+     read answer
+     [ "$answer" = "y" -o "$answer" = "Y" ] && {
+     sed -e 's/FONT 8x16/FONT vga/' </usr/lib/loadfont/vga437.bdf \
+-    | bdftopcf -t >/usr/X11R6/lib/X11/fonts/misc/vga.pcf
+-    chmod 644 /usr/X11R6/lib/X11/fonts/misc/fonts.dir
+-    mkfontdir /usr/X11R6/lib/X11/fonts/misc
++    | bdftopcf -t >/usr/share/fonts/misc/vga.pcf
++    chmod 644 /usr/share/fonts/misc/fonts.dir
++    mkfontdir /usr/share/fonts/misc
+     }
+ fi
+ }
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxcomp-1.5.0-gcc4.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxcomp-1.5.0-gcc4.patch
new file mode 100644
index 0000000..3a3a79b
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxcomp-1.5.0-gcc4.patch
@@ -0,0 +1,12 @@
+--- common/nxcomp/RenderExtension.h.orig       2005-02-19 18:23:32.000000000 +0000
++++ common/nxcomp/RenderExtension.h    2005-08-27 23:16:05.000000000 +0100
+@@ -68,6 +68,8 @@
+ // The message class.
+ //
+
++class RenderMinorExtensionStore;
++
+ class RenderExtensionMessage : public Message
+ {
+   friend class RenderExtensionStore;
+
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxcomp-1.5.0-pic.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxcomp-1.5.0-pic.patch
new file mode 100644
index 0000000..7c453a2
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxcomp-1.5.0-pic.patch
@@ -0,0 +1,20 @@
+--- common/nxcomp/Makefile.in.orig	2006-11-22 21:43:15.000000000 +0000
++++ common/nxcomp/Makefile.in	2006-11-22 21:43:33.000000000 +0000
+@@ -32,7 +32,7 @@
+ 
+ CXX         = @CXX@
+ CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
+-              -Wall -Wpointer-arith
++              -Wall -Wpointer-arith -fPIC
+ CXXINCLUDES =
+ CXXDEFINES  =
+ 
+@@ -43,7 +43,7 @@
+ 
+ CC          = @CC@
+ CCFLAGS     = @X_CFLAGS@ @DEFS@ \
+-              -Wall -Wpointer-arith
++              -Wall -Wpointer-arith -fPIC
+ CCINCLUDES  =
+ CCDEFINES   =
+ 
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxcompext-1.5.0-insitu.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxcompext-1.5.0-insitu.patch
new file mode 100644
index 0000000..f864dd5
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxcompext-1.5.0-insitu.patch
@@ -0,0 +1,12 @@
+diff -uBb --recursive common.orig/nxcompext/Makefile.in common/nxcompext/Makefile.in
+--- common.orig/nxcompext/Makefile.in	2006-11-22 22:30:10.000000000 +0000
++++ common/nxcompext/Makefile.in	2006-11-22 22:34:08.000000000 +0000
+@@ -19,7 +19,7 @@
+ 
+ CC          = @CC@
+ CCFLAGS     = $(CXXFLAGS)
+-CCINCLUDES  = -I. -I../nxcomp 
++CCINCLUDES  = -I. -I../nxcomp -I../nx-X11/lib/X11 -I../nx-X11/include -I../nx-X11/programs/Xserver/include
+ CCDEFINES   =
+ 
+ LDFLAGS     = @LDFLAGS@ -L../nx-X11/lib/X11 -L../nxcomp
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxdesktop-1.5.0-insitu.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxdesktop-1.5.0-insitu.patch
new file mode 100644
index 0000000..61bd2b2
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxdesktop-1.5.0-insitu.patch
@@ -0,0 +1,14 @@
+diff -uBb --recursive client.orig/nxdesktop/Makefile client/nxdesktop/Makefile
+--- client.orig/nxdesktop/Makefile	2006-11-23 07:49:51.000000000 +0000
++++ client/nxdesktop/Makefile	2006-11-23 07:52:17.000000000 +0000
+@@ -30,8 +30,8 @@
+ mandir      = $(prefix)/man
+ datadir     = $(prefix)/share
+ 
+-INCLUDES = -I../nxcomp -I../nxcompext
+-LDLIBS   = -lXpm -L../nxcompext -lXcompext -L../nxcomp -lXcomp -lX11 -lXext
++INCLUDES = -I../../common/nxcomp -I../../common/nxcompext
++LDLIBS   = -L../../common/nx-X11 -lXpm -L../../common/nxcompext -lXcompext -L../../common/nxcomp -lXcomp -lX11 -lXext
+ VERSION     = 1.5.0-2
+ KEYMAP_PATH = $(datadir)/keymaps-windows/
+ 
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxnode-1.5.0-insitu.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxnode-1.5.0-insitu.patch
new file mode 100644
index 0000000..9c6a827
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxnode-1.5.0-insitu.patch
@@ -0,0 +1,14 @@
+diff -uBb --recursive server.orig/nxnode/src/configure server/nxnode/src/configure
+--- server.orig/nxnode/src/configure	2006-11-23 22:07:58.000000000 +0000
++++ server/nxnode/src/configure	2006-11-23 22:08:43.000000000 +0000
+@@ -78,9 +78,7 @@
+ fi
+ 
+ echo "Checking perl path"
+-out=`../../perl/bin/perl -V:bin`
+-eval $out
+-perlbin="$bin/perl"
++perlbin="/usr/bin/perl"
+ 
+ echo "Created Makefile"
+ cp -f Makefile.in Makefile
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxsensor-1.5.0-insitu.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxsensor-1.5.0-insitu.patch
new file mode 100644
index 0000000..6bb9c5f
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxsensor-1.5.0-insitu.patch
@@ -0,0 +1,31 @@
+diff -uBb --recursive server.orig/nxsensor/server/Makefile server/nxsensor/server/Makefile
+--- server.orig/nxsensor/server/Makefile	2006-11-23 21:46:17.000000000 +0000
++++ server/nxsensor/server/Makefile	2006-11-23 21:48:48.000000000 +0000
+@@ -35,20 +35,20 @@
+ endif
+ PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0`
+ 
+-#GLIB12_INCLUDE = `glib-config --cflags`
+-#GLIB12_LIB = `glib-config --libs glib gmodule`
++GLIB12_INCLUDE = `glib-config --cflags`
++GLIB12_LIB = `glib-config --libs glib gmodule`
+ 
+-GLIB12_INCLUDE = -I../../glib-1.2.8/ -I../../glib-1.2.8/gmodule/ -I../../glib-1.2.8/gthread/
+-GLIB12_LIB = -L../../glib-1.2.8/.libs -L../../glib-1.2.8/gmodule/.libs -L../../glib-1.2.8/gthread/.libs -lglib -lgmodule -lgthread -ldl
++#GLIB12_INCLUDE = -I../../glib-1.2.8/ -I../../glib-1.2.8/gmodule/ -I../../glib-1.2.8/gthread/
++#GLIB12_LIB = -L../../glib-1.2.8/.libs -L../../glib-1.2.8/gmodule/.libs -L../../glib-1.2.8/gthread/.libs -lglib -lgmodule -lgthread -ldl
+ 
+ LD_RUN_PATH = /usr/NX/lib
+ 
+-FLAGS = -O3 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
++FLAGS = $(CFLAGS) -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+ ifeq ($(glib12),1)
+-FLAGS = -O3 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
++FLAGS = $(CFLAGS) -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
+ endif
+ ifeq ($(glib12),yes)
+-FLAGS = -O3 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
++FLAGS = $(CFLAGS) -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
+ endif
+ 
+ FLAGS+= $(PTHREAD_INC)
diff --git a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxviewer-1.5.0-insitu.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxviewer-1.5.0-insitu.patch
new file mode 100644
index 0000000..8213931
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxviewer-1.5.0-insitu.patch
@@ -0,0 +1,52 @@
+diff -ubB --recursive server.orig/nxviewer/nxviewer/Imakefile server/nxviewer/nxviewer/Imakefile
+--- server.orig/nxviewer/nxviewer/Imakefile	2006-11-23 20:23:37.000000000 +0000
++++ server/nxviewer/nxviewer/Imakefile	2006-11-23 20:25:41.000000000 +0000
+@@ -15,42 +15,24 @@
+ /*                                                                         */
+ /***************************************************************************/
+ 
+-#ifdef SunArchitecture
+-EXTRA_DEFINES = -D__EXTENSIONS__
+-#endif
+-
+ XCOMM Shared memory support works OK on x86 linux, not tested elsewhere but
+ XCOMM seems to cause problems on Digital Unix.
+ 
+ #if defined(i386Architecture) && defined(LinuxArchitecture)
+ DEFINES = -DMITSHM
+-ZLIB_INC = -I../../zlib-1-2.1
+-JPEG_INC = -I../../jpeg-6b
+ #endif
+ 
+-NX_INC = -I../../nxcomp -I../../nxcompext -I../../nx-X11/exports/include
+-NX_LIB = -L../../nxcomp -lXcomp -L../../nxcompext -lXcompext
+-
+-#ifdef SunArchitecture
+-NX_INC += -I/usr/sfw/include -I/usr/include
+-NX_LIB += ../../nx-X11/exports/lib/libXpm.a -L../../nx-X11/exports/lib
+-ZLIB_INC = -I/usr/local/include
+-JPEG_INC = -I/usr/local/include
+-#endif
++NX_INC = -I../../../common/nxcomp -I../../../common/nxcompext -I../../../common/nx-X11/exports/include
++NX_LIB = -L../../../common/nxcomp -lXcomp -L../../../common/nxcompext -lXcompext
+ 
+ 
+-INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include/X11 $(NX_INC)
++INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I../../../common/nx-X11/lib/X11 -I../../../common/nx-X11/include -I../../../common/nx-X11/programs/Xserver/include  $(NX_INC)
+ VNCAUTH_LIB = ./libvncauth.a
+-ZLIB_LIB = -L../../zlib-1.2.1 -lz
+-JPEG_LIB = -L../../jpeg-6b/.libs -ljpeg
++ZLIB_LIB = -lz
++JPEG_LIB = -ljpeg
+ 
+-USRLIBDIR = ../../nx-X11/exports/lib
++USRLIBDIR = ../../../common/nx-X11/lib/X11
+ 
+-#ifdef SunArchitecture
+-USRLIBDIR = /usr/NX/lib
+-SUN_LIB = -lX11 -lXext -L/usr/openwin/lib
+-JPEG_LIB = ../../jpeg-6b/.libs/libjpeg.a
+-#endif
+ 
+ DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
+ 
diff --git a/net-misc/nxserver-2xterminalserver/files/digest-2xlinuxterminalserver-1.5.0 b/net-misc/nxserver-2xterminalserver/files/digest-2xlinuxterminalserver-1.5.0
new file mode 100644
index 0000000..9a0271d
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/digest-2xlinuxterminalserver-1.5.0
@@ -0,0 +1,3 @@
+MD5 974d803334d1829d34835f8ecc2d0097 linuxterminalserver-1.5.0-r21-src.tar.gz 112952553
+RMD160 0e0e96243419d03b5d290ebba286b61b06edc75e linuxterminalserver-1.5.0-r21-src.tar.gz 112952553
+SHA256 e0b48e4f917cb84115c2c653f88aa33d3915901fff0a6cb2e779066c54b269d5 linuxterminalserver-1.5.0-r21-src.tar.gz 112952553