From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 29 21:40:03 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 15BA416A4CE for ; Tue, 29 Mar 2005 21:40:03 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B24E843D45 for ; Tue, 29 Mar 2005 21:40:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j2TLe22U099022 for ; Tue, 29 Mar 2005 21:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j2TLe2hO099021; Tue, 29 Mar 2005 21:40:02 GMT (envelope-from gnats) Resent-Date: Tue, 29 Mar 2005 21:40:02 GMT Resent-Message-Id: <200503292140.j2TLe2hO099021@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jean-Yves Lefort Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73BE716A4CE for ; Tue, 29 Mar 2005 21:37:50 +0000 (GMT) Received: from gateway.lefort.net (212.68.244.102.brutele.be [212.68.244.102]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE1F843D49 for ; Tue, 29 Mar 2005 21:37:48 +0000 (GMT) (envelope-from jylefort@brutele.be) Received: from jsite.lefort.net (jsite.lefort.net [192.168.1.2]) by gateway.lefort.net (Postfix) with ESMTP id 3AF7554E7 for ; Tue, 29 Mar 2005 23:37:47 +0200 (CEST) Received: by jsite.lefort.net (Postfix, from userid 1000) id E03AB8672; Tue, 29 Mar 2005 23:37:46 +0200 (CEST) Message-Id: <20050329213746.E03AB8672@jsite.lefort.net> Date: Tue, 29 Mar 2005 23:37:46 +0200 (CEST) From: Jean-Yves Lefort To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/79343: Update port: net/linux-nx-client (fix desktop entries installation) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jean-Yves Lefort List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Mar 2005 21:40:03 -0000 >Number: 79343 >Category: ports >Synopsis: Update port: net/linux-nx-client (fix desktop entries installation) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Mar 29 21:40:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Jean-Yves Lefort >Release: FreeBSD 5.3-RELEASE-p6 i386 >Organization: >Environment: System: FreeBSD jsite.lefort.net 5.3-RELEASE-p6 FreeBSD 5.3-RELEASE-p6 #0: Tue Mar 29 00:14:29 CEST 2005 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386 >Description: * Install desktop entries in the fd.o common path $PREFIX/share/applications, so that they do not show up twice in the menus. * Makefile cleanups. >How-To-Repeat: >Fix: 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 >Release-Note: >Audit-Trail: >Unformatted: