From a9f299283f6a663e1d75dd50ed5c77ac37676fdc Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Fri, 9 Mar 2007 10:59:04 +0000 Subject: All components now build, only nxserver left svn path=/testing/; revision=139 --- net-misc/nxserver-2xterminalserver/Manifest | 16 ++++---- .../files/1.5.0/nx-x11-1.5.0-external-nxcomp.patch | 48 ++++++++++++++++++++++ .../nxserver-2xterminalserver-1.5.0.ebuild | 28 ++++++------- 3 files changed, 70 insertions(+), 22 deletions(-) diff --git a/net-misc/nxserver-2xterminalserver/Manifest b/net-misc/nxserver-2xterminalserver/Manifest index e27ff40..260de70 100644 --- a/net-misc/nxserver-2xterminalserver/Manifest +++ b/net-misc/nxserver-2xterminalserver/Manifest @@ -2,10 +2,10 @@ AUX 1.5.0/nx-x11-1.5.0-amd64.patch 522 RMD160 7ddb4ea671f01b9dfd9afba794c90d6180 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-external-nxcomp.patch 2289 RMD160 4f64284290cbd94f8241edfff34c770d363436cd SHA1 504583438722fecd0cbfa3ee4763375ffae900d5 SHA256 f4d697906712e79e8065d73dcfa26f36c0a6fd901d2cfe964ad5ae47ccd030a4 -MD5 b39ac6a2ad4d62ef6b3e9175441f5af1 files/1.5.0/nx-x11-1.5.0-external-nxcomp.patch 2289 -RMD160 4f64284290cbd94f8241edfff34c770d363436cd files/1.5.0/nx-x11-1.5.0-external-nxcomp.patch 2289 -SHA256 f4d697906712e79e8065d73dcfa26f36c0a6fd901d2cfe964ad5ae47ccd030a4 files/1.5.0/nx-x11-1.5.0-external-nxcomp.patch 2289 +AUX 1.5.0/nx-x11-1.5.0-external-nxcomp.patch 4292 RMD160 96e7b372c9539b0c6041925ce28e86db9931b36b SHA1 34d43fb9b04f700a25ec775caac2b881696116d5 SHA256 895d3fddb8497bf2063f3ce8fe8c8b72e0309e912145747c2f472ba5cdf114a9 +MD5 e57a3488bd3a8a2d5905038e89faa9a1 files/1.5.0/nx-x11-1.5.0-external-nxcomp.patch 4292 +RMD160 96e7b372c9539b0c6041925ce28e86db9931b36b files/1.5.0/nx-x11-1.5.0-external-nxcomp.patch 4292 +SHA256 895d3fddb8497bf2063f3ce8fe8c8b72e0309e912145747c2f472ba5cdf114a9 files/1.5.0/nx-x11-1.5.0-external-nxcomp.patch 4292 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 @@ -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 2847 RMD160 dd8922c44ff2fe0dc12f8980d0ccaaeb68c0339a SHA1 29a942c629ada213f8ae7e803d11ed725b092215 SHA256 e6ad7ea054edb5ea6d454a904b42def3d30da153a1414bb09a042fb16ba6b6fd -MD5 1aabe89147a5379818d08a2004f74bfd nxserver-2xterminalserver-1.5.0.ebuild 2847 -RMD160 dd8922c44ff2fe0dc12f8980d0ccaaeb68c0339a nxserver-2xterminalserver-1.5.0.ebuild 2847 -SHA256 e6ad7ea054edb5ea6d454a904b42def3d30da153a1414bb09a042fb16ba6b6fd nxserver-2xterminalserver-1.5.0.ebuild 2847 +EBUILD nxserver-2xterminalserver-1.5.0.ebuild 2776 RMD160 96ab60571549a9b4acc6bf6431eb7c4190392bed SHA1 71f3b1729ac7cfdbf04160ef199c2b3c64668c09 SHA256 108fa7ef3dcf772f3f0f165721e0bd76ea13d02d7a3b0a2ae83b01b8a565d4ba +MD5 f99cb29de288b4613809f1c036ecb7e5 nxserver-2xterminalserver-1.5.0.ebuild 2776 +RMD160 96ab60571549a9b4acc6bf6431eb7c4190392bed nxserver-2xterminalserver-1.5.0.ebuild 2776 +SHA256 108fa7ef3dcf772f3f0f165721e0bd76ea13d02d7a3b0a2ae83b01b8a565d4ba nxserver-2xterminalserver-1.5.0.ebuild 2776 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/nx-x11-1.5.0-external-nxcomp.patch b/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-external-nxcomp.patch index 2841bb9..eb7f9d2 100644 --- a/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-external-nxcomp.patch +++ b/net-misc/nxserver-2xterminalserver/files/1.5.0/nx-x11-1.5.0-external-nxcomp.patch @@ -47,3 +47,51 @@ #endif ServerTarget(nxagent,$(NXAGENTDIRS),$(NXAGENTOBJS), \ +--- common/nx-X11/lib/Xext/Imakefile.orig 2007-03-09 10:26:20.000000000 +0100 ++++ common/nx-X11/lib/Xext/Imakefile 2007-03-09 10:26:42.000000000 +0100 +@@ -60,14 +60,7 @@ + LINTLIBS = $(LINTXLIB) + + #if NXLibraries +- +-$(NX_XCOMPLIBEXTTARGET): +- cd ../../../nxcompext && \ +- ./configure && \ +- make +- + all:: $(NX_XCOMPLIBEXTTARGET) +- + #endif + + #include +--- client/nxdesktop/configure.orig 2007-03-09 11:16:59.000000000 +0100 ++++ client/nxdesktop/configure 2007-03-09 11:23:41.000000000 +0100 +@@ -162,7 +162,7 @@ + + # Find X installation + +-xdirs="$extraxdir ../nx-X11/exports /usr/X11R6 /usr/X11 /usr/openwin /usr /usr/local/X11R6 /usr/local/X11 /usr/local" ++xdirs="$extraxdir ../../common/nx-X11/exports /usr/X11R6 /usr/X11 /usr/openwin /usr /usr/local/X11R6 /usr/local/X11 /usr/local" + + for dir in $xdirs; do + if [ -f $dir/include/X11/Xlib.h ]; then +@@ -195,7 +195,7 @@ + rpath="$rpath:$xdir/lib" + fi + +-ldflags="$ldflags" ++ldflags="$ldflags -L/usr/NX/lib" + targets="$targets nxdesktop" + + #withoutopenssl not currently supported +--- server/nxviewer/nxviewer/Imakefile.orig 2007-03-09 11:35:58.000000000 +0100 ++++ server/nxviewer/nxviewer/Imakefile 2007-03-09 11:36:50.000000000 +0100 +@@ -54,7 +54,7 @@ + + DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) + +-LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) $(NX_LIB) ++LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) $(NX_LIB) -L/usr/NX/lib + + #ifdef SunArchitecture + LOCAL_LIBRARIES = $(NX_LIB) $(SUN_LIB) XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_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 f0a62c6..11ef30d 100644 --- a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild +++ b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild @@ -2,10 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit eutils +inherit flag-o-matic eutils -DESCRIPTION="A X11/RDP/VNC proxy server especially well suited to low bandwidth -links such as wireless, WANS, and worse" +DESCRIPTION="A X11/RDP/VNC proxy server especially well suited to low bandwidth links such as wireless, WANS, and worse" HOMEPAGE="http://www.2x.com/terminalserver/" SRC_URI="http://code.2x.com/release/linuxterminalserver/src/linuxterminalserver-1.5.0-r21-src.tar.gz" @@ -48,19 +47,21 @@ src_unpack() build_nxagent() { - einfo - einfo "Building nx-X11" - einfo - - cd ${S}/common/nx-X11 - emake World || die - einfo einfo "Building nxcompext" einfo cd ${S}/common/nxcompext + append-ldflags "-L/usr/NX/lib" + econf || die emake || die + + einfo + einfo "Building nx-X11" + einfo + + cd ${S}/common/nx-X11 + emake World || die } build_nxdesktop() @@ -70,9 +71,8 @@ build_nxdesktop() einfo cd ${S}/client/nxdesktop - econf || 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 + CC=(tc-getCC) ./configure || die + emake || die } @@ -128,7 +128,7 @@ build_nxserver() einfo cd ${S}/server/nxnode/src - econf || die + ./configure || die emake setversion || die emake || die } -- cgit v1.2.3-65-gdbad