View | Details | Raw Unified | Return to bug 129302
Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	fluxbox
8
PORTNAME=	fluxbox
9
PORTVERSION=	1.1.0.1
9
PORTVERSION=	1.1.0.1
10
PORTREVISION=	3
10
PORTREVISION=	4
11
CATEGORIES=	x11-wm
11
CATEGORIES=	x11-wm
12
MASTER_SITES=	SF
12
MASTER_SITES=	SF
13
DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
13
DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
(-)files/patch-util::fluxbox-generate_menu.in (-7 / +13 lines)
Lines 1-5 Link Here
1
--- util/fluxbox-generate_menu.in.orig	2008-09-22 13:41:08.000000000 -0500
1
--- util/fluxbox-generate_menu.in.orig	2008-07-14 21:33:31.000000000 +0200
2
+++ util/fluxbox-generate_menu.in	2008-09-22 14:00:24.000000000 -0500
2
+++ util/fluxbox-generate_menu.in	2008-11-30 16:58:28.000000000 +0100
3
@@ -45,7 +45,7 @@
3
@@ -45,7 +45,7 @@
4
 
4
 
5
 
5
 
Lines 187-199 Link Here
187
     [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
187
     [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
188
     #The precise order is up for debate.
188
     #The precise order is up for debate.
189
-    for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
189
-    for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
190
+    for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
190
+    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
191
         if find_it_options $browser; then
191
         if find_it_options $browser; then
192
             DEFAULT_BROWSER=$browser
192
             DEFAULT_BROWSER=$browser
193
             break
193
             break
194
@@ -1559,7 +1579,8 @@
194
@@ -1557,9 +1577,10 @@
195
 
196
 case "$DEFAULT_BROWSERNAME" in
195
     links|w3m|lynx)  append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
197
     links|w3m|lynx)  append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
196
     firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
198
-    firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
199
+    firefox|firefox3|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
197
     konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
200
     konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
198
-    opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
201
-    opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
199
+    linux-opera) append "[exec] (linux-opera) {linux-opera}" ;;
202
+    linux-opera) append "[exec] (linux-opera) {linux-opera}" ;;
Lines 201-209 Link Here
201
     MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
204
     MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
202
     MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
205
     MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
203
     *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
206
     *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
204
@@ -1578,7 +1599,8 @@
207
@@ -1576,9 +1597,10 @@
208
 
209
 append_submenu "${NETMENU}"
205
     append_submenu "${BROWSERMENU}"
210
     append_submenu "${BROWSERMENU}"
206
         normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
211
-        normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
212
+        normal_find firefox firefox3 mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
207
         find_it links       append "[exec]   (links-graphic) {links -driver x ${HOMEPAGE}}"
213
         find_it links       append "[exec]   (links-graphic) {links -driver x ${HOMEPAGE}}"
208
-        find_it opera       append "[exec]   (opera) {env QT_XFT=true opera}"
214
-        find_it opera       append "[exec]   (opera) {env QT_XFT=true opera}"
209
+        find_it linux-opera append "[exec]   (linux-opera) {linux-opera}"
215
+        find_it linux-opera append "[exec]   (linux-opera) {linux-opera}"

Return to bug 129302