Date: Sun, 30 Nov 2008 17:35:15 +0100 (CET) From: Antoine Brodin <antoine.brodin@laposte.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/129302: [patch] x11-wm/fluxbox: teach fluxbox-generate_menu about firefox3 Message-ID: <200811301635.mAUGZFMR036990@peanut.dreadbsd.org> Resent-Message-ID: <200811301640.mAUGe2cD059467@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129302
>Category: ports
>Synopsis: [patch] x11-wm/fluxbox: teach fluxbox-generate_menu about firefox3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 30 16:40:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Antoine Brodin
>Release: FreeBSD 8.0-CURRENT i386
>Organization:
none
>Environment:
System: FreeBSD barton.dreadbsd.org. 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sat Nov 29 22:20:52 CET 2008 root@barton.dreadbsd.org.:/usr/obj/usr/src/sys/GENERIC i386
>Description:
On FreeBSD, Firefox3 is installed as firefox3 (not firefox) so fluxbox-generate_menu doesn't recognize it.
>How-To-Repeat:
>Fix:
--- fluxbox.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/fluxbox/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- Makefile 26 Nov 2008 00:08:01 -0000 1.51
+++ Makefile 30 Nov 2008 16:24:08 -0000
@@ -7,7 +7,7 @@
PORTNAME= fluxbox
PORTVERSION= 1.1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= SF
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
Index: files/patch-util::fluxbox-generate_menu.in
===================================================================
RCS file: /home/ncvs/ports/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in,v
retrieving revision 1.5
diff -u -r1.5 patch-util::fluxbox-generate_menu.in
--- files/patch-util::fluxbox-generate_menu.in 23 Sep 2008 04:30:45 -0000 1.5
+++ files/patch-util::fluxbox-generate_menu.in 30 Nov 2008 16:02:35 -0000
@@ -1,5 +1,5 @@
---- util/fluxbox-generate_menu.in.orig 2008-09-22 13:41:08.000000000 -0500
-+++ util/fluxbox-generate_menu.in 2008-09-22 14:00:24.000000000 -0500
+--- util/fluxbox-generate_menu.in.orig 2008-07-14 21:33:31.000000000 +0200
++++ util/fluxbox-generate_menu.in 2008-11-30 16:58:28.000000000 +0100
@@ -45,7 +45,7 @@
@@ -187,13 +187,16 @@
[ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
#The precise order is up for debate.
- for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
-+ for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
++ for browser in firefox firefox3 mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
if find_it_options $browser; then
DEFAULT_BROWSER=$browser
break
-@@ -1559,7 +1579,8 @@
+@@ -1557,9 +1577,10 @@
+
+ case "$DEFAULT_BROWSERNAME" in
links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
- firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
+- firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
++ firefox|firefox3|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
- opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
+ linux-opera) append "[exec] (linux-opera) {linux-opera}" ;;
@@ -201,9 +204,12 @@
MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
*) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
-@@ -1578,7 +1599,8 @@
+@@ -1576,9 +1597,10 @@
+
+ append_submenu "${NETMENU}"
append_submenu "${BROWSERMENU}"
- normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
+- normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
++ normal_find firefox firefox3 mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
find_it links append "[exec] (links-graphic) {links -driver x ${HOMEPAGE}}"
- find_it opera append "[exec] (opera) {env QT_XFT=true opera}"
+ find_it linux-opera append "[exec] (linux-opera) {linux-opera}"
--- fluxbox.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811301635.mAUGZFMR036990>