Update to 1.1.0.1, see Release Notes and Changelog for details:
http://sourceforge.net/project/shownotes.php?group_id=35398&release_id=623696
This commit is contained in:
Jeremy Messenger
parent
ec9444a4e8
commit
598dcf05ec
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=219933
4 changed files with 41 additions and 47 deletions
|
|
@ -6,11 +6,9 @@
|
|||
#
|
||||
|
||||
PORTNAME= fluxbox
|
||||
PORTVERSION= 1.0.0
|
||||
PORTREVISION= 2
|
||||
PORTVERSION= 1.1.0.1
|
||||
CATEGORIES= x11-wm
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
MASTER_SITES= SF
|
||||
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
|
||||
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
|
||||
|
||||
|
|
@ -27,7 +25,8 @@ GNU_CONFIGURE= yes
|
|||
|
||||
DOCS= AUTHORS COPYING ChangeLog NEWS README TODO
|
||||
MAN1= fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox.1 fluxstyle.1 \
|
||||
startfluxbox.1
|
||||
startfluxbox.1 fluxbox-remote.1
|
||||
MAN5= fluxbox-keys.5
|
||||
DOCSVERSION= 20060629
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
|
|
@ -62,12 +61,6 @@ CONFIGURE_ARGS+= --enable-imlib2
|
|||
CONFIGURE_ARGS+= --disable-imlib2
|
||||
.endif
|
||||
|
||||
.if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
|
||||
CONFIGURE_ARGS+= --enable-kde
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-kde
|
||||
.endif
|
||||
|
||||
.if defined(WITH_XINERAMA) || defined(PACKAGE_BUILDING)
|
||||
USE_XORG+= xinerama
|
||||
CONFIGURE_ARGS+= --enable-xinerama
|
||||
|
|
@ -138,9 +131,6 @@ pre-everything::
|
|||
.if !defined(WITH_IMLIB2)
|
||||
@${ECHO_CMD} "WITH_IMLIB2=yes Enable Imlib2 (pixmap themes) support"
|
||||
.endif
|
||||
.if !defined(WITH_KDE)
|
||||
@${ECHO_CMD} "WITH_KDE=yes Enable KDE slit support"
|
||||
.endif
|
||||
.if !defined(WITH_XINERAMA)
|
||||
@${ECHO_CMD} "WITH_XINERAMA=yes Enable Xinerama support"
|
||||
.endif
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
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 (fluxbox-1.1.0.1.tar.gz) = 6f5aa590058a39bc1cfdbe38b092e2b3
|
||||
SHA256 (fluxbox-1.1.0.1.tar.gz) = ff292dee6f36ef690df3989480481f679f95daee98a85d5dcdbf0a6fa4223ea4
|
||||
SIZE (fluxbox-1.1.0.1.tar.gz) = 1013472
|
||||
MD5 (fb-doc-mfhtml-20060629.tgz) = 0c100fe1489c22f5b205d87b9a6fa006
|
||||
SHA256 (fb-doc-mfhtml-20060629.tgz) = 98d37b73dbb1caf1361b098bffc69d1f365f9b324a71f622ba72ed5da5d9b9ec
|
||||
SIZE (fb-doc-mfhtml-20060629.tgz) = 115560
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- 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 @@
|
||||
--- util/fluxbox-generate_menu.in.orig 2008-09-02 15:13:53.000000000 -0500
|
||||
+++ util/fluxbox-generate_menu.in 2008-09-02 15:32:52.000000000 -0500
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
|
||||
WHOAMI=`whoami`
|
||||
|
|
@ -8,36 +8,35 @@
|
|||
+[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:%%LOCALBASE%%/bin
|
||||
|
||||
# Check for Imlib2-support
|
||||
if fluxbox -info 2> /dev/null | grep -q "^IMLIB"; then
|
||||
@@ -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
|
||||
if @pkgprefix@fluxbox@pkgsuffix@ -info 2> /dev/null | grep -q "^IMLIB"; then
|
||||
@@ -79,7 +79,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
|
||||
-is Wider search for icons (worth the extra time)
|
||||
-in Skip icon search
|
||||
|
||||
@@ -99,7 +99,7 @@
|
||||
@@ -96,7 +96,7 @@
|
||||
Only for packagers:
|
||||
|
||||
-p prefix; default is @PREFIX@
|
||||
-p Prefix; default is @PREFIX@
|
||||
- -n Gnome-prefix; /opt, /usr, /usr/X11R6 and /usr/local autodetected
|
||||
+ -n Gnome-prefix; %%LOCALBASE%% autodetected
|
||||
-q KDE-prefix; idem dito
|
||||
|
||||
|
||||
@@ -283,7 +283,8 @@
|
||||
@@ -253,7 +253,7 @@
|
||||
# echo -n "for $temp_icon"
|
||||
eval doSearchLoop $USER_ICONPATHS \
|
||||
"$FB_ICONDIR" \
|
||||
- "/usr/share/${execname%% *}" \
|
||||
+ "%%LOCALBASE%%/share/${execname%% *}" \
|
||||
+ "%%LOCALBASE%%/share/gnome/${execname%% *}" \
|
||||
${OTHER_ICONPATHS} \
|
||||
|
||||
|
||||
@@ -1261,16 +1262,16 @@
|
||||
@@ -1236,16 +1236,16 @@
|
||||
# These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox
|
||||
# your prefix is: @PREFIX@
|
||||
|
||||
|
|
@ -52,13 +51,13 @@
|
|||
+# KDE_PREFIX=%%LOCALBASE%%
|
||||
|
||||
|
||||
# Sepparate the list of background-dirs with semicolumns ':'
|
||||
# Separate the list of background dirs with colons ':'
|
||||
-# BACKGROUND_DIRS="${USERFLUXDIR}/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:/usr/share/wallpapers"
|
||||
+# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:%%LOCALBASE%%/share/wallpapers"
|
||||
+# BACKGROUND_DIRS="${USERFLUXDIR}/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:%%LOCALBASE%%/share/wallpapers"
|
||||
|
||||
|
||||
# --- Boolean variables.
|
||||
@@ -1342,29 +1343,23 @@
|
||||
@@ -1317,29 +1317,21 @@
|
||||
-g) GNOMEMENU=yes; shift;;
|
||||
-in) NO_ICON=yes; shift;;
|
||||
-is) OTHER_ICONPATHS="
|
||||
|
|
@ -80,8 +79,6 @@
|
|||
- /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
|
||||
|
|
@ -95,14 +92,14 @@
|
|||
- /usr/share/applications
|
||||
- /usr/share/xsessions
|
||||
- /usr/share/services
|
||||
+ %%LOCALBASE%%/share/mimelnk
|
||||
+ %%LOCALBASE%%/share/applications
|
||||
+ %%LOCALBASE%%/share/gnome/applications
|
||||
+ %%LOCALBASE%%/share/gnome/xsessions
|
||||
+ %%LOCALBASE%%/share/xsessions
|
||||
+ %%LOCALBASE%%/share/services
|
||||
"
|
||||
# /usr/share/apps \
|
||||
shift;;
|
||||
@@ -1440,7 +1435,7 @@
|
||||
@@ -1416,7 +1408,7 @@
|
||||
|
||||
|
||||
# gnome prefix
|
||||
|
|
@ -111,7 +108,7 @@
|
|||
if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
|
||||
break;
|
||||
fi
|
||||
@@ -1448,7 +1443,7 @@
|
||||
@@ -1424,7 +1416,7 @@
|
||||
# Will remain $PREFIX if all else fails
|
||||
|
||||
# kde prefix
|
||||
|
|
@ -120,16 +117,16 @@
|
|||
if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
|
||||
break;
|
||||
fi
|
||||
@@ -1536,7 +1531,7 @@
|
||||
@@ -1512,7 +1504,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 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
|
||||
if find_it_options $browser; then
|
||||
DEFAULT_BROWSER=$browser
|
||||
break
|
||||
@@ -1583,7 +1578,8 @@
|
||||
@@ -1559,7 +1551,8 @@
|
||||
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}}" ;;
|
||||
konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
|
||||
|
|
@ -139,7 +136,7 @@
|
|||
MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
|
||||
MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
|
||||
*) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
|
||||
@@ -1602,7 +1598,8 @@
|
||||
@@ -1578,7 +1571,8 @@
|
||||
append_submenu "${BROWSERMENU}"
|
||||
normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
|
||||
find_it links append "[exec] (links-graphic) {links -driver x ${HOMEPAGE}}"
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@ bin/startfluxbox
|
|||
%%DOCHTML:%%%%DOCSDIR%%/html/x836.html
|
||||
%%DOCHTML:%%%%DOCSDIR%%/html/x837.html
|
||||
%%DOCPDF:%%%%DOCSDIR%%/pdf/fluxbook-20060629.pdf
|
||||
%%DATADIR%%/apps
|
||||
%%DATADIR%%/init
|
||||
%%DATADIR%%/keys
|
||||
%%DATADIR%%/menu
|
||||
|
|
@ -150,6 +151,7 @@ bin/startfluxbox
|
|||
%%NLS:%%%%DATADIR%%/nls/ko_KR.UTF-8/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/lv_LV.ISO-8859-13/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/lv_LV.UTF-8/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/mk_MK.UTF-8/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/nb_NO.UTF-8/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/nl_NL.ISO-8859-15/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/nl_NL.UTF-8/fluxbox.cat
|
||||
|
|
@ -169,7 +171,7 @@ bin/startfluxbox
|
|||
%%NLS:%%%%DATADIR%%/nls/sl_SI.UTF-8/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/sv_SE.ISO-8859-1/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/sv_SE.UTF-8/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/tr_TR.ISO-8859-1/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/tr_TR.ISO-8859-9/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/tr_TR.UTF-8/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/uk_UA.KOI8-U/fluxbox.cat
|
||||
%%NLS:%%%%DATADIR%%/nls/uk_UA.UTF-8/fluxbox.cat
|
||||
|
|
@ -179,6 +181,8 @@ bin/startfluxbox
|
|||
%%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
|
||||
%%NLS:%%%%DATADIR%%/nls/zh_TW.UTF-8/fluxbox.cat
|
||||
%%DATADIR%%/overlay
|
||||
%%DATADIR%%/styles/Artwiz
|
||||
%%DATADIR%%/styles/BlueFlux/pixmaps/button_close_active.xpm
|
||||
%%DATADIR%%/styles/BlueFlux/pixmaps/button_close_pressed.xpm
|
||||
|
|
@ -306,6 +310,7 @@ bin/startfluxbox
|
|||
%%DATADIR%%/styles/zimek_bisque/theme.cfg
|
||||
%%DATADIR%%/styles/zimek_darkblue/theme.cfg
|
||||
%%DATADIR%%/styles/zimek_green/theme.cfg
|
||||
%%DATADIR%%/windowmenu
|
||||
@dirrm %%DATADIR%%/styles/zimek_green
|
||||
@dirrm %%DATADIR%%/styles/zimek_darkblue
|
||||
@dirrm %%DATADIR%%/styles/zimek_bisque
|
||||
|
|
@ -324,6 +329,7 @@ bin/startfluxbox
|
|||
@dirrm %%DATADIR%%/styles/BlueFlux/pixmaps
|
||||
@dirrm %%DATADIR%%/styles/BlueFlux
|
||||
@dirrm %%DATADIR%%/styles
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/zh_TW.UTF-8
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.UTF-8
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.GBK
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.GB2312
|
||||
|
|
@ -333,7 +339,7 @@ bin/startfluxbox
|
|||
%%NLS:%%@dirrm %%DATADIR%%/nls/uk_UA.UTF-8
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/uk_UA.KOI8-U
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/tr_TR.UTF-8
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/tr_TR.ISO-8859-1
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/tr_TR.ISO-8859-9
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/sv_SE.UTF-8
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/sv_SE.ISO-8859-1
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/sl_SI.UTF-8
|
||||
|
|
@ -353,6 +359,7 @@ bin/startfluxbox
|
|||
%%NLS:%%@dirrm %%DATADIR%%/nls/nl_NL.UTF-8
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/nl_NL.ISO-8859-15
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/nb_NO.UTF-8
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/mk_MK.UTF-8
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/lv_LV.UTF-8
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/lv_LV.ISO-8859-13
|
||||
%%NLS:%%@dirrm %%DATADIR%%/nls/ko_KR.UTF-8
|
||||
|
|
|
|||
Loading…
Reference in a new issue