3 files changed, 26 insertions, 11 deletions

diff --git a/net/linux-nx-client/Makefile b/net/linux-nx-client/Makefile
index 176ecd9d1cf3..bd0d3ffc84be 100644
--- a/net/linux-nx-client/Makefile
+++ b/net/linux-nx-client/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=		linux-nx-client
-PORTVERSION=		1.3.2.7
+PORTVERSION=		1.4.0
 CATEGORIES=		net
-MASTER_SITES=		http://www.nomachine.com/download/nxclient/${PORTVERSION:R}/Linux-Static-Tar/
-DISTNAME=		nxclient-${PORTVERSION:R}-${PORTVERSION:E}.i386
+MASTER_SITES=		http://www.nomachine.com/download/nxclient/${PORTVERSION}/Linux-Static-Tar/
+DISTNAME=		nxclient-${PORTVERSION}-91.i386
 
 MAINTAINER=		jylefort@brutele.be
 COMMENT=		The NoMachine NX client
 
 RUN_DEPENDS=		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
 
-WRKSRC=			${WRKDIR}/nxclient-install
+NO_WRKSUBDIR=		yes
 USE_X_PREFIX=		yes
 USE_LINUX=		yes
 ONLY_FOR_ARCHS=		i386
@@ -30,6 +30,8 @@ ICONS3232=		nx.png nxclient-admin.png nxclient-wizard.png
 # because as a side effect it brands the binary as FreeBSD.
 STRIP=
 
+PLIST_SUB+=		PORTVERSION=${PORTVERSION}
+
 post-extract:
 	${CP} ${NXSRC}/share/applnk/NX\ Client\ for\ Linux/* ${WRKSRC}
 
@@ -37,9 +39,9 @@ do-install:
 	${MKDIR} ${NXDST}/bin
 	${INSTALL_PROGRAM} ${NXSRC}/bin/* ${NXDST}/bin
 	${MKDIR} ${NXDST}/lib
-	${INSTALL_DATA} ${NXSRC}/lib/libXcomp.so.${PORTVERSION:R} ${NXDST}/lib
-	${LN} -sf libXcomp.so.${PORTVERSION:R} ${NXDST}/lib/libXcomp.so
-	${LN} -sf libXcomp.so.${PORTVERSION:R} ${NXDST}/lib/libXcomp.so.1
+	${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
 	${MKDIR} ${NXDST}/share
 	${INSTALL_DATA} ${NXSRC}/share/client.id_dsa.key ${NXDST}/share
 	${MKDIR} ${NXDST}/share/images
@@ -61,7 +63,7 @@ do-install:
 .endfor
 
 	${MKDIR} ${PREFIX}/bin
-.for f in nxclient nxproxy nxssh
+.for f in nxclient nxprint nxproxy 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 6e3b1fc7776b..b7c3e1f2c298 100644
--- a/net/linux-nx-client/distinfo
+++ b/net/linux-nx-client/distinfo
@@ -1,2 +1,2 @@
-MD5 (nxclient-1.3.2-7.i386.tar.gz) = ce015bd07848b792a056a507344085b0
-SIZE (nxclient-1.3.2-7.i386.tar.gz) = 3343539
+MD5 (nxclient-1.4.0-91.i386.tar.gz) = 92b581d0568a5eaccb849cb86246d6f7
+SIZE (nxclient-1.4.0-91.i386.tar.gz) = 3504920
diff --git a/net/linux-nx-client/pkg-plist b/net/linux-nx-client/pkg-plist
index a630aa4d7f76..3c29d14e7242 100644
--- a/net/linux-nx-client/pkg-plist
+++ b/net/linux-nx-client/pkg-plist
@@ -1,12 +1,14 @@
 bin/nxclient
+bin/nxprint
 bin/nxproxy
 bin/nxssh
 lib/linux-nx-client/bin/nxclient
+lib/linux-nx-client/bin/nxprint
 lib/linux-nx-client/bin/nxproxy
 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.1.3.2
+lib/linux-nx-client/lib/libXcomp.so.%%PORTVERSION%%
 lib/linux-nx-client/share/client.id_dsa.key
 lib/linux-nx-client/share/images/about-down.png
 lib/linux-nx-client/share/images/about-up.png
@@ -34,6 +36,8 @@ 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-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/refresh-dsb.png
 lib/linux-nx-client/share/images/refresh.png
 lib/linux-nx-client/share/images/remove-dsb.png
@@ -66,6 +70,9 @@ share/gnome/pixmaps/nxclient-wizard.png
 @dirrm lib/linux-nx-client/share/images
 @dirrm lib/linux-nx-client/share
 @dirrm lib/linux-nx-client
+@unexec rmdir %D/share/gnome/applications 2>/dev/null || true
+@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+@unexec rmdir %D/share/gnome 2>/dev/null || true
 @cwd %%LOCALBASE%%
 share/icons/crystalsvg/48x48/nx-desktop.png
 share/icons/crystalsvg/32x32/nx.png
@@ -75,3 +82,9 @@ share/applnk/Internet/nxclient-admin.desktop
 share/applnk/Internet/nxclient-help.desktop
 share/applnk/Internet/nxclient-wizard.desktop
 share/applnk/Internet/nxclient.desktop
+@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
+@unexec rmdir %D/share/icons 2>/dev/null || true
+@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
+@unexec rmdir %D/share/applnk 2>/dev/null || true