From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 2 22:00:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A22C7C6C for ; Sun, 2 Jun 2013 22:00:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 83CAA1A73 for ; Sun, 2 Jun 2013 22:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r52M00MX047556 for ; Sun, 2 Jun 2013 22:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r52M00qL047555; Sun, 2 Jun 2013 22:00:00 GMT (envelope-from gnats) Resent-Date: Sun, 2 Jun 2013 22:00:00 GMT Resent-Message-Id: <201306022200.r52M00qL047555@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, Beņat Gonzalez Etxepare Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 94D23B14 for ; Sun, 2 Jun 2013 21:49:56 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) by mx1.freebsd.org (Postfix) with ESMTP id 853471A3E for ; Sun, 2 Jun 2013 21:49:56 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r52Lnun4039179 for ; Sun, 2 Jun 2013 21:49:56 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r52Lnu4p039167; Sun, 2 Jun 2013 21:49:56 GMT (envelope-from nobody) Message-Id: <201306022149.r52Lnu4p039167@oldred.freebsd.org> Date: Sun, 2 Jun 2013 21:49:56 GMT From: Beņat Gonzalez Etxepare To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/179231: [MAINTAINER PATCH] x11-fm/doublecmd: fixes in desktop file X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jun 2013 22:00:00 -0000 >Number: 179231 >Category: ports >Synopsis: [MAINTAINER PATCH] x11-fm/doublecmd: fixes in desktop file >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jun 02 22:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Beņat Gonzalez Etxepare >Release: >Organization: >Environment: >Description: Changes: - Fixed desktop file's paths (reported by Scott Sealy) - Fixed 'update-desktop-database not found' error - Added license information Patch tested in RedPorts (rev. 12867): http://redports.org/buildarchive/20130602114553-17031/ http://redports.org/buildarchive/20130602151917-89947/ (all errors because of dependencies) >How-To-Repeat: >Fix: Patch attached with submission follows: --- /usr/ports/x11-fm/doublecmd/Makefile 2013-03-23 07:09:53.000000000 +0100 +++ ./Makefile 2013-06-02 13:18:56.000000000 +0200 @@ -3,7 +3,7 @@ PORTNAME= doublecmd PORTVERSION= 0.5.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME}/Double%20Commander%20Source @@ -13,6 +13,8 @@ MAINTAINER= bbtruk@users.sourceforge.net COMMENT= Total Commander like file manager for the X Window System +LICENSE= GPLv2 + BUILD_DEPENDS= lazbuild:${PORTSDIR}/editors/lazarus \ fpcres:${PORTSDIR}/lang/fpc-utils @@ -45,7 +47,7 @@ .if ${PORT_OPTIONS:MGTK2} USE_FPC+= gtk2 -USE_GNOME= gtk20 gdkpixbuf +USE_GNOME+= gtk20 gdkpixbuf LCL_PLATFORM= gtk2 BUILD_DEPENDS+= ${LOCALBASE}/share/lazarus/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2 .endif @@ -66,6 +68,8 @@ @${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' ${WRKSRC}/src/dmhelpmanager.pas @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ ${WRKSRC}/src/uGlobsPaths.pas + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ + ${WRKSRC}/install/linux/doublecmd.desktop @${REINPLACE_CMD} -e 's|.GetSize|.Size|g' ${WRKSRC}/src/platform/uClipboard.pas @${REINPLACE_CMD} -e '176d' ${WRKSRC}/src/uxmlconfig.pas @@ -81,7 +85,7 @@ pre-install: @${RM} -f ${PLIST} -.for FILE in %%DATADIR%%/doublecmd.ext.example \ +.for FILE in %%DATADIR%%/doublecmd.png %%DATADIR%%/doublecmd.ext.example \ %%DATADIR%%/editor.col %%DATADIR%%/twilight.col %%DATADIR%%/pixmaps.txt \ %%DATADIR%%/default.bar %%DATADIR%%/multiarc.ini bin/doublecmd \ share/applications/doublecmd.desktop @@ -129,7 +133,7 @@ ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \; .endif -.for FILE in doublecmd.ext.example editor.col twilight.col pixmaps.txt default.bar multiarc.ini +.for FILE in doublecmd.png doublecmd.ext.example editor.col twilight.col pixmaps.txt default.bar multiarc.ini ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/doublecmd ${PREFIX}/bin/${PORTNAME} diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-install-linux-doublecmd.desktop ./files/patch-install-linux-doublecmd.desktop --- /usr/ports/x11-fm/doublecmd/files/patch-install-linux-doublecmd.desktop 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-install-linux-doublecmd.desktop 2013-06-02 13:15:57.000000000 +0200 @@ -0,0 +1,13 @@ +--- install/linux/doublecmd.desktop 2010-06-13 10:24:46.000000000 +0200 ++++ install/linux/doublecmd.desktop 2013-06-02 01:02:42.000000000 +0200 +@@ -1,8 +1,8 @@ + [Desktop Entry] + Name=Double Commander + Comment=Double Commander is a cross platform open source file manager with two panels side by side. +-Exec=/usr/bin/doublecmd ++Exec=%%PREFIX%%/bin/doublecmd + Terminal=false + Type=Application +-Icon=/usr/share/pixmaps/doublecmd.png ++Icon=%%DATADIR%%/doublecmd.png + Categories=Application;Utility;FileManager; >Release-Note: >Audit-Trail: >Unformatted: