Merge branch 'xorg-modular' of /home/sandalle/scm/git/smgl/grimoire/ into xorg-modular

Remember kids, make sure your branch is up-to-date *before* you do a bunch of
work on it. :(

Conflicts:

	ChangeLog
	audio-creation/qsynth/HISTORY
	audio-creation/rosegarden/HISTORY
	audio-drivers/nas/BUILD
	audio-drivers/nas/HISTORY
	audio-drivers/pulseaudio/HISTORY
	audio-soft/qjackctl/DEPENDS
	audio-soft/qjackctl/HISTORY
	chat-im/gajim/DEPENDS
	chat-im/gajim/HISTORY
	devel/gambas2/HISTORY
	devel/tk/HISTORY
	display/directfb/HISTORY
	display/qingy/HISTORY
	e/e17/DEPENDS
	e/e17/HISTORY
	e/e_module-bling/HISTORY
	e/ecore/DEPENDS
	e/ecore/HISTORY
	e/evas/DEPENDS
	e/evas/HISTORY
	e/imlib2/HISTORY
	editors/lyx/HISTORY
	editors/openoffice/HISTORY
	editors/vim/HISTORY
	gnome2-apps/gthumb2/HISTORY
	gnome2-libs/java-access-bridge/HISTORY
	gnome2-libs/libxklavier/HISTORY
	gnome2-libs/pango/HISTORY
	graphics-libs/cegui/DEPENDS
	graphics-libs/cegui/HISTORY
	graphics-libs/cimg/HISTORY
	graphics-libs/devil/HISTORY
	graphics-libs/freeglut/DEPENDS
	graphics-libs/freeglut/HISTORY
	graphics-libs/freetype1/HISTORY
	graphics-libs/mesalib/HISTORY
	graphics-libs/mesalib/PRE_BUILD
	graphics-libs/vips/HISTORY
	graphics/fontforge/HISTORY
	graphics/freewrl/HISTORY
	graphics/imagemagick/HISTORY
	graphics/mesademos/HISTORY
	graphics/ploticus/HISTORY
	haskell/haskell-x11/HISTORY
	http/elinks/HISTORY
	http/links-twibright/HISTORY
	http/seamonkey/HISTORY
	http/xulrunner/HISTORY
	kde-apps/kid3/HISTORY
	kde-core/kdebase/HISTORY
	kde4/HISTORY
	kde4/KDE_DEPENDS
	kernels/synaptics/DEPENDS
	kernels/synaptics/HISTORY
	libs/sdl/HISTORY
	mail/exim/HISTORY
	mobile/gnokii/HISTORY
	mobile/gpsd/DEPENDS
	mobile/gpsd/HISTORY
	perl-cpan/perl-gd/HISTORY
	perl-cpan/perl-tk/HISTORY
	php-pear/php-dev/HISTORY
	php-pear/php/HISTORY
	php-pear/php4/HISTORY
	printer/ghostscript/HISTORY
	science-libs/vtk/HISTORY
	science/xaos/HISTORY
	shell-term-fm/mc/HISTORY
	shell-term-fm/mlterm/HISTORY
	shell-term-fm/rxvt-unicode/HISTORY
	shell-term-fm/worker/DEPENDS
	shell-term-fm/worker/HISTORY
	shell-term-fm/x3270/HISTORY
	shell-term-fm/yeahconsole/HISTORY
	utils/beagle/HISTORY
	utils/dbus/DEPENDS
	utils/dbus/HISTORY
	utils/gnuplot/HISTORY
	utils/sunbird/HISTORY
	utils/xen-tools/HISTORY
	video-libs/gst-plugins-base/HISTORY
	video-libs/gst-plugins-good/HISTORY
	video-libs/xine-lib/HISTORY
	video/mplayer/DEPENDS
	video/mplayer/HISTORY
	video/transcode/HISTORY
	video/xvattr/HISTORY
	windowmanagers/aewm++/HISTORY
	windowmanagers/dwm/HISTORY
	windowmanagers/evilwm/HISTORY
	windowmanagers/fluxbox/HISTORY
	windowmanagers/fvwm/HISTORY
	windowmanagers/icewm/DEPENDS
	windowmanagers/icewm/HISTORY
	windowmanagers/ion3/DEPENDS
	windowmanagers/ion3/HISTORY
	windowmanagers/kahakai/DEPENDS
	windowmanagers/kahakai/HISTORY
	windowmanagers/larswm/HISTORY
	windowmanagers/openbox/HISTORY
	windowmanagers/papuawm/DEPENDS
	windowmanagers/papuawm/HISTORY
	windowmanagers/pekwm/HISTORY
	windowmanagers/pwm/HISTORY
	windowmanagers/windowlab/HISTORY
	windowmanagers/windowmaker/HISTORY
	windowmanagers/wm2/HISTORY
	windowmanagers/wmi/DEPENDS
	windowmanagers/wmi/HISTORY
	windowmanagers/wmii/DEPENDS
	windowmanagers/wmii/HISTORY
	wm-addons/dzen2/HISTORY
	wm-addons/twin/HISTORY
	x11-libs/cairo/HISTORY
	x11-libs/dri/HISTORY
	x11-libs/wine/DEPENDS
	x11-libs/wine/HISTORY
	x11-toolkits/fltk/HISTORY
	x11-toolkits/fox/HISTORY
	x11-toolkits/gtk+2/HISTORY
	x11-toolkits/nucleo/HISTORY
	x11-toolkits/openmotif/DEPENDS
	x11-toolkits/openmotif/HISTORY
	x11-toolkits/qt4/HISTORY
	x11-toolkits/wxgtk/HISTORY
	x11/conky/HISTORY
	x11/fbpanel/HISTORY
	x11/gkrellm2/HISTORY
	x11/vnc/DEPENDS
	x11/vnc/HISTORY
	x11/xcompmgr/DEPENDS
	x11/xcompmgr/HISTORY
	x11/xdaliclock/HISTORY
	x11/xosview/HISTORY
	xfce/libxfce4mcs/DEPENDS
	xfce/libxfce4mcs/HISTORY
	xfce/xfce4-profile/DEPENDS
	xfce/xfce4-profile/HISTORY
	xfce/xfwm4/HISTORY

7 files changed, 20 insertions, 14 deletions

diff --git a/display/directfb/BUILD b/display/directfb/BUILD
index d12211af96..3db6c551f2 100755
--- a/display/directfb/BUILD
+++ b/display/directfb/BUILD
@@ -1,17 +1,9 @@
-if  [[  -f  /usr/include/linux/fusion.h  ]];  then
-  OPTS="$OPTS --enable-multi"
-fi  &&
-
 OPTS="--with-inputdrivers=$inputdrivers         \
       --with-gfxdrivers=$gfxdrivers             \
       $DFB_DEBUG $DFB_NETWORK $DFB_VOODOO       \
       $DFB_UNIQUE $DFB_V4L $DFB_V4L2 $DFB_TESTS \
       $OPTS"                                    &&
 
-#
-## Remove this after is_depends_enabled is integrated to stable sorcery.
-#
-source  "$GRIMOIRE/is_depends_enabled.function"  &&
 
 if is_depends_enabled $SPELL libmpeg3; then
      export CPPFLAGS="$CPPFLAGS -I/usr/include/libmpeg3/"
diff --git a/display/directfb/DEPENDS b/display/directfb/DEPENDS
index dbf0cb8998..e5f14d4f75 100755
--- a/display/directfb/DEPENDS
+++ b/display/directfb/DEPENDS
@@ -1,6 +1,11 @@
 depends  autoconf  &&
 depends  automake  &&
 
+optional_depends  linux-fusion                     \
+                  '--enable-multi'                 \
+                  '--enable-mutli=no'           \
+                  'build with support for multiple DFB applications?'  &&
+
 optional_depends  freetype2             \
                   '--enable-freetype'   \
                   '--disable-freetype'  \
diff --git a/display/directfb/DETAILS b/display/directfb/DETAILS
index 2e95a8baa9..545d2b9811 100755
--- a/display/directfb/DETAILS
+++ b/display/directfb/DETAILS
@@ -1,14 +1,13 @@
            SPELL=directfb
-         VERSION=1.0.0-rc1
+         VERSION=1.1.1
           SOURCE=DirectFB-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/DirectFB-$VERSION
    SOURCE_URL[0]=http://www.directfb.org/downloads/Core/$SOURCE
-      SOURCE_HASH=sha512:1fb193764bbe76f9d236b47bdffc700b57bfb612f5d68d01a4133bca2d4582a3aa10cfd56a645c04ba0fc095bfcd952ab31af6ce051bff7ca87cbe161589ad6d
+      SOURCE_HASH=sha512:a82793c5164f0379fad7662071c45bc350a44cc814462cf284cb65cf701ce6c4912570e4e7f34c1db62547a625bc57a907537032d0ea7b1bea946839c0ad9bc2
       LICENSE[0]=LGPL
         KEYWORDS="display"
         WEB_SITE=http://www.directfb.org/
          ENTERED=20030916
-         UPDATED=20031027
            SHORT="Graphics acceleration on Framebuffer Device"
 cat << EOF
 DirectFB is a thin library that provides hardware graphics acceleration, 
diff --git a/display/directfb/DirectFB-0.9.25.1.tar.gz.sig b/display/directfb/DirectFB-0.9.25.1.tar.gz.sig
deleted file mode 100644
index 03b91b6836..0000000000
--- a/display/directfb/DirectFB-0.9.25.1.tar.gz.sig
+++ /dev/null
diff --git a/display/directfb/HISTORY b/display/directfb/HISTORY
index c67854e4e0..d1f8200cdd 100644
--- a/display/directfb/HISTORY
+++ b/display/directfb/HISTORY
@@ -1,6 +1,13 @@
 2008-03-18 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Switch X11-SERVER to the one and only xorg-server
 
+2008-01-28 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* BUILD: removed is_depends_enabled.function reference
+
+2007-12-23 Arjan Bouter <abouter@sourcemage.org>
+	* DETAILS: version 1.1.1, switched to sha512sum
+	* PRE_BUILD: disabled regeneration of configure
+
 2007-09-23 Arjan Bouter <abouter@sourcemage.org>
 	* CONFIGURE: fixed typo
 	* DEPENDS: added warning for SDL, added libvncserver
diff --git a/display/directfb/PRE_BUILD b/display/directfb/PRE_BUILD
index 4379c98e21..d94b936d5a 100755
--- a/display/directfb/PRE_BUILD
+++ b/display/directfb/PRE_BUILD
@@ -1,8 +1,10 @@
 default_pre_build      &&
-cd  $SOURCE_DIRECTORY  &&
+cd  $SOURCE_DIRECTORY
 
 #
 # Remake configure so it doesn't "need" cpp
+# <abouter> True as that might be, configure.in is broken
+# and won't generate a working configure
 #
-aclocal   &&
-autoconf
+#aclocal   &&
+#autoconf
diff --git a/display/directfb/TRIGGERS b/display/directfb/TRIGGERS
new file mode 100755
index 0000000000..4ef87a964b
--- /dev/null
+++ b/display/directfb/TRIGGERS
@@ -0,0 +1 @@
+on_cast linux-fusion cast_self