diff options
| -rw-r--r-- | net-misc/nxclient-base/Manifest | 8 | ||||
| -rw-r--r-- | net-misc/nxclient-base/nxclient-base-2.0.0.ebuild | 13 | ||||
| -rw-r--r-- | net-misc/nxclient/Manifest | 8 | ||||
| -rw-r--r-- | net-misc/nxclient/nxclient-2.0.0.ebuild | 10 | ||||
| -rw-r--r-- | net-misc/nxnode-base/Manifest | 32 | ||||
| -rw-r--r-- | net-misc/nxnode-base/files/2.0.0/nxdesktop-fix-nxcomp-paths.patch | 4 | ||||
| -rw-r--r-- | net-misc/nxnode-base/files/2.0.0/nxnode-fix-nxcomp-paths.patch | 16 | ||||
| -rw-r--r-- | net-misc/nxnode-base/files/2.0.0/nxviewer-fix-nxcomp-paths.patch | 2 | ||||
| -rw-r--r-- | net-misc/nxnode-base/nxnode-base-2.0.0.ebuild | 2 | ||||
| -rw-r--r-- | net-misc/nxserver-freenx/Manifest | 8 | ||||
| -rw-r--r-- | net-misc/nxserver-freenx/nxserver-freenx-0.6.0_alpha20060711.ebuild | 15 |
11 files changed, 63 insertions, 55 deletions
diff --git a/net-misc/nxclient-base/Manifest b/net-misc/nxclient-base/Manifest index c355a87..caefa7f 100644 --- a/net-misc/nxclient-base/Manifest +++ b/net-misc/nxclient-base/Manifest @@ -20,10 +20,10 @@ DIST nxesd-2.0.0-4.tar.gz 663788 RMD160 30b30c64378d0e4672fad7b3b78caf349b501299 DIST nxkill-2.0.0-4.tar.gz 43988 RMD160 7628b447f028d8a0dcd9f7ecbaffd726d8f664db SHA1 26ef1814c5bdbd84c8a8678a8400e62e4a9cb3fc SHA256 7a45f40fabe2c73df423e676f1d49927bc0657291495cb5439f18080c3bee0bc DIST nxservice-2.0.0-26.tar.gz 46085 RMD160 2741cbd68b3e58728a72edad59e2ea3c4d0d9fc6 SHA1 1619a8b8748ceb49e9557f2467eac1396a06731f SHA256 847652d9618904444aa2c9f14f0d2b26298be7e7dba69e50148156839403cbc6 DIST nxssh-2.0.0-12.tar.gz 921462 RMD160 7a23d572a253e65e339011d48cc6fffa856e4688 SHA1 bb9abbc2d0d383e15537163b4ec16556a89db676 SHA256 0eaa90b659dbd3d15da9d92eb02a86aec117b759be848dd13578bbfe1857a3ee -EBUILD nxclient-base-2.0.0.ebuild 3885 RMD160 12a5e5ebcae72a7ac3bae9ce14ae18faaa677d73 SHA1 3f24dc0f09ffa97aa36d8ab9a37d48927c260542 SHA256 c6baf6e351270027b6fded4f50d91dea33ade6de1194a81ce58b00f1209f1154 -MD5 415d1e63b9e2d2ddce0dbb29a6174e60 nxclient-base-2.0.0.ebuild 3885 -RMD160 12a5e5ebcae72a7ac3bae9ce14ae18faaa677d73 nxclient-base-2.0.0.ebuild 3885 -SHA256 c6baf6e351270027b6fded4f50d91dea33ade6de1194a81ce58b00f1209f1154 nxclient-base-2.0.0.ebuild 3885 +EBUILD nxclient-base-2.0.0.ebuild 3951 RMD160 0aabcf6eefdbcdca0362f35bd45f97083a77305f SHA1 77e8fbb649ad5d8b45de839d96a91e80af550b52 SHA256 e1c1f79ea4f965d7588d92b49ac5c6467e9c98f67238d0730c4194ad6f2a819b +MD5 39c7127548c4674a5524ea4502a2973a nxclient-base-2.0.0.ebuild 3951 +RMD160 0aabcf6eefdbcdca0362f35bd45f97083a77305f nxclient-base-2.0.0.ebuild 3951 +SHA256 e1c1f79ea4f965d7588d92b49ac5c6467e9c98f67238d0730c4194ad6f2a819b nxclient-base-2.0.0.ebuild 3951 MD5 ba8c06a6e2fb4951f6642bce4d1b1ffa files/digest-nxclient-base-2.0.0 1473 RMD160 6151ff5e4bb535b539341a622d8168cf3dcd44de files/digest-nxclient-base-2.0.0 1473 SHA256 5496a405af79038796bd40ac50b7b62bde2727967b1dbbc3c51cb66df57616ae files/digest-nxclient-base-2.0.0 1473 diff --git a/net-misc/nxclient-base/nxclient-base-2.0.0.ebuild b/net-misc/nxclient-base/nxclient-base-2.0.0.ebuild index 39da499..16503ce 100644 --- a/net-misc/nxclient-base/nxclient-base-2.0.0.ebuild +++ b/net-misc/nxclient-base/nxclient-base-2.0.0.ebuild @@ -138,14 +138,17 @@ src_install() { dolib.so nxcomp/libXcomp.so* dolib.so nxcompsh/libXcompsh.so* + insinto /usr/NX/include + doins nxcomp/NX*.h nxcomp/MD5.h + # install environment variables cat <<EOF > ${T}/50nxpaths NXDIR=/usr/NX -PATH=${NXDIR}/bin -ROOTPATH=${NXDIR}/bin -CONFIG_PROTECT="${NXDIR}/etc ${NXDIR}/home" -PRELINK_PATH_MASK=${NXDIR} -SEARCH_DIRS_MASK=/usr/NX +PATH=\${NXDIR}/bin +ROOTPATH=\${NXDIR}/bin +CONFIG_PROTECT="\${NXDIR}/etc \${NXDIR}/home" +PRELINK_PATH_MASK=\${NXDIR} +SEARCH_DIRS_MASK=\${NXDIR} EOF doenvd ${T}/50nxpaths } diff --git a/net-misc/nxclient/Manifest b/net-misc/nxclient/Manifest index 7f7fa2c..4e888ab 100644 --- a/net-misc/nxclient/Manifest +++ b/net-misc/nxclient/Manifest @@ -1,8 +1,8 @@ DIST nxclient-2.0.0-98.i386.rpm 3474183 RMD160 d55fdbe0dccbdf4f2cd0d0988536a431f5e5cb9f SHA1 613b276d1add4e7715b724fa511e8f0e71174790 SHA256 067cecb2ef700726a035f08a756a4669dee9dd66be53f353c7eb4c3d304e6977 -EBUILD nxclient-2.0.0.ebuild 3354 RMD160 0c6fea914d9a4e18db86ff24151516428d82cca4 SHA1 0c5dee0d05a1b5206b82733b4f300594e5b24799 SHA256 02cc401232095ce72f14c6dc687d901a73f11e4c07862c8997320933e1a16336 -MD5 970b9b8232171778e4dc90bfa406986c nxclient-2.0.0.ebuild 3354 -RMD160 0c6fea914d9a4e18db86ff24151516428d82cca4 nxclient-2.0.0.ebuild 3354 -SHA256 02cc401232095ce72f14c6dc687d901a73f11e4c07862c8997320933e1a16336 nxclient-2.0.0.ebuild 3354 +EBUILD nxclient-2.0.0.ebuild 3366 RMD160 26e487a326718088663f1d48d1b73e1fa0c8107a SHA1 7dd90d59a4bd8a1de60fe2a943ae0d7c061f2b9b SHA256 0aef3ccd5ffdacccce6e7a895e852c9af0e71fcde3e67880442f7ce93b42b0f9 +MD5 efe3e8bbae06a0dddb699759dee94512 nxclient-2.0.0.ebuild 3366 +RMD160 26e487a326718088663f1d48d1b73e1fa0c8107a nxclient-2.0.0.ebuild 3366 +SHA256 0aef3ccd5ffdacccce6e7a895e852c9af0e71fcde3e67880442f7ce93b42b0f9 nxclient-2.0.0.ebuild 3366 MD5 980d093f93da9952302399e1f51104f1 files/digest-nxclient-2.0.0 262 RMD160 16df6ae59cedf58f7130fe69b3fb0e9c1cd3b283 files/digest-nxclient-2.0.0 262 SHA256 165e16e1e0ebee6459b550933aeb1874b788459c8a0d661a0565b30958c2cfdd files/digest-nxclient-2.0.0 262 diff --git a/net-misc/nxclient/nxclient-2.0.0.ebuild b/net-misc/nxclient/nxclient-2.0.0.ebuild index a8e1c72..46a6df9 100644 --- a/net-misc/nxclient/nxclient-2.0.0.ebuild +++ b/net-misc/nxclient/nxclient-2.0.0.ebuild @@ -105,11 +105,11 @@ src_install() { if use prebuilt ; then cat <<EOF > ${T}/50nxpaths NXDIR=/usr/NX -PATH=/usr/NX/bin -ROOTPATH=/usr/NX/bin -CONFIG_PROTECT="/usr/NX/etc /usr/NX/home" -PRELINK_PATH_MASK=/usr/NX -SEARCH_DIRS_MASK=/usr/NX +PATH=\${NXDIR}/bin +ROOTPATH=\${NXDIR}/bin +CONFIG_PROTECT="\${NXDIR}/etc \${NXDIR}/home" +PRELINK_PATH_MASK=\${NXDIR} +SEARCH_DIRS_MASK=\${NXDIR} EOF doenvd ${T}/50nxpaths fi diff --git a/net-misc/nxnode-base/Manifest b/net-misc/nxnode-base/Manifest index f6544b4..f3cee63 100644 --- a/net-misc/nxnode-base/Manifest +++ b/net-misc/nxnode-base/Manifest @@ -2,22 +2,22 @@ AUX 2.0.0/nxcompext-makefile.patch 852 RMD160 c33478fdf2e1dc09c95ebb8aad9bb07a55 MD5 cd89a8de3e8d6841eadbe2e71c664a75 files/2.0.0/nxcompext-makefile.patch 852 RMD160 c33478fdf2e1dc09c95ebb8aad9bb07a55fc76c6 files/2.0.0/nxcompext-makefile.patch 852 SHA256 825c31636ed01d939a8957fee5cb647c37485f75bde9552976bebebd98cd5088 files/2.0.0/nxcompext-makefile.patch 852 -AUX 2.0.0/nxdesktop-fix-nxcomp-paths.patch 1337 RMD160 7a33dd1d402efcb8b8a34c6e7ecbc7dd254b83e2 SHA1 dfbc06d4bb249bf828bfc25d04bae1a572ef5dab SHA256 ff826d96d042669653c67fa84d93dbc0767686d9cc92d525bc1b86f33d4e76b6 -MD5 54f47049ffa2574b226e77997a41a6c3 files/2.0.0/nxdesktop-fix-nxcomp-paths.patch 1337 -RMD160 7a33dd1d402efcb8b8a34c6e7ecbc7dd254b83e2 files/2.0.0/nxdesktop-fix-nxcomp-paths.patch 1337 -SHA256 ff826d96d042669653c67fa84d93dbc0767686d9cc92d525bc1b86f33d4e76b6 files/2.0.0/nxdesktop-fix-nxcomp-paths.patch 1337 -AUX 2.0.0/nxnode-fix-nxcomp-paths.patch 5937 RMD160 82516776b349819c028031acb9fb473167b64667 SHA1 d89c693805395cc5ebc387809df5a65c0cc312ba SHA256 27b182ff741cc228151134e432c99785dabaa923a1633645dcdecdf732cbfaf4 -MD5 06a0d1d3f51e8f3f1c3945dbb0ba3bca files/2.0.0/nxnode-fix-nxcomp-paths.patch 5937 -RMD160 82516776b349819c028031acb9fb473167b64667 files/2.0.0/nxnode-fix-nxcomp-paths.patch 5937 -SHA256 27b182ff741cc228151134e432c99785dabaa923a1633645dcdecdf732cbfaf4 files/2.0.0/nxnode-fix-nxcomp-paths.patch 5937 +AUX 2.0.0/nxdesktop-fix-nxcomp-paths.patch 1345 RMD160 30cd5b3e7df30a0ce2c45a25d276257c9382793f SHA1 95eac2079a31e576569609513f0fcf6e01da6c65 SHA256 aaf72f054ca38197162c7ab68c8bd580c528df326b87e2388e1a183474a401a8 +MD5 1ab2ae07d8dabbd9a3b3e3b76b481b06 files/2.0.0/nxdesktop-fix-nxcomp-paths.patch 1345 +RMD160 30cd5b3e7df30a0ce2c45a25d276257c9382793f files/2.0.0/nxdesktop-fix-nxcomp-paths.patch 1345 +SHA256 aaf72f054ca38197162c7ab68c8bd580c528df326b87e2388e1a183474a401a8 files/2.0.0/nxdesktop-fix-nxcomp-paths.patch 1345 +AUX 2.0.0/nxnode-fix-nxcomp-paths.patch 5969 RMD160 0804d348dba0bf634393c085c2742d77ec5d7db6 SHA1 8cf67d522c63dcd9b7da30c9827f4b7dfd756b1d SHA256 5efe2a4f7cfcfb0a3b61bdac7a1b8353479bf44d775ca2ddc732f5c8bf94e269 +MD5 c1efc4274ae6a2ec32b23b58a58c44ae files/2.0.0/nxnode-fix-nxcomp-paths.patch 5969 +RMD160 0804d348dba0bf634393c085c2742d77ec5d7db6 files/2.0.0/nxnode-fix-nxcomp-paths.patch 5969 +SHA256 5efe2a4f7cfcfb0a3b61bdac7a1b8353479bf44d775ca2ddc732f5c8bf94e269 files/2.0.0/nxnode-fix-nxcomp-paths.patch 5969 AUX 2.0.0/nxspool-gcc4.patch 467 RMD160 3c46121de4c40025b7e27b76b2a6cdc0e690d974 SHA1 f3e31f958213789a1e87d5ad2b929e970acd0355 SHA256 c857f0a64bf619c1bdcf798416ab50b275a696d62d8c24d0c6fb11e30558c908 MD5 1440a0de4d8f822f775f608bf95513ca files/2.0.0/nxspool-gcc4.patch 467 RMD160 3c46121de4c40025b7e27b76b2a6cdc0e690d974 files/2.0.0/nxspool-gcc4.patch 467 SHA256 c857f0a64bf619c1bdcf798416ab50b275a696d62d8c24d0c6fb11e30558c908 files/2.0.0/nxspool-gcc4.patch 467 -AUX 2.0.0/nxviewer-fix-nxcomp-paths.patch 671 RMD160 9b4ddd27fea9633009d3661ae0965b297a7abb39 SHA1 3e232e4eec3cb875364898ff909d3f0ecbb40f21 SHA256 ac819437d78b8d631befbb96ec784cc824c2cc1febbb1b2f4444f80396f8b3f6 -MD5 c26557d8dbeca740d8613861b80af6f4 files/2.0.0/nxviewer-fix-nxcomp-paths.patch 671 -RMD160 9b4ddd27fea9633009d3661ae0965b297a7abb39 files/2.0.0/nxviewer-fix-nxcomp-paths.patch 671 -SHA256 ac819437d78b8d631befbb96ec784cc824c2cc1febbb1b2f4444f80396f8b3f6 files/2.0.0/nxviewer-fix-nxcomp-paths.patch 671 +AUX 2.0.0/nxviewer-fix-nxcomp-paths.patch 675 RMD160 b6164856f361710add6b20e046c7cc055cfc0fdf SHA1 0bfa12a25e92751ecd39d1c3adc501df5af5ca23 SHA256 7a055ad699985aacc34a01b2dd5b665bba3a9b18b1916eaccb2b097fda96c747 +MD5 436333c7d9a962ad062151fe9e7c2ee5 files/2.0.0/nxviewer-fix-nxcomp-paths.patch 675 +RMD160 b6164856f361710add6b20e046c7cc055cfc0fdf files/2.0.0/nxviewer-fix-nxcomp-paths.patch 675 +SHA256 7a055ad699985aacc34a01b2dd5b665bba3a9b18b1916eaccb2b097fda96c747 files/2.0.0/nxviewer-fix-nxcomp-paths.patch 675 DIST nx-X11-2.0.0-31.tar.gz 32667577 RMD160 7c922d1269d594764b7dbc2856d831f1913b0b6b SHA1 175939c904870bf3a54afb99b00c29695e9bfcd2 SHA256 7945e8abcaac8f6cd86b59a052f0c02edfd30386eff66c77705259fda51ee7ea DIST nxagent-2.0.0-89.tar.gz 933839 RMD160 56e8d49ccf406a7e6032b9d5937ec00861e0867b SHA1 56ef823fd4560ee501f3e0a6511a7ce022ed3e4a SHA256 d13a85aae8934f79896ae6d62c3be04c2c264229ec5511872fa8c9a8856cffcd DIST nxauth-2.0.0-3.tar.gz 23275 RMD160 f1213d09ffc4961ef244d46e5858b2a6bda39575 SHA1 9951b2f10b3a24bdb0a4e77be9be3fe934999619 SHA256 2d247695c816af638fa1a59a751ca6a85a4833a0ebd63c793b8e13ead13edb00 @@ -27,10 +27,10 @@ DIST nxsensor-2.0.0-2.tar.gz 180418 RMD160 0f25d3b4af1197499b05f96a7ffc251f6d045 DIST nxspool-2.0.0-4.tar.gz 2838395 RMD160 fe7fa5312b8da770f458080846686e70c43a5022 SHA1 c2fe74ad5655b75322c5806838f9756a8674bebc SHA256 ef26f19c076a71a766a2e1f2103d1080c190159678d07ecc3cfc59d5724489dc DIST nxuexec-2.0.0-4.tar.gz 6948 RMD160 9308e1bc1763801b99ddcbab2d7ce25050e20ae3 SHA1 788f6465c28686b993586a93e6d24213238dc8d2 SHA256 80c6806377742eb0dfdec244b535c5ccebb20fc98d68cbb49ad7f3168b7eef11 DIST nxviewer-2.0.0-15.tar.gz 93567 RMD160 df74a798e863d95e419057d706f5f8932a65aa5c SHA1 47f2b5ce65d049bb1c886e44269a1f1389c25c22 SHA256 96d1fe59d96fea67816a2f8390f5d430105fc1f2c8ba1ca573f6ee2eaef6f364 -EBUILD nxnode-base-2.0.0.ebuild 3747 RMD160 164e7caf9612dce91e0faabcc04b2dee6408233c SHA1 23f801464746824b5779b3c9208c00692996b2e0 SHA256 a4856f961e1163cda0789412bb2db51c931f1be4f757b0f1a6b10614e5e2903c -MD5 e168f20a26b1215770de998894b9ea1f nxnode-base-2.0.0.ebuild 3747 -RMD160 164e7caf9612dce91e0faabcc04b2dee6408233c nxnode-base-2.0.0.ebuild 3747 -SHA256 a4856f961e1163cda0789412bb2db51c931f1be4f757b0f1a6b10614e5e2903c nxnode-base-2.0.0.ebuild 3747 +EBUILD nxnode-base-2.0.0.ebuild 3747 RMD160 1d7df2edf601c24c419a5c2aa0c87f2c25198e4c SHA1 65e7cde6ea3c53b5e1dfe85b8fff6fbd432b219a SHA256 df7a101143ea4c90210b781ea526661384a37a746f603422e4c8ad8917b0760c +MD5 040a72dd31c5e8279c987e56a2161192 nxnode-base-2.0.0.ebuild 3747 +RMD160 1d7df2edf601c24c419a5c2aa0c87f2c25198e4c nxnode-base-2.0.0.ebuild 3747 +SHA256 df7a101143ea4c90210b781ea526661384a37a746f603422e4c8ad8917b0760c nxnode-base-2.0.0.ebuild 3747 MD5 517b1e8eb8bedfbf1e68b48baa96dfcb files/digest-nxnode-base-2.0.0 2244 RMD160 2d6407254cae2201ed477c8f7c2de667622203d1 files/digest-nxnode-base-2.0.0 2244 SHA256 cd90218306028a3e19797d6c68faba6b51c79f5b36e228e907acc133fe89a517 files/digest-nxnode-base-2.0.0 2244 diff --git a/net-misc/nxnode-base/files/2.0.0/nxdesktop-fix-nxcomp-paths.patch b/net-misc/nxnode-base/files/2.0.0/nxdesktop-fix-nxcomp-paths.patch index 31252d7..aa6ef3d 100644 --- a/net-misc/nxnode-base/files/2.0.0/nxdesktop-fix-nxcomp-paths.patch +++ b/net-misc/nxnode-base/files/2.0.0/nxdesktop-fix-nxcomp-paths.patch @@ -7,7 +7,7 @@ diff -purN nxnode.orig/nxdesktop/Makefile nxnode/nxdesktop/Makefile -INCLUDES = -I../nxcomp -I../nxcompext -I../nxesd -LDLIBS = -lXpm -L../nxcompext -lXcompext -L../nxcomp -L../nxesd/.libs -lXcomp -lX11 -lXext -+INCLUDES = -I/usr/NX/lib -I../nxcompext -I../nxesd ++INCLUDES = -I/usr/NX/include -I../nxcompext -I../nxesd +LDLIBS = -lXpm -L../nxcompext -lXcompext -L/usr/NX/lib -L../nxesd/.libs -lXcomp -lX11 -lXext VERSION = 1.5.0-2 KEYMAP_PATH = $(datadir)/keymaps-windows/ @@ -20,7 +20,7 @@ diff -purN nxnode.orig/nxdesktop/configure nxnode/nxdesktop/configure case `uname -s` in SunOS) - echo "INCLUDES = -I../nxcomp -I../nxcompext -I/usr/local/include -I/usr/sfw/include">> Makeconf -+ echo "INCLUDES = -I/usr/NX/lib -I../nxcompext -I/usr/local/include -I/usr/sfw/include">> Makeconf ++ echo "INCLUDES = -I/usr/NX/include -I../nxcompext -I/usr/local/include -I/usr/sfw/include">> Makeconf ldflags="$ldflags -L/usr/sfw/lib -lsocket -lnsl -R$rpath" cflags="$cflags -DHAVE_DIRENT_H=1 -DHAVE_DECL_DIRFD=0 -DDIR_FD_MEMBER_NAME=dd_fd" ;; diff --git a/net-misc/nxnode-base/files/2.0.0/nxnode-fix-nxcomp-paths.patch b/net-misc/nxnode-base/files/2.0.0/nxnode-fix-nxcomp-paths.patch index 1318d90..180e37f 100644 --- a/net-misc/nxnode-base/files/2.0.0/nxnode-fix-nxcomp-paths.patch +++ b/net-misc/nxnode-base/files/2.0.0/nxnode-fix-nxcomp-paths.patch @@ -6,10 +6,10 @@ diff -purN nxnode.orig/nx-X11/lib/X11/Imakefile nxnode/nx-X11/lib/X11/Imakefile #ifdef SunArchitecture -NX_INCLUDES = -I../../../nxcomp -I/usr/sfw/include -+NX_INCLUDES = -I/usr/NX/lib -I/usr/sfw/include ++NX_INCLUDES = -I/usr/NX/include -I/usr/sfw/include #else -NX_INCLUDES = -I../../../nxcomp -+NX_INCLUDES = -I/usr/NX/lib ++NX_INCLUDES = -I/usr/NX/include #endif NX_DEFINES = -DNX_TRANS_SOCKET @@ -94,7 +94,7 @@ diff -purN nxnode.orig/nx-X11/programs/Xserver/hw/nxagent/Imakefile nxnode/nx-X1 NXFONTINCLUDES = -I../../../../lib/font/include -INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext \ -+INCLUDES = -I. -I/usr/NX/lib -I../../../../../nxcompext \ ++INCLUDES = -I. -I/usr/NX/include -I../../../../../nxcompext \ -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ -I../../mi -I../../include -I../../os \ -I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \ @@ -102,7 +102,7 @@ diff -purN nxnode.orig/nx-X11/programs/Xserver/hw/nxagent/Imakefile nxnode/nx-X1 $(VFBINCLUDES) $(NXFONTINCLUDES) #ifdef SunArchitecture -INCLUDES = -I../../../../../nxcomp -I../../../../../nxcompext \ -+INCLUDES = -I/usr/NX/lib -I../../../../../nxcompext \ ++INCLUDES = -I/usr/NX/include -I../../../../../nxcompext \ -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ -I/usr/sfw/include \ -I../../mi -I../../include -I../../os \ @@ -111,7 +111,7 @@ diff -purN nxnode.orig/nx-X11/programs/Xserver/hw/nxagent/Imakefile nxnode/nx-X1 -I../../mi -I../../include -I../../os \ -I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \ - -I. -I../../../../../nxcomp -I../../../../../nxcompext \ -+ -I. -I/usr/NX/lib -I../../../../../nxcompext \ ++ -I. -I/usr/NX/include -I../../../../../nxcompext \ -I$(EXTINCSRC) -I$(XINCLUDESRC) \ $(VFBINCLUDES) $(NXFONTINCLUDES) #endif @@ -123,7 +123,7 @@ diff -purN nxnode.orig/nx-X11/programs/Xserver/os/Imakefile nxnode/nx-X11/progra #if NXLibraries -NX_INCLUDES = -I../../../../nxcomp -+NX_INCLUDES = -I/usr/NX/lib ++NX_INCLUDES = -I/usr/NX/include NX_DEFINES = -DNX_TRANS_SOCKET \ -DNX_TRANS_AUTH \ @@ -135,7 +135,7 @@ diff -purN nxnode.orig/nxcompext/Makefile.in nxnode/nxcompext/Makefile.in -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wnested-externs -CXXINCLUDES = -I. -I../nxcomp -+CXXINCLUDES = -I. -I/usr/NX/lib ++CXXINCLUDES = -I. -I/usr/NX/include CXXDEFINES = CC = @CC@ @@ -143,7 +143,7 @@ diff -purN nxnode.orig/nxcompext/Makefile.in nxnode/nxcompext/Makefile.in -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wnested-externs -CCINCLUDES = -I. -I../nxcomp -+CCINCLUDES = -I. -I/usr/NX/lib ++CCINCLUDES = -I. -I/usr/NX/include CCDEFINES = -LDFLAGS = @LDFLAGS@ -L../nxcomp diff --git a/net-misc/nxnode-base/files/2.0.0/nxviewer-fix-nxcomp-paths.patch b/net-misc/nxnode-base/files/2.0.0/nxviewer-fix-nxcomp-paths.patch index 11afe93..599f333 100644 --- a/net-misc/nxnode-base/files/2.0.0/nxviewer-fix-nxcomp-paths.patch +++ b/net-misc/nxnode-base/files/2.0.0/nxviewer-fix-nxcomp-paths.patch @@ -7,7 +7,7 @@ diff -purN nxnode.orig/nxviewer/nxviewer/Imakefile nxnode/nxviewer/nxviewer/Imak -NX_INC = -I../../nxcomp -I../../nxcompext -I../../nx-X11/exports/include -NX_LIB = -L../../nxcomp -lXcomp -L../../nxcompext -lXcompext -+NX_INC = -I/usr/NX/lib -I../../nxcompext -I../../nx-X11/exports/include ++NX_INC = -I/usr/NX/include -I../../nxcompext -I../../nx-X11/exports/include +NX_LIB = -L/usr/NX/lib -lXcomp -L../../nxcompext -lXcompext #ifdef SunArchitecture diff --git a/net-misc/nxnode-base/nxnode-base-2.0.0.ebuild b/net-misc/nxnode-base/nxnode-base-2.0.0.ebuild index 1faa05d..2de55ff 100644 --- a/net-misc/nxnode-base/nxnode-base-2.0.0.ebuild +++ b/net-misc/nxnode-base/nxnode-base-2.0.0.ebuild @@ -75,7 +75,7 @@ src_unpack() { src_compile() { # builds: nxcomp, nxcompext, nx-x11, nxauth, nxagent - cd nx-x11 + cd nx-X11 emake World || die "Unable to build nx-X11" # build nxsensor diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest index 9d1d26e..9ec96e0 100644 --- a/net-misc/nxserver-freenx/Manifest +++ b/net-misc/nxserver-freenx/Manifest @@ -20,10 +20,10 @@ EBUILD nxserver-freenx-0.5.0.ebuild 3830 RMD160 f63b86bc94f2c3297733d5b5398ace77 MD5 25fccff528d2c478009c5584752d13e1 nxserver-freenx-0.5.0.ebuild 3830 RMD160 f63b86bc94f2c3297733d5b5398ace776db5afa8 nxserver-freenx-0.5.0.ebuild 3830 SHA256 da29093372e2f260ada3e8815d69546dd1ba5c47ea4a19379bfc7bcf040aa8bc nxserver-freenx-0.5.0.ebuild 3830 -EBUILD nxserver-freenx-0.6.0_alpha20060711.ebuild 3861 RMD160 106ef45fe9aa333bc726506c7bd9f14c47c1f666 SHA1 4e8e051d772a0d39f8ddf0a26bf3e788af3d008c SHA256 d3bada486f6b736aedbd147f8b62d3d69125e768585e74ad416103a2c9212aba -MD5 6f43e12f25c665fa91aa966ab9ae5c86 nxserver-freenx-0.6.0_alpha20060711.ebuild 3861 -RMD160 106ef45fe9aa333bc726506c7bd9f14c47c1f666 nxserver-freenx-0.6.0_alpha20060711.ebuild 3861 -SHA256 d3bada486f6b736aedbd147f8b62d3d69125e768585e74ad416103a2c9212aba nxserver-freenx-0.6.0_alpha20060711.ebuild 3861 +EBUILD nxserver-freenx-0.6.0_alpha20060711.ebuild 4131 RMD160 fab937be50c039c5bcd5a5de1fe5af86f41ec16d SHA1 d61da2fa1a4528c660caee7b9cce132399369dcb SHA256 fad9b48c8c1e452bb77a6b24a6412e1550a361c6e638a82cb29a1bfac6480d97 +MD5 d6dc469e687839467eab647ca40d02f5 nxserver-freenx-0.6.0_alpha20060711.ebuild 4131 +RMD160 fab937be50c039c5bcd5a5de1fe5af86f41ec16d nxserver-freenx-0.6.0_alpha20060711.ebuild 4131 +SHA256 fad9b48c8c1e452bb77a6b24a6412e1550a361c6e638a82cb29a1bfac6480d97 nxserver-freenx-0.6.0_alpha20060711.ebuild 4131 MD5 76d8082a363dfe8809918cab10be8ea1 files/digest-nxserver-freenx-0.5.0 253 RMD160 e5c978cddd5cbea1896de845d5571f2e07ffd420 files/digest-nxserver-freenx-0.5.0 253 SHA256 b2bf6f40af47c6f3001a95290af3d418fc246518fa77f069c405185e3706cd24 files/digest-nxserver-freenx-0.5.0 253 diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.6.0_alpha20060711.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.6.0_alpha20060711.ebuild index a9009fa..1ce791f 100644 --- a/net-misc/nxserver-freenx/nxserver-freenx-0.6.0_alpha20060711.ebuild +++ b/net-misc/nxserver-freenx/nxserver-freenx-0.6.0_alpha20060711.ebuild @@ -18,11 +18,11 @@ DEPEND="virtual/ssh sys-apps/gawk net-analyzer/gnu-netcat !ppc? ( >=net-misc/nxclient-1.5.0 - || ( ~net-misc/nx-x11-1.5.0 - ~net-misc/nx-x11-bin-1.5.0 - ~net-misc/nxnode-2.0.0 ) ) - ppc? ( || ( ~net-misc/nx-x11-1.5.0 - ~net-misc/nxnode-base-2.0.0 ) ) + || ( ~net-misc/nxnode-2.0.0 + ~net-misc/nx-x11-1.5.0 + ~net-misc/nx-x11-bin-1.5.0 ) ) + ppc? ( || ( ~net-misc/nxnode-base-2.0.0 + ~net-misc/nx-x11-1.5.0 ) ) arts? ( kde-base/arts ) cups? ( net-print/cups )" @@ -51,6 +51,11 @@ src_unpack() { mv nxprint nxprint.freenx # Change the defaults in nxloadconfig to meet the users needs. + if has_version "~net-misc/nxclient-2.0.0" || has_version "~net-misc/nxclient-base-2.0.0" ; then + einfo "Enabling the NX 2.0.0 backend support." + sed -i '/ENABLE_2_0_0_BACKEND=/s/"0"/"1"/' nxloadconfig + sed -i '/ENABLE_2_0_0_BACKEND=/s/"0"/"1"/' node.conf.sample + fi if use arts ; then einfo "Enabling arts support." sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' nxloadconfig |