Attachment 52350 Details for Bug 79343 – file.diff

[patch] file.diff

file.diff (text/plain), 3.75 KB, created by Jean-Yves Lefort on 2005-03-29 22:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Yves Lefort

Created: 2005-03-29 22:40:02 UTC

Size: 3.75 KB

patch

obsolete

>diff -ruN /usr/ports/net/linux-nx-client/Makefile linux-nx-client/Makefile
>--- /usr/ports/net/linux-nx-client/Makefile	Wed Mar  2 13:07:18 2005
>+++ linux-nx-client/Makefile	Tue Mar 29 23:30:39 2005
>@@ -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 @@
> 
> 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 @@
> 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,18 +46,16 @@
> 	${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
> 
>diff -ruN /usr/ports/net/linux-nx-client/pkg-plist linux-nx-client/pkg-plist
>--- /usr/ports/net/linux-nx-client/pkg-plist	Wed Jan 19 20:06:05 2005
>+++ linux-nx-client/pkg-plist	Tue Mar 29 23:27:08 2005
>@@ -57,10 +57,10 @@
> 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 @@
> @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/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

Actions: View | Diff

Attachments on bug 79343: 52350