Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 windowmanagers/xfce/BUILD   |    4 ++--
 windowmanagers/xfce/DEPENDS |   26 +++++++++++++++++++++-----
 windowmanagers/xfce/HISTORY |   11 +++++++++++
 3 files changed, 34 insertions(+), 7 deletions(-)

New commits:
commit d0a34084ffafd2e4b7ef25459a1a65b9e9e2fa67
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xfce: Also depends on glib

commit ee26fd327195b9e60dfcd505a3720e12b8c32754
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xfce: Alphabetize dependency list

commit 276599b0c81252bb145439e8df5e567196b64b54
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xfce: Add xorg-modular checks and use depends to pass dependency flags

commit e868045d104f8500e46e710583bdaf5b21419994
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xfce: Use correct --with-data-dir switch (Bug #14140)

commit 975679cc32eafb75d819ab7da3cc50abea07f75d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    xfce: Works with any provider of LIBGIF

diff --git a/windowmanagers/xfce/BUILD b/windowmanagers/xfce/BUILD
index 6be3fd5..a58ddff 100755
--- a/windowmanagers/xfce/BUILD
+++ b/windowmanagers/xfce/BUILD
@@ -1,3 +1,3 @@
-export CPPFLAGS="-I/usr/include/freetype2" &&
-OPTS=echo "$OPTS --data-dir=${INSTALL_ROOT}/usr/share --enable-xft=yes"
+export CPPFLAGS="-I/usr/include/freetype2"               &&
+OPTS="--with-data-dir=${INSTALL_ROOT}/usr/share  $OPTS"  &&
 default_build
diff --git a/windowmanagers/xfce/DEPENDS b/windowmanagers/xfce/DEPENDS
index eb9ef5e..38ba6c9 100755
--- a/windowmanagers/xfce/DEPENDS
+++ b/windowmanagers/xfce/DEPENDS
@@ -1,11 +1,27 @@
+depends  freetype2   &&
 depends  gcc34       &&
+depends  gdk-pixbuf  &&
+depends  glib        &&
 depends  gtk+        &&
+depends  imlib       &&
 depends  jpeg        &&
-depends  tiff        &&
-depends  libungif    &&
+depends  LIBGIF      &&
 depends  libpng      &&
+depends  tiff        &&
 depends  zlib        &&
-depends  imlib       &&
-depends  freetype2   &&
-depends  gdk-pixbuf  &&
+
+. $GRIMOIRE/FUNCTIONS  &&
+
+if check_if_xorg_modular_libs gtk+;  then
+  depends  libice                  &&
+  depends  libsm                   &&
+  depends  libx11                  &&
+  depends  libxext                 &&
+  depends  libxft  '--enable-xft'  &&
+  depends  libxinerama             &&
+  depends  libxpm
+else
+  depends  X11-LIBS  '--enable-xft'
+fi  &&
+
 optional_depends  "samba"  ""  ""  "for xfce's built in samba browser"
diff --git a/windowmanagers/xfce/HISTORY b/windowmanagers/xfce/HISTORY
index 3f9f007..085c694 100644
--- a/windowmanagers/xfce/HISTORY
+++ b/windowmanagers/xfce/HISTORY
@@ -1,3 +1,14 @@
+2007-11-29 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: Works with any provider of LIBGIF
+         Add xorg-modular checks
+         Add dependency on glib
+         Redundant dependency on X11-LIBS for non-xorg-modular to set Xft
+         Alphabetize list
+       * BUILD: Pass user $OPTS last to override our settings
+         Proper data-dir switch is --with-data-dir (Bug #14140)
+         Don't use "echo" to set OPTS
+         Use DEPENDS to pass --enable-xft
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.