[SM-Commit] GIT changes to master grimoire by Arjan Bouter (b0f81f698b42839a8d8247c87d167cf1c86f6b50)

Arjan Bouter scm at sourcemage.org
Fri Jan 11 14:12:52 EST 2008


GIT changes to master grimoire by Arjan Bouter <abouter at sourcemage.org>:

 windowmanagers/icewm/BUILD     |    7 ----
 windowmanagers/icewm/CONFIGURE |   59 ++++++++++++++++++++---------------------
 windowmanagers/icewm/DEPENDS   |   24 +++++++++++-----
 windowmanagers/icewm/DETAILS   |    1 
 windowmanagers/icewm/HISTORY   |    6 ++++
 windowmanagers/icewm/INSTALL   |    2 -
 6 files changed, 53 insertions(+), 46 deletions(-)

New commits:
commit 38a80874c1304a796aeddf40179e6c9bcbcc3fb2
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    icewm: use depends instead of queries, added missing deps

diff --git a/windowmanagers/icewm/BUILD b/windowmanagers/icewm/BUILD
deleted file mode 100755
index a88b986..0000000
--- a/windowmanagers/icewm/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-./configure --build=$BUILD           \
-            --prefix=/usr            \
-            --sysconfdir=/etc        \
-            --localstatedir=/var     \
-            ${OPTS}                  \
-            ${ICE_OPTS} &&
-make
diff --git a/windowmanagers/icewm/CONFIGURE b/windowmanagers/icewm/CONFIGURE
index 0df344f..184c229 100755
--- a/windowmanagers/icewm/CONFIGURE
+++ b/windowmanagers/icewm/CONFIGURE
@@ -1,33 +1,32 @@
-config_query ICE_SHAPED_DECO "Enable shaped decorations?" y
-config_query ICE_SESSION "Enable session management (experimental)?" n
-config_query ICE_LITE "Build a lightweight version of icewm?" n
-config_query ICE_GNOME1 "Enable GNOME-1 menus?" y
-config_query ICE_GNOME2 "Enable GNOME-2 menus?" y
-config_query ICE_GRAD "Enable gradient background support (experimental)?" n
-config_query ICE_GUI_EVENTS "Enable gui events support (experimental)?" n
-config_query ICE_FRAMELESS_BUTTONS "Enable frameless button support (for certain themes)?" n
+config_query_option ICE_DECO                              \
+    "Enable shaped decorations?" y                        \
+    " --enable-shaped-decorations --enable-shape"         \
+    " --disable-shaped-decorations --disable-shape"       &&
 
-persistent_add ICE_OPTS                             &&
+config_query_option ICE_SM                                \
+    "Enable session management (experimental)?" n         \
+    "--enable-sm" "--disable-sm"                          &&
 
-if [ "${ICE_SHAPED_DECO}" == "y" ]; then
-  ICE_OPTS="$ICE_OPTS --enable-shaped-decorations --enable-shape"
-fi                                                  &&
-if [ "${ICE_SESSION}" == "y" ]; then
-  ICE_OPTS="$ICE_OPTS --enable-sm"
-fi                                                  &&
-if [ "${ICE_LITE}" == "y" ]; then
-  ICE_OPTS="$ICE_OPTS --enable-lite"
-fi                                                  &&
-if [ "${ICE_GRAD}" == "y" ]; then
-  ICE_OPTS="$ICE_OPTS --enable-gradients"
-fi                                                  &&
-if [ "${ICE_GNOME1}" == "y" ]; then
-  ICE_OPTS="$ICE_OPTS --enable-menus-gnome1"
-fi                                                  &&
-if [ "${ICE_GNOME2}" == "y" ]; then
-  ICE_OPTS="$ICE_OPTS --enable-menus-gnome2"
-fi
-if [ "${ICE_GUI_EVENTS}" == "y" ]; then
-  ICE_OPTS="$ICE_OPTS --enable-guievents"
-fi
+config_query_option ICE_LT                                \
+    "Build a lightweight version of icewm?" n             \
+    "--enable-lite" "--disable-lite"                      &&
 
+config_query_option ICE_GRADIENT                          \
+    "Enable gradient background support (experimental)" n \
+    "--enable-gradients" "--disable-gradients"            &&
+
+config_query ICE_GUI_EV                                   \
+    "Enable gui events support (experimental)?" n         \
+    "--enable-guievents" "--disable-guievents"            &&
+
+config_query ICE_FRAMELESS_BUTTONS \
+  "Enable frameless button support (for certain themes, requires a patch)?" n &&
+
+persistent_remove ICE_OPTS                          &&
+persistent_remove ICE_SHAPED_DECO                   &&
+persistent_remove ICE_SESSION                       &&
+persistent_remove ICE_LITE                          &&
+persistent_remove ICE_GRAD                          &&
+persistent_remove ICE_GUI_EVENTS                    &&
+persistent_remove ICE_GNOME1                        &&
+persistent_remove ICE_GNOME2
diff --git a/windowmanagers/icewm/DEPENDS b/windowmanagers/icewm/DEPENDS
index f79ea15..ee5b5f9 100755
--- a/windowmanagers/icewm/DEPENDS
+++ b/windowmanagers/icewm/DEPENDS
@@ -1,17 +1,20 @@
 depends  X11-LIBS                                           &&
 
-. $GRIMOIRE/FUNCTIONS  &&
+. $GRIMOIRE/FUNCTIONS                                       &&
 if check_if_xorg_modular_libs; then
       depends libxrandr
-fi  &&
-
-if [[ "${ICE_GNOME1}" == "y" ]]
-then depends gnome-libs
-fi                                                          &&
-if [[ "${ICE_GNOME2}" == "y" ]]
-then depends gnome-desktop
 fi                                                          &&
 
+message  "Note that you don't need gnome* support when using enthrall"  &&
+optional_depends  gnome-libs                                \
+                  "--enable-menus-gnome1"                   \
+                  "--disable-menus-gnome1"                  \
+                  "For gnome1 menu support"                 &&
+
+optional_depends  gnome-desktop                             \
+                  "--enable-menus-gnome2"                   \
+                  "--disable-menus-gnome2"                  \
+                  "For gnome2 menu support"                 &&
 
 optional_depends  imlib                                     \
                   "--with-imlib"                            \
@@ -23,6 +26,11 @@ optional_depends  freetype2                                 \
                   "--disable-antialiasing"                  \
                   "Enable anti-aliasing on fonts"           &&
 
+optional_depends  yiff                                      \
+                  ""                                        \
+                  ""                                        \
+                  "Enable yiff sound support?"              &&
+
 optional_depends  esound                                    \
                   ""                                        \
                   ""                                        \
diff --git a/windowmanagers/icewm/DETAILS b/windowmanagers/icewm/DETAILS
index 0baced6..9f7cd25 100755
--- a/windowmanagers/icewm/DETAILS
+++ b/windowmanagers/icewm/DETAILS
@@ -11,6 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.icewm.org
          ENTERED=20010922
       LICENSE[0]=GPL
+      PATCHLEVEL=1
         KEYWORDS="windowmanagers"
            SHORT="Xwindows manager that emulates the looks of Motif, OS/2 and Windows."
 cat << EOF
diff --git a/windowmanagers/icewm/HISTORY b/windowmanagers/icewm/HISTORY
index 524663d..0efb16c 100644
--- a/windowmanagers/icewm/HISTORY
+++ b/windowmanagers/icewm/HISTORY
@@ -1,5 +1,11 @@
 2008-01-11 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: stable version 1.2.35
+	* DEPENDS: use optional_depends instead of config_query
+	           added yiff
+	* CONFIGURE: remove old presistant opts
+	* INSTALL: removed extra spaces
+	* BUILD: removed
+	* DETAILS: patchlevel=1
 
 2008-01-03 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 1.2.34 and added testing version 1.3.2
diff --git a/windowmanagers/icewm/INSTALL b/windowmanagers/icewm/INSTALL
index c514af8..88255cc 100755
--- a/windowmanagers/icewm/INSTALL
+++ b/windowmanagers/icewm/INSTALL
@@ -1,2 +1,2 @@
-default_install                                         &&
+default_install &&
 install_wmfiles



More information about the SM-Commit mailing list