From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 16 07:40:09 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52E9F106566C for ; Thu, 16 Jun 2011 07:40:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 323288FC1D for ; Thu, 16 Jun 2011 07:40:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5G7e9hD091222 for ; Thu, 16 Jun 2011 07:40:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5G7e9mH091221; Thu, 16 Jun 2011 07:40:09 GMT (envelope-from gnats) Resent-Date: Thu, 16 Jun 2011 07:40:09 GMT Resent-Message-Id: <201106160740.p5G7e9mH091221@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, Max Brazhnikov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF88D1065677 for ; Thu, 16 Jun 2011 07:30:57 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 9814D8FC0C for ; Thu, 16 Jun 2011 07:30:57 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p5G7UvOw037336 for ; Thu, 16 Jun 2011 07:30:57 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p5G7UvXA037335; Thu, 16 Jun 2011 07:30:57 GMT (envelope-from nobody) Message-Id: <201106160730.p5G7UvXA037335@red.freebsd.org> Date: Thu, 16 Jun 2011 07:30:57 GMT From: Max Brazhnikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/157919: editors/libreoffice: fix *.desktop files X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2011 07:40:09 -0000 >Number: 157919 >Category: ports >Synopsis: editors/libreoffice: fix *.desktop files >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: Thu Jun 16 07:40:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Max Brazhnikov >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: FreeBSD luna.dio.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #2 r222977: Sat Jun 11 14:22:54 MSD 2011 root@luna.dio.ru:/usr/obj/head/usr/freebsd/svn/head/sys/LUNA amd64 >Description: 1. Install desktop file for startcenter 2. Fix icons path >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/editors/libreoffice/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 22 Mar 2011 11:43:30 -0000 1.10 +++ Makefile 16 Jun 2011 07:27:46 -0000 @@ -7,6 +7,7 @@ PORTNAME= libreoffice PORTVERSION= 3.3.2 +PORTREVISION= 1 LOVERSION= ${PORTVERSION}.2 CATEGORIES= editors MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/ \ @@ -334,8 +335,8 @@ @${MV} ${LODESTDIR}/${PREFIX}/share/mime/packages/openoffice.xml ${LODESTDIR}/${PREFIX}/share/mime/packages/libreoffice.xml @for img in ${LODESTDIR}/${PREFIX}/share/icons/hicolor/*/apps/ooo-*; do ${MV} $$img `${ECHO_CMD} $$img | ${SED} "s/ooo-/libreoffice-/"`; done - @for pix in ${LODESTDIR}/${PREFIX}/share/pixmaps/ooo-*; do ${RM} $$pix; ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/`${BASENAME} $$pix | ${SED} "s/ooo-/libreoffice-/"` ${LODESTDIR}/${PREFIX}/share/pixmaps/; done -.for component in base calc draw math impress writer + @for pix in ${LODESTDIR}/${PREFIX}/share/pixmaps/ooo-*; do ${RM} $$pix; ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/`${BASENAME} $$pix | ${SED} "s/ooo-/libreoffice-/"` ${LODESTDIR}/${PREFIX}/share/pixmaps/; done +.for component in base calc draw math impress writer startcenter @cd ${LODESTDIR}/${PREFIX}/share/applications; ${LN} -s ../../lib/${PORTNAME}/share/xdg/${component}.desktop ${PORTNAME}-${component}.desktop .endfor @for dir in ${EMPTYDIRS}; do ${TOUCH} ${LODESTDIR}/${PREFIX}/lib/$$dir/.keep; done >Release-Note: >Audit-Trail: >Unformatted: