Date: Tue, 8 Jun 2010 20:50:52 GMT From: Warren Block <wblock@wonkity.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/147701: [patch] bsd.ports.mk incorrectly names DESKTOP_ENTRIES files Message-ID: <201006082050.o58KoqMr000315@www.freebsd.org> Resent-Message-ID: <201006082100.o58L0DXc098080@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 147701
>Category: ports
>Synopsis: [patch] bsd.ports.mk incorrectly names DESKTOP_ENTRIES files
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 08 21:00:13 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Warren Block
>Release: 8.1-Prerelease
>Organization:
>Environment:
FreeBSD lightning 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Mon Jun 7 21:00:33 MDT 2010 root@lightning:/usr/obj/usr/src/sys/LIGHTNING i386
>Description:
The first parameter of DESKTOP_ENTRIES is the name, and parameter 4 is the command. bsd.ports.mk at line 6417 is using the command as the filename. This leads to .desktop files with embedded spaces and options in the name like "links -g.desktop".
>How-To-Repeat:
Use DESKTOP_ENTRIES in a port Makefile with a command with options.
>Fix:
Patch attached to use the name parameter rather than the command. Not heavily tested, but works with www/links.
Patch attached with submission follows:
--- bsd.port.mk.orig 2010-06-08 14:40:46.000000000 -0600
+++ bsd.port.mk 2010-06-08 14:41:03.000000000 -0600
@@ -6414,7 +6414,7 @@
${ECHO_CMD} "@cwd ${DESKTOPDIR}" >> ${TMPPLIST}; \
fi; \
while [ $$# -gt 6 ]; do \
- filename="$$4.desktop"; \
+ filename="$$1.desktop"; \
pathname="${DESKTOPDIR}/$$filename"; \
categories="$$5"; \
if [ -z "$$categories" ]; then \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006082050.o58KoqMr000315>