[Midnightbsd-cvs] mports: fluxbox/files:
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Nov 7 16:41:34 EST 2007
Log Message:
-----------
Added Files:
-----------
mports/x11-wm/fluxbox/files:
patch-util::fluxbox-generate_menu.in (r1.1)
patch-util_startfluxbox.in (r1.1)
-------------- next part --------------
--- /dev/null
+++ x11-wm/fluxbox/files/patch-util_startfluxbox.in
@@ -0,0 +1,9 @@
+--- util/startfluxbox.in 2006/10/27 07:04:51 4600
++++ util/startfluxbox.in 2007/03/28 02:56:21 4798
+@@ -86,5 +86,5 @@
+ ) > "$startup"
+ fi
+ chmod 644 "$startup"
+- exec "$startup"
++ exec sh "$startup"
+ fi
--- /dev/null
+++ x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in
@@ -0,0 +1,165 @@
+--- util/fluxbox-generate_menu.in.orig Mon Aug 28 01:26:18 2006
++++ util/fluxbox-generate_menu.in Mon Aug 28 01:37:24 2006
+@@ -48,7 +48,7 @@
+
+
+ WHOAMI=`whoami`
+-[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
++[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin
+
+ # Check for Imlib2-support
+ if fluxbox -info 2> /dev/null | grep -q "^IMLIB"; then
+@@ -81,7 +81,7 @@
+ -d other path(s) to recursively search for *.desktop files
+ -ds wider search for *.desktop files (takes more time)
+ -i other path(s) to search for icons
+- e.g., "/usr/kde/3.3/share/icons/crystalsvg/16x16/*"
++ e.g., "%%LOCALBASE%%/share/icons/crystalsvg/16x16/*"
+ -is wider search for icons (worth the extra time)
+ -in skip icon search
+
+@@ -98,7 +98,7 @@
+ Only for packagers:
+
+ -p prefix; default is @PREFIX@
+- -n Gnome-prefix; /opt, /usr, /usr/X11R6 and /usr/local autodetected
++ -n Gnome-prefix; %%X11BASE%%, %%LOCALBASE%% and /opt autodetected
+ -q KDE-prefix; idem dito
+
+
+@@ -282,7 +282,10 @@
+ # echo -n "for $temp_icon"
+ eval doSearchLoop $USER_ICONPATHS \
+ "$FB_ICONDIR" \
+- "/usr/share/${execname%% *}" \
++ "%%LOCALBASE%%/share/${execname%% *}" \
++ "%%X11BASE%%/share/${execname%% *}" \
++ "%%LOCALBASE%%/share/gnome/${execname%% *}" \
++ "%%X11BASE%%/share/gnome/${execname%% *}" \
+ ${OTHER_ICONPATHS} \
+
+
+@@ -1204,16 +1207,16 @@
+ # These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox
+ # your prefix is: @PREFIX@
+
+-# fluxbox-generate already looks in /usr/X11R6, /usr, /usr/local and /opt so
++# fluxbox-generate already looks in %%LOCALBASE%%, %%X11BASE%% and /opt so
+ # there should be no need to specify them.
+ #
+ # PREFIX=@PREFIX@
+-# GNOME_PREFIX=/opt/gnome
+-# KDE_PREFIX=/opt/kde
++# GNOME_PREFIX=%%X11BASE%%
++# KDE_PREFIX=%%LOCALBASE%%
+
+
+ # Sepparate the list of background-dirs with semicolumns ':'
+-# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:/usr/share/wallpapers"
++# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:%%LOCALBASE%%/share/wallpapers:%%X11BASE%%/share/wallpapers"
+
+
+ # --- Boolean variables.
+@@ -1281,29 +1284,35 @@
+ -g) GNOMEMENU=yes; shift;;
+ -in) NO_ICON=yes; shift;;
+ -is) OTHER_ICONPATHS="
+- /usr/share/icons,
+- /usr/share/icons/mini,
+- /usr/share/pixmaps,
+- /usr/local/share/icons,
+- /usr/local/share/icons/mini,
+- /usr/local/share/pixmaps,
+- /usr/share/xclass/icons,
+- /usr/share/xclass/pixmaps,
+- /usr/local/share/xclass/icons,
+- /usr/local/share/xclass/pixmaps,
+- /usr/X11R6/share/icons/default/16x16,
+- /usr/X11R6/share/icons/kde/16x16,
+- /usr/X11R6/share/icons/hicolor/16x16,
+- /usr/local/X11R6/share/icons/default/16x16,
+- /usr/local/X11R6/share/icons/kde/16x16,
+- /usr/local/X11R6/share/icons/hicolor/16x16,
++ %%LOCALBASE%%/share/icons,
++ %%LOCALBASE%%/share/icons/mini,
++ %%LOCALBASE%%/share/gnome/icons,
++ %%LOCALBASE%%/share/gnome/pixmaps,
++ %%LOCALBASE%%/share/pixmaps,
++ %%LOCALBASE%%/share/xclass/icons,
++ %%LOCALBASE%%/share/xclass/pixmaps,
++ %%LOCALBASE%%/share/icons/default/16x16,
++ %%LOCALBASE%%/share/icons/kde/16x16,
++ %%LOCALBASE%%/share/icons/hicolor/16x16,
++ %%X11BASE%%/share/icons,
++ %%X11BASE%%/share/icons/mini,
++ %%X11BASE%%/share/gnome/icons,
++ %%X11BASE%%/share/gnome/pixmaps,
++ %%X11BASE%%/share/pixmaps,
++ %%X11BASE%%/share/xclass/icons,
++ %%X11BASE%%/share/xclass/pixmaps,
++ %%X11BASE%%/share/icons/default/16x16,
++ %%X11BASE%%/share/icons/kde/16x16,
++ %%X11BASE%%/share/icons/hicolor/16x16,
+ "
+ shift;;
+ -ds) OTHER_DESKTOP_PATHS="
+- /usr/share/mimelnk
+- /usr/share/applications
+- /usr/share/xsessions
+- /usr/share/services
++ %%LOCALBASE%%/share/applications
++ %%LOCALBASE%%/share/gnome/applications
++ %%LOCALBASE%%/share/gnome/xsessions
++ %%X11BASE%%/share/applications
++ %%X11BASE%%/share/gnome/applications
++ %%X11BASE%%/share/gnome/xsessions
+ "
+ # /usr/share/apps \
+ shift;;
+@@ -1378,7 +1387,7 @@
+
+
+ # gnome prefix
+-for GNOME_PREFIX in "${GNOME_PREFIX}" /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do
++for GNOME_PREFIX in "${GNOME_PREFIX}" %%LOCALBASE%% %%X11BASE%% /opt "${PREFIX}"; do
+ if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
+ break;
+ fi
+@@ -1386,7 +1395,7 @@
+ # Will remain $PREFIX if all else fails
+
+ # kde prefix
+-for KDE_PREFIX in "${KDE_PREFIX}" /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do
++for KDE_PREFIX in "${KDE_PREFIX}" %%LOCALBASE%% %%X11BASE%% /opt "${PREFIX}"; do
+ if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
+ break;
+ fi
+@@ -1474,7 +1483,7 @@
+ else
+ [ -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 galeon konqueror dillo netscape w3m amaya links lynx; do
++ for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla galeon konqueror dillo netscape w3m amaya links lynx; do
+ if find_it $browser; then
+ DEFAULT_BROWSER=$browser
+ break
+@@ -1514,7 +1523,8 @@
+ links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
+ firefox|firebird|mozilla|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}" ;;
++ opera) append "[exec] (opera) {opera}" ;;
+ MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
+ MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
+ *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
+@@ -1533,7 +1543,8 @@
+ append_submenu "${BROWSERMENU}"
+ normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla 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}"
++ find_it opera append "[exec] (opera) {opera}"
+ find_it konqueror append "[exec] (konqueror) {kfmclient openProfile webbrowsing}"
+ find_it links append "[exec] (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}"
+ find_it w3m append "[exec] (w3m) {${DEFAULT_TERM} -e w3m ${HOMEPAGE}}"
More information about the Midnightbsd-cvs
mailing list