kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Make desktop entries pass desktop-file-validate; install them in

Browse source 
${PREFIX}/share/applications so that they do not show up twice in the
  menus.
- Polish the Makefile.

PR:		ports/79343
Submitted by:	myself
This commit is contained in:
Jean-Yves Lefort 2005-04-26 06:45:41 +00:00
parent bc0b6d6721
commit a788ccc88b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=134178
6 changed files with 27 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
net/linux-nx-client/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= linux-nx-client
PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.nomachine.com/download/nxclient/${PORTVERSION}/Linux-Static-Tar/
DISTNAME= nxclient-${PORTVERSION}-91.i386
@ -23,7 +24,6 @@ NO_BUILD= yes
NXSRC= ${WRKSRC}/NX
NXDST= ${PREFIX}/lib/linux-nx-client
ICONS3232= nx.png nxclient-admin.png nxclient-wizard.png
# Linux binary should not be stripped by INSTALL_PROGRAM
# because as a side effect it brands the binary as FreeBSD.
@ -32,7 +32,7 @@ STRIP=
PLIST_SUB+= PORTVERSION=${PORTVERSION}
post-extract:
${CP} ${NXSRC}/share/applnk/NX\ Client\ for\ Linux/* ${WRKSRC}
@${CP} ${NXSRC}/share/applnk/NX\ Client\ for\ Linux/* ${WRKSRC}
do-install:
${MKDIR} ${NXDST}/bin
@ -46,22 +46,19 @@ do-install:
${MKDIR} ${NXDST}/share/images
${INSTALL_DATA} ${NXSRC}/share/images/* ${NXDST}/share/images
${MKDIR} ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/*.desktop ${PREFIX}/share/gnome/applications
${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/applnk/Internet
${INSTALL_DATA} ${WRKSRC}/*.desktop ${LOCALBASE}/share/applnk/Internet
${MKDIR} ${LOCALBASE}/share/icons/crystalsvg/48x48 \
${LOCALBASE}/share/icons/crystalsvg/32x32
${INSTALL_DATA} ${NXSRC}/share/icons/nx-desktop.png \
${LOCALBASE}/share/icons/crystalsvg/48x48
.for FILE in ${ICONS3232}
${INSTALL_DATA} ${NXSRC}/share/icons/${FILE} \
.for f in nx.png nxclient-admin.png nxclient-wizard.png
${INSTALL_DATA} ${NXSRC}/share/icons/${f} \
${LOCALBASE}/share/icons/crystalsvg/32x32
.endfor
${MKDIR} ${PREFIX}/bin
.for f in nxclient nxprint nxproxy nxssh
${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/${f}
${ECHO_CMD} "export NXDIR=${NXDST}" >> ${WRKSRC}/${f}

7
net/linux-nx-client/files/patch-nxclient-admin.desktop
View file

@ -1,7 +1,8 @@
--- nxclient-admin.desktop.orig Wed Sep 1 18:18:13 2004
+++ nxclient-admin.desktop Wed Sep 1 18:18:30 2004
@@ -1,6 +1,7 @@
--- 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

7
net/linux-nx-client/files/patch-nxclient-help.desktop
View file

@ -1,7 +1,8 @@
--- nxclient-help.desktop.orig Wed Sep 1 18:18:13 2004
+++ nxclient-help.desktop Wed Sep 1 18:18:34 2004
@@ -1,6 +1,6 @@
--- 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

7
net/linux-nx-client/files/patch-nxclient-wizard.desktop
View file

@ -1,7 +1,8 @@
--- nxclient-wizard.desktop.orig Wed Sep 1 18:18:13 2004
+++ nxclient-wizard.desktop Wed Sep 1 18:18:39 2004
@@ -1,6 +1,7 @@
--- 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

7
net/linux-nx-client/files/patch-nxclient.desktop
View file

@ -1,7 +1,8 @@
--- nxclient.desktop.orig Wed Sep 1 18:18:13 2004
+++ nxclient.desktop Wed Sep 1 18:18:44 2004
@@ -1,6 +1,7 @@
--- 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

16
net/linux-nx-client/pkg-plist
View file

@ -57,10 +57,10 @@ 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/gnome/applications/nxclient-admin.desktop
share/gnome/applications/nxclient-help.desktop
share/gnome/applications/nxclient-wizard.desktop
share/gnome/applications/nxclient.desktop
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
@ -70,7 +70,7 @@ 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/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%%
@ -78,13 +78,7 @@ share/icons/crystalsvg/48x48/nx-desktop.png
share/icons/crystalsvg/32x32/nx.png
share/icons/crystalsvg/32x32/nxclient-admin.png
share/icons/crystalsvg/32x32/nxclient-wizard.png
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