[Midnightbsd-cvs] mports: x11-wm/fluxbox: Update from fluxbox 1.0 rc3 to 1.0 release.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Mar 4 22:20:01 EST 2008
Log Message:
-----------
Update from fluxbox 1.0 rc3 to 1.0 release.
Modified Files:
--------------
mports/x11-wm/fluxbox:
Makefile (r1.4 -> r1.5)
distinfo (r1.2 -> r1.3)
pkg-plist (r1.2 -> r1.3)
mports/x11-wm/fluxbox/files:
patch-util::fluxbox-generate_menu.in (r1.1 -> r1.2)
Removed Files:
-------------
mports/x11-wm/fluxbox/files:
patch-util_startfluxbox.in
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-wm/fluxbox/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-wm/fluxbox/pkg-plist -L x11-wm/fluxbox/pkg-plist -u -r1.2 -r1.3
--- x11-wm/fluxbox/pkg-plist
+++ x11-wm/fluxbox/pkg-plist
@@ -3,6 +3,7 @@
bin/fbsetroot
bin/fluxbox
bin/fluxbox-generate_menu
+bin/fluxbox-remote
bin/fluxbox-update_configs
bin/startfluxbox
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -118,15 +119,27 @@
%%NLS:%%%%DATADIR%%/nls/cs_CZ.UTF-8/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/da_DK.ISO-8859-1/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/da_DK.UTF-8/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/de_AT.ISO-8859-15/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/de_AT.UTF-8/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/de_CH.ISO-8859-15/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/de_CH.UTF-8/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/de_DE.ISO-8859-15/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/de_DE.UTF-8/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/el_GR.UTF-8/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/en_GB.ISO-8859-1/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/en_GB.UTF-8/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/en_US.ISO-8859-1/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/en_US.UTF-8/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/es_AR.ISO-8859-15/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/es_AR.UTF-8/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/es_ES.ISO-8859-15/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/es_ES.UTF-8/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/et_EE.ISO-8859-15/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/et_EE.UTF-8/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/fi_FI.ISO-8859-1/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/fi_FI.UTF-8/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/fr_CH.ISO-8859-15/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/fr_CH.UTF-8/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/fr_FR.ISO-8859-15/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/fr_FR.UTF-8/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/it_IT.ISO-8859-1/fluxbox.cat
@@ -150,6 +163,8 @@
%%NLS:%%%%DATADIR%%/nls/pt_PT.UTF-8/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/ru_RU.KOI8-R/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/ru_RU.UTF-8/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/sk_SK.ISO-8859-2/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/sk_SK.UTF-8/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/sl_SI.ISO-8859-2/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/sl_SI.UTF-8/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/sv_SE.ISO-8859-1/fluxbox.cat
@@ -159,7 +174,10 @@
%%NLS:%%%%DATADIR%%/nls/uk_UA.KOI8-U/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/uk_UA.UTF-8/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/vi_VN.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/zh_CN.ISO-8859-1/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/zh_CN.BIG5/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/zh_CN.GB18030/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/zh_CN.GB2312/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/zh_CN.GBK/fluxbox.cat
%%NLS:%%%%DATADIR%%/nls/zh_CN.UTF-8/fluxbox.cat
%%DATADIR%%/styles/Artwiz
%%DATADIR%%/styles/BlueFlux/pixmaps/button_close_active.xpm
@@ -185,9 +203,6 @@
%%DATADIR%%/styles/BlueFlux/pixmaps/toolbar_label.xpm
%%DATADIR%%/styles/BlueFlux/theme.cfg
%%DATADIR%%/styles/BlueNight
-%%DATADIR%%/styles/Carbondioxide
-%%DATADIR%%/styles/Clean
-%%DATADIR%%/styles/Cthulhain
%%DATADIR%%/styles/Emerge/pixmaps/bullet.xpm
%%DATADIR%%/styles/Emerge/pixmaps/close-pressed.xpm
%%DATADIR%%/styles/Emerge/pixmaps/close-unfocus.xpm
@@ -212,23 +227,108 @@
%%DATADIR%%/styles/Makro
%%DATADIR%%/styles/MerleyKay
%%DATADIR%%/styles/Meta
-%%DATADIR%%/styles/Minimal
%%DATADIR%%/styles/Nyz
%%DATADIR%%/styles/Operation
%%DATADIR%%/styles/Outcomes
-%%DATADIR%%/styles/Rampage
%%DATADIR%%/styles/Results
%%DATADIR%%/styles/Shade
-%%DATADIR%%/styles/Spiff
%%DATADIR%%/styles/Twice
+%%DATADIR%%/styles/arch/pixmaps/bullet.xpm
+%%DATADIR%%/styles/arch/pixmaps/closefcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/closepr.xpm
+%%DATADIR%%/styles/arch/pixmaps/closeufcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/frame.xpm
+%%DATADIR%%/styles/arch/pixmaps/gripfcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/maxfcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/maxpr.xpm
+%%DATADIR%%/styles/arch/pixmaps/maxufcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/menuiconfcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/menuiconpr.xpm
+%%DATADIR%%/styles/arch/pixmaps/menuiconufcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/minfcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/minpr.xpm
+%%DATADIR%%/styles/arch/pixmaps/minufcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/selected.xpm
+%%DATADIR%%/styles/arch/pixmaps/shadefcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/shadepr.xpm
+%%DATADIR%%/styles/arch/pixmaps/shadeufcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/stickfcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/stickpr.xpm
+%%DATADIR%%/styles/arch/pixmaps/stickufcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/stuckfcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/stuckufcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/tbarfcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/tbarufcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/unselected.xpm
+%%DATADIR%%/styles/arch/pixmaps/unshadefcs.xpm
+%%DATADIR%%/styles/arch/pixmaps/unshadepr.xpm
+%%DATADIR%%/styles/arch/pixmaps/unshadeufcs.xpm
+%%DATADIR%%/styles/arch/theme.cfg
+%%DATADIR%%/styles/bloe/pixmaps/bullet.xpm
+%%DATADIR%%/styles/bloe/pixmaps/closefcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/closepr.xpm
+%%DATADIR%%/styles/bloe/pixmaps/closeufcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/frame.xpm
+%%DATADIR%%/styles/bloe/pixmaps/maxfcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/maxpr.xpm
+%%DATADIR%%/styles/bloe/pixmaps/maxufcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/menuiconfcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/menuiconpr.xpm
+%%DATADIR%%/styles/bloe/pixmaps/menuiconufcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/minfcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/minpr.xpm
+%%DATADIR%%/styles/bloe/pixmaps/minufcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/selected.xpm
+%%DATADIR%%/styles/bloe/pixmaps/shadefcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/shadepr.xpm
+%%DATADIR%%/styles/bloe/pixmaps/shadeufcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/stickfcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/stickpr.xpm
+%%DATADIR%%/styles/bloe/pixmaps/stickufcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/stuckfcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/stuckufcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/tbarfcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/tbarufcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/unselected.xpm
+%%DATADIR%%/styles/bloe/pixmaps/unshadefcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/unshadepr.xpm
+%%DATADIR%%/styles/bloe/pixmaps/unshadeufcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/windowlabelfcs.xpm
+%%DATADIR%%/styles/bloe/pixmaps/windowlabelufcs.xpm
+%%DATADIR%%/styles/bloe/theme.cfg
+%%DATADIR%%/styles/bora_black/theme.cfg
+%%DATADIR%%/styles/bora_blue/theme.cfg
+%%DATADIR%%/styles/bora_green/theme.cfg
+%%DATADIR%%/styles/carp/theme.cfg
+%%DATADIR%%/styles/green_tea/theme.cfg
+%%DATADIR%%/styles/ostrich/theme.cfg
%%DATADIR%%/styles/qnx-photon
+%%DATADIR%%/styles/zimek_bisque/theme.cfg
+%%DATADIR%%/styles/zimek_darkblue/theme.cfg
+%%DATADIR%%/styles/zimek_green/theme.cfg
+ at dirrm %%DATADIR%%/styles/zimek_green
+ at dirrm %%DATADIR%%/styles/zimek_darkblue
+ at dirrm %%DATADIR%%/styles/zimek_bisque
+ at dirrm %%DATADIR%%/styles/ostrich
+ at dirrm %%DATADIR%%/styles/green_tea
+ at dirrm %%DATADIR%%/styles/carp
+ at dirrm %%DATADIR%%/styles/bora_green
+ at dirrm %%DATADIR%%/styles/bora_blue
+ at dirrm %%DATADIR%%/styles/bora_black
+ at dirrm %%DATADIR%%/styles/bloe/pixmaps
+ at dirrm %%DATADIR%%/styles/bloe
+ at dirrm %%DATADIR%%/styles/arch/pixmaps
+ at dirrm %%DATADIR%%/styles/arch
@dirrm %%DATADIR%%/styles/Emerge/pixmaps
@dirrm %%DATADIR%%/styles/Emerge
@dirrm %%DATADIR%%/styles/BlueFlux/pixmaps
@dirrm %%DATADIR%%/styles/BlueFlux
@dirrm %%DATADIR%%/styles
%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.ISO-8859-1
+%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.GBK
+%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.GB2312
+%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.GB18030
+%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.BIG5
%%NLS:%%@dirrm %%DATADIR%%/nls/vi_VN.UTF-8
%%NLS:%%@dirrm %%DATADIR%%/nls/uk_UA.UTF-8
%%NLS:%%@dirrm %%DATADIR%%/nls/uk_UA.KOI8-U
@@ -238,6 +338,8 @@
%%NLS:%%@dirrm %%DATADIR%%/nls/sv_SE.ISO-8859-1
%%NLS:%%@dirrm %%DATADIR%%/nls/sl_SI.UTF-8
%%NLS:%%@dirrm %%DATADIR%%/nls/sl_SI.ISO-8859-2
+%%NLS:%%@dirrm %%DATADIR%%/nls/sk_SK.UTF-8
+%%NLS:%%@dirrm %%DATADIR%%/nls/sk_SK.ISO-8859-2
%%NLS:%%@dirrm %%DATADIR%%/nls/ru_RU.UTF-8
%%NLS:%%@dirrm %%DATADIR%%/nls/ru_RU.KOI8-R
%%NLS:%%@dirrm %%DATADIR%%/nls/pt_PT.UTF-8
@@ -261,15 +363,27 @@
%%NLS:%%@dirrm %%DATADIR%%/nls/it_IT.ISO-8859-1
%%NLS:%%@dirrm %%DATADIR%%/nls/fr_FR.UTF-8
%%NLS:%%@dirrm %%DATADIR%%/nls/fr_FR.ISO-8859-15
+%%NLS:%%@dirrm %%DATADIR%%/nls/fr_CH.UTF-8
+%%NLS:%%@dirrm %%DATADIR%%/nls/fr_CH.ISO-8859-15
+%%NLS:%%@dirrm %%DATADIR%%/nls/fi_FI.UTF-8
+%%NLS:%%@dirrm %%DATADIR%%/nls/fi_FI.ISO-8859-1
%%NLS:%%@dirrm %%DATADIR%%/nls/et_EE.UTF-8
%%NLS:%%@dirrm %%DATADIR%%/nls/et_EE.ISO-8859-15
%%NLS:%%@dirrm %%DATADIR%%/nls/es_ES.UTF-8
%%NLS:%%@dirrm %%DATADIR%%/nls/es_ES.ISO-8859-15
%%NLS:%%@dirrm %%DATADIR%%/nls/es_AR.UTF-8
%%NLS:%%@dirrm %%DATADIR%%/nls/es_AR.ISO-8859-15
+%%NLS:%%@dirrm %%DATADIR%%/nls/en_US.UTF-8
+%%NLS:%%@dirrm %%DATADIR%%/nls/en_US.ISO-8859-1
+%%NLS:%%@dirrm %%DATADIR%%/nls/en_GB.UTF-8
+%%NLS:%%@dirrm %%DATADIR%%/nls/en_GB.ISO-8859-1
%%NLS:%%@dirrm %%DATADIR%%/nls/el_GR.UTF-8
%%NLS:%%@dirrm %%DATADIR%%/nls/de_DE.UTF-8
%%NLS:%%@dirrm %%DATADIR%%/nls/de_DE.ISO-8859-15
+%%NLS:%%@dirrm %%DATADIR%%/nls/de_CH.UTF-8
+%%NLS:%%@dirrm %%DATADIR%%/nls/de_CH.ISO-8859-15
+%%NLS:%%@dirrm %%DATADIR%%/nls/de_AT.UTF-8
+%%NLS:%%@dirrm %%DATADIR%%/nls/de_AT.ISO-8859-15
%%NLS:%%@dirrm %%DATADIR%%/nls/da_DK.UTF-8
%%NLS:%%@dirrm %%DATADIR%%/nls/da_DK.ISO-8859-1
%%NLS:%%@dirrm %%DATADIR%%/nls/cs_CZ.UTF-8
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-wm/fluxbox/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11-wm/fluxbox/Makefile -L x11-wm/fluxbox/Makefile -u -r1.4 -r1.5
--- x11-wm/fluxbox/Makefile
+++ x11-wm/fluxbox/Makefile
@@ -3,12 +3,11 @@
# Whom: spn
#
# $MidnightBSD$
-# $FreeBSD: ports/x11-wm/fluxbox/Makefile,v 1.44 2007/07/23 09:36:50 rafan Exp $
+# $FreeBSD: ports/x11-wm/fluxbox/Makefile,v 1.45 2007/10/08 21:23:29 mezz Exp $
#
PORTNAME= fluxbox
-PORTVERSION= 1.0rc3
-PORTREVISION= 3
+PORTVERSION= 1.0.0
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -33,8 +32,6 @@
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug
-CFLAGS+= -g
-STRIP=
.endif
.if defined(WITH_DOCHTML)
@@ -58,7 +55,7 @@
PLIST_SUB+= DOCPDF:="@comment "
.endif
-.if defined(WITH_IMLIB2)
+.if !defined(WITHOUT_IMLIB2)
LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
CONFIGURE_ARGS+= --enable-imlib2
.else
@@ -162,11 +159,10 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
- s|%%X11BASE%%|${X11BASE}|g' \
- ${WRKSRC}/util/fluxbox-generate_menu.in
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
- s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/util/fbsetbg
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/util/fluxbox-generate_menu.in
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+ ${WRKSRC}/util/fbsetbg
.if defined(WITHOUT_NLS)
@${REINPLACE_CMD} -e 's|HAVE_ICONV=yes|HAVE_ICONV=no|g' \
${WRKSRC}/configure
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-wm/fluxbox/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-wm/fluxbox/distinfo -L x11-wm/fluxbox/distinfo -u -r1.2 -r1.3
--- x11-wm/fluxbox/distinfo
+++ x11-wm/fluxbox/distinfo
@@ -1,6 +1,6 @@
-MD5 (fluxbox-1.0rc3.tar.gz) = 4c87c0a2ed1d50fffdae8ba394ad4866
-SHA256 (fluxbox-1.0rc3.tar.gz) = 1e075e96de33c919b18f47abca44f0f29d3832869c8504ff20fcfe8ae4ae05cc
-SIZE (fluxbox-1.0rc3.tar.gz) = 1060710
+MD5 (fluxbox-1.0.0.tar.gz) = 1f389177e17cd1e8dbed07c80812961f
+SHA256 (fluxbox-1.0.0.tar.gz) = 98afcaae49cd3cb1ca5fa32b379d630ec88a75e64cb8472a1023db1d1c35c12a
+SIZE (fluxbox-1.0.0.tar.gz) = 975940
MD5 (fb-doc-mfhtml-20060629.tgz) = 0c100fe1489c22f5b205d87b9a6fa006
SHA256 (fb-doc-mfhtml-20060629.tgz) = 98d37b73dbb1caf1361b098bffc69d1f365f9b324a71f622ba72ed5da5d9b9ec
SIZE (fb-doc-mfhtml-20060629.tgz) = 115560
--- x11-wm/fluxbox/files/patch-util_startfluxbox.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
Index: patch-util::fluxbox-generate_menu.in
===================================================================
RCS file: /home/cvs/mports/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in -L x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in -u -r1.1 -r1.2
--- x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in
+++ x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in
@@ -1,15 +1,15 @@
---- 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
+--- util/fluxbox-generate_menu.in.orig 2007-10-08 15:30:19.000000000 -0500
++++ util/fluxbox-generate_menu.in 2007-10-08 15:41:35.000000000 -0500
@@ -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
++[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:%%LOCALBASE%%/bin
# Check for Imlib2-support
if fluxbox -info 2> /dev/null | grep -q "^IMLIB"; then
-@@ -81,7 +81,7 @@
+@@ -82,7 +82,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
@@ -18,88 +18,76 @@
-is wider search for icons (worth the extra time)
-in skip icon search
-@@ -98,7 +98,7 @@
+@@ -99,7 +99,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
++ -n Gnome-prefix; %%LOCALBASE%% autodetected
-q KDE-prefix; idem dito
-@@ -282,7 +282,10 @@
+@@ -283,7 +283,8 @@
# 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 @@
+@@ -1261,16 +1262,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
++# fluxbox-generate already looks in %%LOCALBASE%% so
# there should be no need to specify them.
#
# PREFIX=@PREFIX@
-# GNOME_PREFIX=/opt/gnome
-# KDE_PREFIX=/opt/kde
-+# GNOME_PREFIX=%%X11BASE%%
++# GNOME_PREFIX=%%LOCALBASE%%
+# 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"
+-# BACKGROUND_DIRS="${USERFLUXDIR}/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:/usr/share/wallpapers"
++# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:%%LOCALBASE%%/share/wallpapers"
# --- Boolean variables.
-@@ -1281,29 +1284,35 @@
+@@ -1342,29 +1343,23 @@
-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,
+- /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
"
shift;;
-ds) OTHER_DESKTOP_PATHS="
@@ -110,42 +98,40 @@
+ %%LOCALBASE%%/share/applications
+ %%LOCALBASE%%/share/gnome/applications
+ %%LOCALBASE%%/share/gnome/xsessions
-+ %%X11BASE%%/share/applications
-+ %%X11BASE%%/share/gnome/applications
-+ %%X11BASE%%/share/gnome/xsessions
++ %%LOCALBASE%%/share/xsessions
"
# /usr/share/apps \
shift;;
-@@ -1378,7 +1387,7 @@
+@@ -1440,7 +1435,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
++for GNOME_PREFIX in "${GNOME_PREFIX}" %%LOCALBASE%% "${PREFIX}"; do
if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
break;
fi
-@@ -1386,7 +1395,7 @@
+@@ -1448,7 +1443,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
++for KDE_PREFIX in "${KDE_PREFIX}" %%LOCALBASE%% "${PREFIX}"; do
if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
break;
fi
-@@ -1474,7 +1483,7 @@
+@@ -1536,7 +1531,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
+- 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
if find_it $browser; then
DEFAULT_BROWSER=$browser
break
-@@ -1514,7 +1523,8 @@
+@@ -1583,7 +1578,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}}" ;;
+ firefox|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}" ;;
@@ -153,9 +139,9 @@
MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
*) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
-@@ -1533,7 +1543,8 @@
+@@ -1602,7 +1598,8 @@
append_submenu "${BROWSERMENU}"
- normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla dillo netscape vncviewer
+ normal_find firefox 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}"
More information about the Midnightbsd-cvs
mailing list