-optional_depends feh \
- "" \
- "" \
- "Wallpapers with feh" &&
-
-optional_depends imlib2 \
- "--enable-imlib2" \
- "--disable-imlib2" \
- "Imlib2 (pixmap themes) support?"
+suggest_depends feh "" "" "for setting wallpapers with feh"
diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index 1347189..0a15631 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -1,32 +1,31 @@
SPELL=fluxbox
-if [ "$FLUXBOX_SVN" == "y" ]; then
-
- if [[ "${FLUXBOX_SVN_AUTOUPDATE}" == "y" ]]
- then VERSION=$(date +%Y%m%d) && FORCE_DOWNLOAD=on
- else VERSION=svn
+if [[ $FLUXBOX_GIT == y ]]; then
+ if [[ $FLUXBOX_GIT_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=git
fi
-
SOURCE=$SPELL-git.tar.bz2
SOURCE_URL[0]=git://git.fluxbox.org/fluxbox.git:fluxbox
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
else
- VERSION=1.0.0
+ VERSION=1.1.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG=gurus.gpg:${SOURCE}.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
- WEB_SITE=http://www.fluxbox.org
+ WEB_SITE=http://www.fluxbox.org/
ENTERED=20011210
LICENSE[0]=MIT
KEYWORDS="windowmanagers"
SHORT="lightweight window manager"
cat << EOF
-Fluxbox is a fast an configurable window manager for X.
-It's based on the Blackbox 0.61.1 code.
-Fluxbox looks like blackbox and handles styles, colors, window placement
-and similar things exactly like blackbox (100% theme/style compability).
-It has a nice range of added/improved features though!
+Fluxbox is a fast an configurable window manager for X. It's based on the
+Blackbox 0.61.1 code. Fluxbox looks like blackbox and handles styles, colors,
+window placement and similar things exactly like blackbox (100% theme/style
+compability). It has a nice range of added/improved features though!
EOF
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index 6243610..d0762c3 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,7 @@
+2008-09-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.0; s:SVN:GIT:
+ * DEPENDS: feh -> suggest; removed kde support; cleaned up
+
2008-06-10 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: fixed source dir for not auto-updating svn version
diff --git a/windowmanagers/fluxbox/INSTALL b/windowmanagers/fluxbox/INSTALL
index ea39e30..88255cc 100755
--- a/windowmanagers/fluxbox/INSTALL
+++ b/windowmanagers/fluxbox/INSTALL
@@ -1,2 +1,2 @@
-default_install &&
+default_install &&
install_wmfiles
diff --git a/windowmanagers/fluxbox/PREPARE b/windowmanagers/fluxbox/PREPARE
index de916b5..ccb5188 100755
--- a/windowmanagers/fluxbox/PREPARE
+++ b/windowmanagers/fluxbox/PREPARE
@@ -1,4 +1,5 @@
-config_query FLUXBOX_SVN "Build the GIT version?" n
-if [[ "${FLUXBOX_SVN}" == "y" ]]
-then config_query FLUXBOX_SVN_AUTOUPDATE "Update git repo on every update?" n
+config_query FLUXBOX_GIT "Build the GIT version?" n
+
+if [[ $FLUXBOX_GIT == y ]]; then
+ config_query FLUXBOX_GIT_AUTOUPDATE "Update git repo on every update?" n
fi
diff --git a/windowmanagers/fluxbox/PRE_BUILD
b/windowmanagers/fluxbox/PRE_BUILD
index 8c9201b..cbc7a3c 100755
--- a/windowmanagers/fluxbox/PRE_BUILD
+++ b/windowmanagers/fluxbox/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&
-patch -p0 < $SPELL_DIRECTORY/gcc43.patch
+# fixed installation of non-existent menu file
+sed -i "525,527d" data/Makefile.in &&
+
+patch -p0 < "$SPELL_DIRECTORY/gcc43.patch"
diff --git a/windowmanagers/fluxbox/fluxbox-1.0.0.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.0.0.tar.bz2.sig
deleted file mode 100644
index 02e4cbc..0000000
Binary files a/windowmanagers/fluxbox/fluxbox-1.0.0.tar.bz2.sig and /dev/null
differ
diff --git a/windowmanagers/fluxbox/fluxbox-1.1.0.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.1.0.tar.bz2.sig
new file mode 100644
index 0000000..9603a77
Binary files /dev/null and b/windowmanagers/fluxbox/fluxbox-1.1.0.tar.bz2.sig
differ
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0aabba20d83d5a994ddf64f09715da3ed52eb9a6),
Vlad Glagolev, 09/03/2008