Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Nov 2006 00:49:58 -0800 (PST)
From:      "Eric P. Scott" <eps+pbug0611@ana.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/105135: net/linux-nx-client: update to 2.1.0
Message-ID:  <200611040849.kA48nwML000081@anna.ana.com>
Resent-Message-ID: <200611040850.kA48o4nB099723@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         105135
>Category:       ports
>Synopsis:       net/linux-nx-client: update to 2.1.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 04 08:50:04 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Eric P. Scott
>Release:        FreeBSD 4.11-SECURITY i386
>Organization:
ana-systems, Inc.
>Environment:
System: FreeBSD fourever 4.11-SECURITY FreeBSD 4.11-SECURITY #0: Tue Feb 28 16:06:29 GMT 2006 root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Update to NX Client 2.1.0-9 (released November 2, 2006).
>How-To-Repeat:
N/A
>Fix:
1. Remove the files/ directory.  None of the old patches are
applicable, because .desktop files are not included in the
upstream distribution.

2. Best-effort modifications to the port.  Note that I'm skipping
nxprint for the time being, because it depends on a Linux
libcups.so.2.  I'm using NoMachine's libcrypto.so.0.9.8 since
linux/openssl currently installs 0.9.7f.  Can anyone suggest a
better value for MASTER_SITES?

--- net/linux-nx-client/Makefile.orig	Fri Jun 17 15:59:23 2005
+++ net/linux-nx-client/Makefile
@@ -2,51 +2,54 @@
 # Date created:			01 Sep 2004
 # Whom:				Jean-Yves Lefort <jylefort@brutele.be>
 #
-# $FreeBSD: ports/net/linux-nx-client/Makefile,v 1.6 2005/06/17 22:59:23 netchild Exp $
+# $FreeBSD$
 #
 
 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=		jylefort@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
 USE_LINUX=		yes
 USE_X_PREFIX=		yes
 NO_BUILD=		yes
+INSTALLS_ICONS=		yes
 
 NXSRC=			${WRKSRC}/NX
 NXDST=			${PREFIX}/lib/linux-nx-client
+USE_LDCONFIG=		${NXDST}/lib
 
 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
+	${INSTALL_DATA} ${NXSRC}/share/icons/*.png ${PREFIX}/share/gnome/pixmaps
 	${MKDIR} ${LOCALBASE}/share/icons/crystalsvg/48x48 \
 		${LOCALBASE}/share/icons/crystalsvg/32x32
 	${INSTALL_DATA} ${NXSRC}/share/icons/nx-desktop.png \
@@ -56,7 +59,7 @@
 		${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}

--- net/linux-nx-client/distinfo.orig	Sun Jan 22 13:23:13 2006
+++ 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

--- net/linux-nx-client/pkg-plist.orig	Sat Jan 21 18:45:51 2006
+++ 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-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.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,20 +65,18 @@
 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
+lib/linux-nx-client/share/keyboards
+lib/linux-nx-client/share/keys/server.id_dsa.key
 share/gnome/pixmaps/nx-desktop.png
 share/gnome/pixmaps/nx.png
 share/gnome/pixmaps/nxclient-admin.png
 share/gnome/pixmaps/nxclient-wizard.png
 @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
 @dirrmtry share/gnome/pixmaps
 @dirrmtry share/gnome
 @cwd %%LOCALBASE%%
@@ -82,3 +88,4 @@
 @dirrmtry share/icons/crystalsvg/32x32
 @dirrmtry share/icons/crystalsvg
 @dirrmtry share/icons
+@cwd %%X11BASE%%
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611040849.kA48nwML000081>