Added fonts path workaround and merged *insitu patches

2x server almost works!

svn path=/testing/; revision=147

8 files changed, 138 insertions, 152 deletions

diff --git a/net-misc/nxserver-2xterminalserver/Manifest b/net-misc/nxserver-2xterminalserver/Manifest
index 044df0f..6c9908c 100644
--- a/net-misc/nxserver-2xterminalserver/Manifest
+++ b/net-misc/nxserver-2xterminalserver/Manifest
@@ -18,39 +18,23 @@ AUX 1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch 17973 RMD160 66193b7b9dc2d2ec2d7072a
 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/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/nxserver-2xterminalserver-1.5.0-external-nxcomp.patch 4292 RMD160 96e7b372c9539b0c6041925ce28e86db9931b36b SHA1 34d43fb9b04f700a25ec775caac2b881696116d5 SHA256 895d3fddb8497bf2063f3ce8fe8c8b72e0309e912145747c2f472ba5cdf114a9
 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-insitu.patch 5041 RMD160 6b6c6f0b94615b5398dd3a87c46e2ec2c75e0b0f SHA1 11ca560df004ee45de5d74e7ea9d8c8b0a6ae6cd SHA256 5a7b4126f31b3bc637de3fdc5916bef74d6092c162f907eac10e5a94a72c79fb
+MD5 169b6124d6aa0095da9527f117a000ae files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch 5041
+RMD160 6b6c6f0b94615b5398dd3a87c46e2ec2c75e0b0f files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch 5041
+SHA256 5a7b4126f31b3bc637de3fdc5916bef74d6092c162f907eac10e5a94a72c79fb files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch 5041
 AUX 1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2775 RMD160 1399d4e0a1e2da8f1e2c9203465bece738be6452 SHA1 dd8f6e7c43ac6a33dff2f84f4873606d1ffa0191 SHA256 f521231e67fe9e9aa1cbaa82a679483b5c4cdc01aac27b02cd72d5de350edfc6
 MD5 1eb7778fcae558d88ca6a16dc85e58e7 files/1.5.0/nxserver-2xterminalserver-1.5.0-setup.patch 2775
 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
-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 5438 RMD160 7af93f318e03898925673fefaa39585c62d1b9f3 SHA1 e7ca402b49536457e38d2204f32e3cc151ed0806 SHA256 5f13889ae39b2f5fdeb3f7d5a435bd8b455b80bf5c65646408e51a8d045fba14
-MD5 23a101adbdcd8199d7d451cc0682c221 nxserver-2xterminalserver-1.5.0.ebuild 5438
-RMD160 7af93f318e03898925673fefaa39585c62d1b9f3 nxserver-2xterminalserver-1.5.0.ebuild 5438
-SHA256 5f13889ae39b2f5fdeb3f7d5a435bd8b455b80bf5c65646408e51a8d045fba14 nxserver-2xterminalserver-1.5.0.ebuild 5438
+EBUILD nxserver-2xterminalserver-1.5.0.ebuild 5338 RMD160 18b3fe3966189fabb3ea7adfae0b637037e97f37 SHA1 2ff4e4c184b5436c1aa6885729f59820cb2e1160 SHA256 6d6676b27aaca7e881317465434621d34e177b9ee644d1f7b1b94391426fd64c
+MD5 4300929dcbfdeb3fa0a045349dd7e7ca nxserver-2xterminalserver-1.5.0.ebuild 5338
+RMD160 18b3fe3966189fabb3ea7adfae0b637037e97f37 nxserver-2xterminalserver-1.5.0.ebuild 5338
+SHA256 6d6676b27aaca7e881317465434621d34e177b9ee644d1f7b1b94391426fd64c nxserver-2xterminalserver-1.5.0.ebuild 5338
 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/nxcompext-1.5.0-insitu.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxcompext-1.5.0-insitu.patch
deleted file mode 100644
index f864dd5..0000000
--- a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxcompext-1.5.0-insitu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 61bd2b2..0000000
--- a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxdesktop-1.5.0-insitu.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index 9c6a827..0000000
--- a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxnode-1.5.0-insitu.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index 6bb9c5f..0000000
--- a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxsensor-1.5.0-insitu.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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/nxserver-2xterminalserver-1.5.0-insitu.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch
new file mode 100644
index 0000000..86ab44d
--- /dev/null
+++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxserver-2xterminalserver-1.5.0-insitu.patch
@@ -0,0 +1,123 @@
+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 -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 -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 -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 -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/1.5.0/nxviewer-1.5.0-insitu.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nxviewer-1.5.0-insitu.patch
deleted file mode 100644
index 8213931..0000000
--- a/net-misc/nxserver-2xterminalserver/files/1.5.0/nxviewer-1.5.0-insitu.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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/nxserver-2xterminalserver-1.5.0.ebuild b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
index 5fe3fb9..abfc9f3 100644
--- a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
+++ b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
@@ -41,11 +41,7 @@ src_unpack() {
 	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
+	epatch ${FILESDIR}/1.5.0/${P}-insitu.patch || die
 	epatch ${FILESDIR}/1.5.0/${P}-external-nxcomp.patch || die
 	epatch ${FILESDIR}/1.5.0/${P}-setup.patch || die
 
@@ -215,6 +211,12 @@ src_install() {
 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!!"
+	# Workaround fonts link
+	if has_version '>=x11-base/xorg-x11-7.0' && ! [ -e /usr/lib/X11/fonts ];
+	then
+		ln -s /usr/share/fonts /usr/lib/X11/fonts
+	fi
+
 	# only run install when no configuration file is found
 	if [ -f /usr/NX/etc/node.cfg ]; then
 		einfo "Running 2X update script"