View | Details | Raw Unified | Return to bug 140184 | Differences between
and this patch

Collapse All | Expand All

(-)linux-nx-client/Makefile (-12 / +18 lines)
Lines 6-16 Link Here
6
#
6
#
7
7
8
PORTNAME=		linux-nx-client
8
PORTNAME=		linux-nx-client
9
PORTVERSION=		2.1.0
9
PORTVERSION=		3.4.0
10
PORTREVISION=		3
11
CATEGORIES=		net
10
CATEGORIES=		net
12
MASTER_SITES=		http://web04.nomachine.com/download/${PORTVERSION}/Linux/
11
MASTER_SITES=		http://web04.nomachine.com/download/${PORTVERSION}/Linux/
13
DISTNAME=		nxclient-${PORTVERSION}-17.i386
12
DISTNAME=		nxclient-${PORTVERSION}-5.i386
14
13
15
MAINTAINER=		ports@FreeBSD.org
14
MAINTAINER=		ports@FreeBSD.org
16
COMMENT=		The NoMachine NX client
15
COMMENT=		The NoMachine NX client
Lines 19-25 Link Here
19
ONLY_FOR_ARCHS=		i386 amd64
18
ONLY_FOR_ARCHS=		i386 amd64
20
USE_LINUX=		yes
19
USE_LINUX=		yes
21
USE_LINUX_APPS=		libaudiofile jpeg png
20
USE_LINUX_APPS=		libaudiofile jpeg png
22
NO_BUILD=		yes
21
USE_PERL5_BUILD=	yes
23
INSTALL_ICONS=		yes
22
INSTALL_ICONS=		yes
24
23
25
NXSRC=			${WRKSRC}/NX
24
NXSRC=			${WRKSRC}/NX
Lines 27-32 Link Here
27
26
28
PLIST_SUB+=		PORTVERSION=${PORTVERSION}
27
PLIST_SUB+=		PORTVERSION=${PORTVERSION}
29
28
29
# Patch binary to expect EINVAL (FreeBSD) instead of EOPNOTSUPP (Linux) when
30
# trying to set TCP_NODELAY on the X11 unix domain socket.
31
do-build:
32
	${PERL5} -pi.orig -e 's/\x83\xf8\x5f\x0f\x84/\x83\xf8\x16\x0f\x84/' \
33
		${NXSRC}/lib/libXcomp.so.${PORTVERSION}
34
30
do-install:
35
do-install:
31
	${MKDIR} ${NXDST}/bin
36
	${MKDIR} ${NXDST}/bin
32
	${INSTALL_PROGRAM} ${NXSRC}/bin/* ${NXDST}/bin
37
	${INSTALL_PROGRAM} ${NXSRC}/bin/* ${NXDST}/bin
Lines 34-40 Link Here
34
.for f in libXcomp libXcompsh
39
.for f in libXcomp libXcompsh
35
	${INSTALL_DATA} ${NXSRC}/lib/${f}.so.${PORTVERSION} ${NXDST}/lib
40
	${INSTALL_DATA} ${NXSRC}/lib/${f}.so.${PORTVERSION} ${NXDST}/lib
36
	${LN} -sf ${f}.so.${PORTVERSION} ${NXDST}/lib/${f}.so
41
	${LN} -sf ${f}.so.${PORTVERSION} ${NXDST}/lib/${f}.so
37
	${LN} -sf ${f}.so.${PORTVERSION} ${NXDST}/lib/${f}.so.2
42
	${LN} -sf ${f}.so.${PORTVERSION} ${NXDST}/lib/${f}.so.3
38
.endfor
43
.endfor
39
	${INSTALL_DATA} ${NXSRC}/lib/libcrypto.so.0.9.8 ${NXDST}/lib
44
	${INSTALL_DATA} ${NXSRC}/lib/libcrypto.so.0.9.8 ${NXDST}/lib
40
	${LN} -sf libcrypto.so.0.9.8 ${NXDST}/lib/libcrypto.so
45
	${LN} -sf libcrypto.so.0.9.8 ${NXDST}/lib/libcrypto.so
Lines 46-59 Link Here
46
	${INSTALL_DATA} ${NXSRC}/share/images/* ${NXDST}/share/images
51
	${INSTALL_DATA} ${NXSRC}/share/images/* ${NXDST}/share/images
47
52
48
	${MKDIR} ${LOCALBASE}/share/pixmaps
53
	${MKDIR} ${LOCALBASE}/share/pixmaps
49
	${INSTALL_DATA} ${NXSRC}/share/icons/*.png ${LOCALBASE}/share/pixmaps
54
	${INSTALL_DATA} ${NXSRC}/share/icons/48x48/*.png ${LOCALBASE}/share/pixmaps
50
	${MKDIR} ${LOCALBASE}/share/icons/crystalsvg/48x48 \
55
	${MKDIR} ${LOCALBASE}/share/icons/crystalsvg/48x48 \
51
		${LOCALBASE}/share/icons/crystalsvg/32x32
56
		${LOCALBASE}/share/icons/crystalsvg/32x32 \
52
	${INSTALL_DATA} ${NXSRC}/share/icons/nx-desktop.png \
57
		${LOCALBASE}/share/icons/crystalsvg/22x22 \
53
		${LOCALBASE}/share/icons/crystalsvg/48x48
58
		${LOCALBASE}/share/icons/crystalsvg/16x16
54
.for f in nx.png nxclient-admin.png nxclient-wizard.png
59
.for x in 16x16 22x22 32x32 48x48
55
	${INSTALL_DATA} ${NXSRC}/share/icons/${f} \
60
	${MKDIR} ${LOCALBASE}/share/icons/crystalsvg/${x}
56
		${LOCALBASE}/share/icons/crystalsvg/32x32
61
	${INSTALL_DATA} ${NXSRC}/share/icons/${x}/* \
62
		${LOCALBASE}/share/icons/crystalsvg/${x}
57
.endfor
63
.endfor
58
64
59
.for f in nxclient nxesd nxkill nxservice nxssh
65
.for f in nxclient nxesd nxkill nxservice nxssh
(-)linux-nx-client/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (nxclient-2.1.0-17.i386.tar.gz) = d4482ecd4dda377f879a0888e256bce9
1
MD5 (nxclient-3.4.0-5.i386.tar.gz) = fdb6ab1dcbdfd4cfe34bbbd379b68de9
2
SHA256 (nxclient-2.1.0-17.i386.tar.gz) = c087c1e528dd4272c4666a832b0a585b53fa15466b54d1dc2d60d105bea964ab
2
SHA256 (nxclient-3.4.0-5.i386.tar.gz) = 1fb33b24e701a9b2b615c99d353872cfa3a84a6a4ec83c5e1858abcb5307b522
3
SIZE (nxclient-2.1.0-17.i386.tar.gz) = 3515342
3
SIZE (nxclient-3.4.0-5.i386.tar.gz) = 4388189
(-)linux-nx-client/pkg-plist (-18 / +39 lines)
Lines 10-45 Link Here
10
lib/linux-nx-client/bin/nxservice
10
lib/linux-nx-client/bin/nxservice
11
lib/linux-nx-client/bin/nxssh
11
lib/linux-nx-client/bin/nxssh
12
lib/linux-nx-client/lib/libXcomp.so
12
lib/linux-nx-client/lib/libXcomp.so
13
lib/linux-nx-client/lib/libXcomp.so.2
13
lib/linux-nx-client/lib/libXcomp.so.3
14
lib/linux-nx-client/lib/libXcomp.so.%%PORTVERSION%%
14
lib/linux-nx-client/lib/libXcomp.so.%%PORTVERSION%%
15
lib/linux-nx-client/lib/libXcompsh.so
15
lib/linux-nx-client/lib/libXcompsh.so
16
lib/linux-nx-client/lib/libXcompsh.so.2
16
lib/linux-nx-client/lib/libXcompsh.so.3
17
lib/linux-nx-client/lib/libXcompsh.so.%%PORTVERSION%%
17
lib/linux-nx-client/lib/libXcompsh.so.%%PORTVERSION%%
18
lib/linux-nx-client/lib/libcrypto.so
18
lib/linux-nx-client/lib/libcrypto.so
19
lib/linux-nx-client/lib/libcrypto.so.0.9.8
19
lib/linux-nx-client/lib/libcrypto.so.0.9.8
20
lib/linux-nx-client/share/keyboards
21
lib/linux-nx-client/share/keys/server.id_dsa.key
20
lib/linux-nx-client/share/images/about-down.png
22
lib/linux-nx-client/share/images/about-down.png
21
lib/linux-nx-client/share/images/about-up.png
23
lib/linux-nx-client/share/images/about-up.png
22
lib/linux-nx-client/share/images/connect-01.png
24
lib/linux-nx-client/share/images/connect-01.png
23
lib/linux-nx-client/share/images/connect-02.png
25
lib/linux-nx-client/share/images/connect-02.png
24
lib/linux-nx-client/share/images/connect-03.png
26
lib/linux-nx-client/share/images/connect-03.png
25
lib/linux-nx-client/share/images/connect-04.png
27
lib/linux-nx-client/share/images/connect-04.png
26
lib/linux-nx-client/share/images/connect-05.png
27
lib/linux-nx-client/share/images/connect-06.png
28
lib/linux-nx-client/share/images/connect-07.png
29
lib/linux-nx-client/share/images/connect-08.png
30
lib/linux-nx-client/share/images/connect-09.png
31
lib/linux-nx-client/share/images/connect-10.png
32
lib/linux-nx-client/share/images/connect-fail-01.png
28
lib/linux-nx-client/share/images/connect-fail-01.png
33
lib/linux-nx-client/share/images/connect-fail-02.png
29
lib/linux-nx-client/share/images/error.png
34
lib/linux-nx-client/share/images/folder-shared-disabled.png
30
lib/linux-nx-client/share/images/folder-shared-disabled.png
35
lib/linux-nx-client/share/images/folder-shared.png
31
lib/linux-nx-client/share/images/folder-shared.png
32
lib/linux-nx-client/share/images/info.png
36
lib/linux-nx-client/share/images/kill-dsb.png
33
lib/linux-nx-client/share/images/kill-dsb.png
37
lib/linux-nx-client/share/images/kill.png
34
lib/linux-nx-client/share/images/kill.png
38
lib/linux-nx-client/share/images/multimedia-dsb.png
35
lib/linux-nx-client/share/images/logo-small.png
36
lib/linux-nx-client/share/images/logo.png
37
lib/linux-nx-client/share/images/monitor-arrow-over.png
38
lib/linux-nx-client/share/images/monitor-arrow.png
39
lib/linux-nx-client/share/images/monitor-box.png
40
lib/linux-nx-client/share/images/monitor-icon.png
41
lib/linux-nx-client/share/images/monitor-mask.png
42
lib/linux-nx-client/share/images/monitor-message.png
43
lib/linux-nx-client/share/images/monitor-user-dsb.png
44
lib/linux-nx-client/share/images/monitor-user.png
39
lib/linux-nx-client/share/images/multimedia.png
45
lib/linux-nx-client/share/images/multimedia.png
40
lib/linux-nx-client/share/images/new-session-dsb.png
46
lib/linux-nx-client/share/images/new-session-dsb.png
41
lib/linux-nx-client/share/images/new-session.png
47
lib/linux-nx-client/share/images/new-session.png
42
lib/linux-nx-client/share/images/nomachine-no-background.png
43
lib/linux-nx-client/share/images/printer-default-icon-disabled.png
48
lib/linux-nx-client/share/images/printer-default-icon-disabled.png
44
lib/linux-nx-client/share/images/printer-default-icon.png
49
lib/linux-nx-client/share/images/printer-default-icon.png
45
lib/linux-nx-client/share/images/printer-icon-disabled.png
50
lib/linux-nx-client/share/images/printer-icon-disabled.png
Lines 57-63 Link Here
57
lib/linux-nx-client/share/images/session-stats-01.png
62
lib/linux-nx-client/share/images/session-stats-01.png
58
lib/linux-nx-client/share/images/session-stats-02-dsb.png
63
lib/linux-nx-client/share/images/session-stats-02-dsb.png
59
lib/linux-nx-client/share/images/session-stats-02.png
64
lib/linux-nx-client/share/images/session-stats-02.png
60
lib/linux-nx-client/share/images/sharing-dsb.png
61
lib/linux-nx-client/share/images/sharing.png
65
lib/linux-nx-client/share/images/sharing.png
62
lib/linux-nx-client/share/images/terminate-dsb.png
66
lib/linux-nx-client/share/images/terminate-dsb.png
63
lib/linux-nx-client/share/images/terminate.png
67
lib/linux-nx-client/share/images/terminate.png
Lines 65-72 Link Here
65
lib/linux-nx-client/share/images/view-log.png
69
lib/linux-nx-client/share/images/view-log.png
66
lib/linux-nx-client/share/images/warning.png
70
lib/linux-nx-client/share/images/warning.png
67
lib/linux-nx-client/share/images/wizard.png
71
lib/linux-nx-client/share/images/wizard.png
68
lib/linux-nx-client/share/keyboards
69
lib/linux-nx-client/share/keys/server.id_dsa.key
70
@dirrm lib/linux-nx-client/bin
72
@dirrm lib/linux-nx-client/bin
71
@dirrm lib/linux-nx-client/lib
73
@dirrm lib/linux-nx-client/lib
72
@dirrm lib/linux-nx-client/share/keys
74
@dirrm lib/linux-nx-client/share/keys
Lines 74-88 Link Here
74
@dirrm lib/linux-nx-client/share
76
@dirrm lib/linux-nx-client/share
75
@dirrm lib/linux-nx-client
77
@dirrm lib/linux-nx-client
76
@cwd %%LOCALBASE%%
78
@cwd %%LOCALBASE%%
77
share/pixmaps/nx-desktop.png
79
share/pixmaps/application-nx-session.png
78
share/pixmaps/nx.png
79
share/pixmaps/nxclient-admin.png
80
share/pixmaps/nxclient-admin.png
81
share/pixmaps/nxclient-desktop.png
82
share/pixmaps/nxclient-icon.png
80
share/pixmaps/nxclient-wizard.png
83
share/pixmaps/nxclient-wizard.png
81
share/icons/crystalsvg/48x48/nx-desktop.png
84
share/icons/crystalsvg/48x48/application-nx-session.png
82
share/icons/crystalsvg/32x32/nx.png
85
share/icons/crystalsvg/48x48/nxclient-admin.png
86
share/icons/crystalsvg/48x48/nxclient-desktop.png
87
share/icons/crystalsvg/48x48/nxclient-icon.png
88
share/icons/crystalsvg/48x48/nxclient-wizard.png
89
share/icons/crystalsvg/32x32/application-nx-session.png
83
share/icons/crystalsvg/32x32/nxclient-admin.png
90
share/icons/crystalsvg/32x32/nxclient-admin.png
91
share/icons/crystalsvg/32x32/nxclient-desktop.png
92
share/icons/crystalsvg/32x32/nxclient-icon.png
84
share/icons/crystalsvg/32x32/nxclient-wizard.png
93
share/icons/crystalsvg/32x32/nxclient-wizard.png
94
share/icons/crystalsvg/22x22/application-nx-session.png
95
share/icons/crystalsvg/22x22/nxclient-admin.png
96
share/icons/crystalsvg/22x22/nxclient-desktop.png
97
share/icons/crystalsvg/22x22/nxclient-icon.png
98
share/icons/crystalsvg/22x22/nxclient-wizard.png
99
share/icons/crystalsvg/16x16/application-nx-session.png
100
share/icons/crystalsvg/16x16/nxclient-admin.png
101
share/icons/crystalsvg/16x16/nxclient-desktop.png
102
share/icons/crystalsvg/16x16/nxclient-icon.png
103
share/icons/crystalsvg/16x16/nxclient-wizard.png
85
@dirrmtry share/icons/crystalsvg/48x48
104
@dirrmtry share/icons/crystalsvg/48x48
86
@dirrmtry share/icons/crystalsvg/32x32
105
@dirrmtry share/icons/crystalsvg/32x32
106
@dirrmtry share/icons/crystalsvg/22x22
107
@dirrmtry share/icons/crystalsvg/16x16
87
@dirrmtry share/icons/crystalsvg
108
@dirrmtry share/icons/crystalsvg
88
@dirrmtry share/icons
109
@dirrmtry share/icons

Return to bug 140184