- Update to 2.1.0

- Move to LINUXBASE
- Add USE_LDCONFIG
- Enable on amd64 since amd64 Linuxulator can run ia32 binaries
- Remove obsolete patches

PR:		ports/105135 (based on)
Submitted by:	Eric P. Scott <eps+pbug0611@ana.com>
Approved by:	erwin (mentor)

7 files changed, 57 insertions, 99 deletions

diff --git a/net/linux-nx-client/Makefile b/net/linux-nx-client/Makefile
index 994f3ce7498d..7ead662e54a9 100644
--- a/net/linux-nx-client/Makefile
+++ b/net/linux-nx-client/Makefile
@@ -6,47 +6,51 @@
 #
 
 PORTNAME=		linux-nx-client
-PORTVERSION=		1.4.0
-PORTREVISION=		2
+PORTVERSION=		2.1.0
 CATEGORIES=		net
-MASTER_SITES=		http://www.nomachine.com/download/nxclient/${PORTVERSION}/Linux-Static-Tar/
-DISTNAME=		nxclient-${PORTVERSION}-91.i386
+MASTER_SITES=		http://web04.nomachine.com/download/${PORTVERSION}/Linux/
+DISTNAME=		nxclient-${PORTVERSION}-9.i386
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		The NoMachine NX client
 
-RUN_DEPENDS=		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
+RUN_DEPENDS=		${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile \
+			${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
+			${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png
 
 NO_WRKSUBDIR=		yes
-ONLY_FOR_ARCHS=		i386
+ONLY_FOR_ARCHS=		i386 amd64
 USE_LINUX=		yes
-USE_X_PREFIX=		yes
+USE_LINUX_PREFIX=	yes
 NO_BUILD=		yes
+INSTALL_ICONS=		yes
 
 NXSRC=			${WRKSRC}/NX
 NXDST=			${PREFIX}/lib/linux-nx-client
+USE_LDCONFIG=		yes
 
 PLIST_SUB+=		PORTVERSION=${PORTVERSION}
 
-post-extract:
-	@${CP} ${NXSRC}/share/applnk/NX\ Client\ for\ Linux/* ${WRKSRC}
-
 do-install:
 	${MKDIR} ${NXDST}/bin
 	${INSTALL_PROGRAM} ${NXSRC}/bin/* ${NXDST}/bin
 	${MKDIR} ${NXDST}/lib
-	${INSTALL_DATA} ${NXSRC}/lib/libXcomp.so.${PORTVERSION} ${NXDST}/lib
-	${LN} -sf libXcomp.so.${PORTVERSION} ${NXDST}/lib/libXcomp.so
-	${LN} -sf libXcomp.so.${PORTVERSION} ${NXDST}/lib/libXcomp.so.1
+.for f in libXcomp libXcompsh
+	${INSTALL_DATA} ${NXSRC}/lib/${f}.so.${PORTVERSION} ${NXDST}/lib
+	${LN} -sf ${f}.so.${PORTVERSION} ${NXDST}/lib/${f}.so
+	${LN} -sf ${f}.so.${PORTVERSION} ${NXDST}/lib/${f}.so.2
+.endfor
+	${INSTALL_DATA} ${NXSRC}/lib/libcrypto.so.0.9.8 ${NXDST}/lib
+	${LN} -sf libcrypto.so.0.9.8 ${NXDST}/lib/libcrypto.so
 	${MKDIR} ${NXDST}/share
-	${INSTALL_DATA} ${NXSRC}/share/client.id_dsa.key ${NXDST}/share
+	${INSTALL_DATA} ${NXSRC}/share/keyboards ${NXDST}/share
+	${MKDIR} ${NXDST}/share/keys
+	${INSTALL_DATA} ${NXSRC}/share/keys/* ${NXDST}/share/keys
 	${MKDIR} ${NXDST}/share/images
 	${INSTALL_DATA} ${NXSRC}/share/images/* ${NXDST}/share/images
 
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/*.desktop ${PREFIX}/share/applications
-	${MKDIR} ${PREFIX}/share/gnome/pixmaps
-	${INSTALL_DATA} ${NXSRC}/share/icons/* ${PREFIX}/share/gnome/pixmaps
+	${MKDIR} ${LOCALBASE}/share/gnome/pixmaps
+	${INSTALL_DATA} ${NXSRC}/share/icons/*.png ${LOCALBASE}/share/gnome/pixmaps
 	${MKDIR} ${LOCALBASE}/share/icons/crystalsvg/48x48 \
 		${LOCALBASE}/share/icons/crystalsvg/32x32
 	${INSTALL_DATA} ${NXSRC}/share/icons/nx-desktop.png \
@@ -56,7 +60,7 @@ do-install:
 		${LOCALBASE}/share/icons/crystalsvg/32x32
 .endfor
 
-.for f in nxclient nxprint nxproxy nxssh
+.for f in nxclient nxesd nxkill nxservice nxssh
 	${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/${f}
 	${ECHO_CMD} "export NXDIR=${NXDST}" >> ${WRKSRC}/${f}
 	${ECHO_CMD} "exec \$$NXDIR/bin/${f} \"\$$@\"" >> ${WRKSRC}/${f}
diff --git a/net/linux-nx-client/distinfo b/net/linux-nx-client/distinfo
index 834b4a754842..37a253ef9f24 100644
--- a/net/linux-nx-client/distinfo
+++ b/net/linux-nx-client/distinfo
@@ -1,3 +1,3 @@
-MD5 (nxclient-1.4.0-91.i386.tar.gz) = 92b581d0568a5eaccb849cb86246d6f7
-SHA256 (nxclient-1.4.0-91.i386.tar.gz) = c12586faa32f603d139a2ff656a7e6912c5f18ea760f5be49a513036624a7a12
-SIZE (nxclient-1.4.0-91.i386.tar.gz) = 3504920
+MD5 (nxclient-2.1.0-9.i386.tar.gz) = 4eff1e6fbc9c188f30563453d4b27e3a
+SHA256 (nxclient-2.1.0-9.i386.tar.gz) = 9d7d723e501495114a8a2d5bf1902cb22b4734e5f044c17a4ec2927ad4aadb9d
+SIZE (nxclient-2.1.0-9.i386.tar.gz) = 3479744
diff --git a/net/linux-nx-client/files/patch-nxclient-admin.desktop b/net/linux-nx-client/files/patch-nxclient-admin.desktop
deleted file mode 100644
index 18b35106d471..000000000000
--- a/net/linux-nx-client/files/patch-nxclient-admin.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
---- nxclient-admin.desktop.orig	Tue Apr 26 08:23:07 2005
-+++ nxclient-admin.desktop	Tue Apr 26 08:26:09 2005
-@@ -1,6 +1,8 @@
- [Desktop Entry]
-+Encoding=UTF-8
- Comment=Launch NX session Administrator
--Exec=/usr/NX/bin/nxclient -admin
--Icon=/usr/NX/share/icons/nxclient-admin.png
-+Exec=nxclient -admin
-+Icon=nxclient-admin.png
- Name=NX Session Administrator
- Type=Application
-+Categories=Application;Network;
diff --git a/net/linux-nx-client/files/patch-nxclient-help.desktop b/net/linux-nx-client/files/patch-nxclient-help.desktop
deleted file mode 100644
index 4e80f113cc15..000000000000
--- a/net/linux-nx-client/files/patch-nxclient-help.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
---- nxclient-help.desktop.orig	Tue Apr 26 08:23:07 2005
-+++ nxclient-help.desktop	Tue Apr 26 08:26:44 2005
-@@ -1,6 +1,7 @@
- [Desktop Entry]
-+Encoding=UTF-8
- Comment=Help online
--Exec=konqueror http://www.nomachine.com/help
--Icon=konqueror
-+URL=http://www.nomachine.com/help
- Name=NX Help on the Web
--Type=Application
-+Type=Link
-+Categories=Application;Network;
diff --git a/net/linux-nx-client/files/patch-nxclient-wizard.desktop b/net/linux-nx-client/files/patch-nxclient-wizard.desktop
deleted file mode 100644
index 66b1402cf861..000000000000
--- a/net/linux-nx-client/files/patch-nxclient-wizard.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
---- nxclient-wizard.desktop.orig	Tue Apr 26 08:23:07 2005
-+++ nxclient-wizard.desktop	Tue Apr 26 08:26:56 2005
-@@ -1,6 +1,8 @@
- [Desktop Entry]
-+Encoding=UTF-8
- Comment=Launch connection wizard
--Exec=/usr/NX/bin/nxclient -wizard
--Icon=/usr/NX/share/icons/nxclient-wizard.png
-+Exec=nxclient -wizard
-+Icon=nxclient-wizard.png
- Name=NX Connection Wizard
- Type=Application
-+Categories=Application;Network;
diff --git a/net/linux-nx-client/files/patch-nxclient.desktop b/net/linux-nx-client/files/patch-nxclient.desktop
deleted file mode 100644
index 2f1c55325463..000000000000
--- a/net/linux-nx-client/files/patch-nxclient.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
---- nxclient.desktop.orig	Tue Apr 26 08:23:07 2005
-+++ nxclient.desktop	Tue Apr 26 08:27:04 2005
-@@ -1,6 +1,8 @@
- [Desktop Entry]
-+Encoding=UTF-8
- Comment=Client for connection to a remote NX server
--Exec=/usr/NX/bin/nxclient
--Icon=/usr/NX/share/icons/nx.png
-+Exec=nxclient
-+Icon=nx.png
- Name=NX Client for Linux
- Type=Application
-+Categories=Application;Network;
diff --git a/net/linux-nx-client/pkg-plist b/net/linux-nx-client/pkg-plist
index 3ceca9880521..879dc6ee920f 100644
--- a/net/linux-nx-client/pkg-plist
+++ b/net/linux-nx-client/pkg-plist
@@ -1,15 +1,22 @@
 bin/nxclient
-bin/nxprint
-bin/nxproxy
+bin/nxesd
+bin/nxkill
+bin/nxservice
 bin/nxssh
 lib/linux-nx-client/bin/nxclient
+lib/linux-nx-client/bin/nxesd
+lib/linux-nx-client/bin/nxkill
 lib/linux-nx-client/bin/nxprint
-lib/linux-nx-client/bin/nxproxy
+lib/linux-nx-client/bin/nxservice
 lib/linux-nx-client/bin/nxssh
 lib/linux-nx-client/lib/libXcomp.so
-lib/linux-nx-client/lib/libXcomp.so.1
+lib/linux-nx-client/lib/libXcomp.so.2
 lib/linux-nx-client/lib/libXcomp.so.%%PORTVERSION%%
-lib/linux-nx-client/share/client.id_dsa.key
+lib/linux-nx-client/lib/libXcompsh.so
+lib/linux-nx-client/lib/libXcompsh.so.2
+lib/linux-nx-client/lib/libXcompsh.so.%%PORTVERSION%%
+lib/linux-nx-client/lib/libcrypto.so
+lib/linux-nx-client/lib/libcrypto.so.0.9.8
 lib/linux-nx-client/share/images/about-down.png
 lib/linux-nx-client/share/images/about-up.png
 lib/linux-nx-client/share/images/connect-01.png
@@ -24,20 +31,24 @@ lib/linux-nx-client/share/images/connect-09.png
 lib/linux-nx-client/share/images/connect-10.png
 lib/linux-nx-client/share/images/connect-fail-01.png
 lib/linux-nx-client/share/images/connect-fail-02.png
+lib/linux-nx-client/share/images/folder-shared-disabled.png
 lib/linux-nx-client/share/images/folder-shared.png
 lib/linux-nx-client/share/images/kill-dsb.png
 lib/linux-nx-client/share/images/kill.png
+lib/linux-nx-client/share/images/multimedia-dsb.png
 lib/linux-nx-client/share/images/multimedia.png
 lib/linux-nx-client/share/images/new-session-dsb.png
 lib/linux-nx-client/share/images/new-session.png
 lib/linux-nx-client/share/images/nomachine-no-background.png
-lib/linux-nx-client/share/images/nx-desktop.png
-lib/linux-nx-client/share/images/nx.png
-lib/linux-nx-client/share/images/nxclient-admin.png
-lib/linux-nx-client/share/images/nxclient-wizard.png
+lib/linux-nx-client/share/images/printer-default-icon-disabled.png
+lib/linux-nx-client/share/images/printer-default-icon.png
+lib/linux-nx-client/share/images/printer-icon-disabled.png
+lib/linux-nx-client/share/images/printer-icon.png
+lib/linux-nx-client/share/images/printer-shared-disabled.png
 lib/linux-nx-client/share/images/printer-shared.png
-lib/linux-nx-client/share/images/printer_default_icon.png
-lib/linux-nx-client/share/images/printer_icon.png
+lib/linux-nx-client/share/images/pulldown-close.png
+lib/linux-nx-client/share/images/pulldown-suspend.png
+lib/linux-nx-client/share/images/pulldown-terminate.png
 lib/linux-nx-client/share/images/refresh-dsb.png
 lib/linux-nx-client/share/images/refresh.png
 lib/linux-nx-client/share/images/remove-dsb.png
@@ -46,10 +57,7 @@ lib/linux-nx-client/share/images/session-stats-01-dsb.png
 lib/linux-nx-client/share/images/session-stats-01.png
 lib/linux-nx-client/share/images/session-stats-02-dsb.png
 lib/linux-nx-client/share/images/session-stats-02.png
-lib/linux-nx-client/share/images/session-stats-1-dsb.png
-lib/linux-nx-client/share/images/session-stats-1.png
-lib/linux-nx-client/share/images/session-stats-2-dsb.png
-lib/linux-nx-client/share/images/session-stats-2.png
+lib/linux-nx-client/share/images/sharing-dsb.png
 lib/linux-nx-client/share/images/sharing.png
 lib/linux-nx-client/share/images/terminate-dsb.png
 lib/linux-nx-client/share/images/terminate.png
@@ -57,23 +65,21 @@ lib/linux-nx-client/share/images/view-log-dsb.png
 lib/linux-nx-client/share/images/view-log.png
 lib/linux-nx-client/share/images/warning.png
 lib/linux-nx-client/share/images/wizard.png
-share/applications/nxclient-admin.desktop
-share/applications/nxclient-help.desktop
-share/applications/nxclient-wizard.desktop
-share/applications/nxclient.desktop
-share/gnome/pixmaps/nx-desktop.png
-share/gnome/pixmaps/nx.png
-share/gnome/pixmaps/nxclient-admin.png
-share/gnome/pixmaps/nxclient-wizard.png
+lib/linux-nx-client/share/keyboards
+lib/linux-nx-client/share/keys/server.id_dsa.key
 @dirrm lib/linux-nx-client/bin
 @dirrm lib/linux-nx-client/lib
+@dirrm lib/linux-nx-client/share/keys
 @dirrm lib/linux-nx-client/share/images
 @dirrm lib/linux-nx-client/share
 @dirrm lib/linux-nx-client
-@dirrmtry share/applications
+@cwd %%LOCALBASE%%
+share/gnome/pixmaps/nx-desktop.png
+share/gnome/pixmaps/nx.png
+share/gnome/pixmaps/nxclient-admin.png
+share/gnome/pixmaps/nxclient-wizard.png
 @dirrmtry share/gnome/pixmaps
 @dirrmtry share/gnome
-@cwd %%LOCALBASE%%
 share/icons/crystalsvg/48x48/nx-desktop.png
 share/icons/crystalsvg/32x32/nx.png
 share/icons/crystalsvg/32x32/nxclient-admin.png