New commits:
commit 23ac9e75803b913ff83148845dac2e7031326528
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
xfwm4: fixed xorg-modular check
commit 702c2b0205e560060dc9272f74518fcfcfad9f94
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
tightvnc: fixed xorg-modular check
commit 274cb5203b450418f73297871ae286067cf55b10
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
xaw3d: fixed xorg-modular check
commit 3ff138bcffacfbeab895fad4bced94545cb0a19e
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
scim: fixed xorg-modular check
commit f18c64ead3ff050d05f95fbff20d1ffe5efc3bde
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
iiimf-canna: fixed xorg-modular check
commit 56eda52f188aca7b9c6d6e720c794177ae98ab68
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
ami: fixed xorg-modular check
commit 87e56c2c1d355751315654e0c76c21570c374fef
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
xulrunner: fixed xorg-modular check
commit 3fa216300e120a115fadc83fda17d0babc6ad587
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
tgif: fixed xorg-modular check
commit c8849ee52a695e13ef6306e5c3a4279366e6b389
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
imagemagick: fixed xorg-modular check
commit 123c408ee74a6b5782ffc7444f8bdcf1d29f1c66
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
freewrl: fixed xorg-modular check
commit 9089e7c0db18db300fc5793521234bd4ed536a7d
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
gdm2: fixed xorg-modular check
commit 40d1bbbf1b5609be2a847c60e421f41423d67f69
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
transfig: fixed xorg-modular check
commit f4b3f76234805745dc97e62ad21ddd8a197a3e69
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
e17: fixed xorg-modular check
commit 0954fcc7f756bf4e70024b4199402c4390f6d041
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
-if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
depends imake
fi
diff --git a/editors/transfig/HISTORY b/editors/transfig/HISTORY
index 641cb1f..e436853 100644
--- a/editors/transfig/HISTORY
+++ b/editors/transfig/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-08-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, BUILD: updated to 3.2.5
* transfig.patch: removed
diff --git a/gnome2-libs/gdm2/DEPENDS b/gnome2-libs/gdm2/DEPENDS
index 2504e92..e4e7631 100755
--- a/gnome2-libs/gdm2/DEPENDS
+++ b/gnome2-libs/gdm2/DEPENDS
@@ -4,7 +4,8 @@ depends librsvg2 &&
depends rarian &&
depends gnome-doc-utils &&
-if [ "$(get_spell_provider gtk+2 X11-LIBS)" == "xorg-server" ]; then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs gtk+2; then
optional_depends sessreg '' '' 'for wtmp/utmp updating'
fi &&
diff --git a/gnome2-libs/gdm2/HISTORY b/gnome2-libs/gdm2/HISTORY
index c291aa1..82aef7f 100644
--- a/gnome2-libs/gdm2/HISTORY
+++ b/gnome2-libs/gdm2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-09-20 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0
* DEPENDS: changed scrollkeeper to rarian
diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index 83eaa52..e0eb408 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -4,7 +4,8 @@ depends automake &&
depends glib2 &&
depends cairo &&
-if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
depends libxft &&
depends libxrender
fi &&
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 2cfff31..838bd29 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,7 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: use check_if_xorg_modular_libs so it works with xorg-libs
+ as X11 provider
+
2007-09-19 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.18.2
if [ "$FREEWRL_PLUGIN" == "y" ]; then
diff --git a/graphics/freewrl/HISTORY b/graphics/freewrl/HISTORY
index 64e1cb5..4a6a41c 100644
--- a/graphics/freewrl/HISTORY
+++ b/graphics/freewrl/HISTORY
@@ -1,3 +1,7 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: depend on X11-SERVER and additionally on xterm if using
+ -modular
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/graphics/imagemagick/DEPENDS b/graphics/imagemagick/DEPENDS
index bc1a57c..abffaf7 100755
--- a/graphics/imagemagick/DEPENDS
+++ b/graphics/imagemagick/DEPENDS
@@ -21,7 +21,8 @@ optional_depends X11-LIBS
\
"" \
"To support X display and auto some other dependecies" &&
-if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
depends libxrender
fi &&
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 71a7152..b34c3ba 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-09-22 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 6.3.5-10
-if [ "$(get_spell_provider $SPELL X11-SERVER)" == "xorg-server" ];
then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
depends gccmakedep &&
depends imake
fi
diff --git a/x11/tightvnc/HISTORY b/x11/tightvnc/HISTORY
index 875489f..5caab98 100755
--- a/x11/tightvnc/HISTORY
+++ b/x11/tightvnc/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-05-09 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated devel and stable to 1.3.9.
* BUILD: Removed uneeded patches. Fixed Upstream
diff --git a/xfce/xfwm4/DEPENDS b/xfce/xfwm4/DEPENDS
index c8e0753..aec5d45 100755
--- a/xfce/xfwm4/DEPENDS
+++ b/xfce/xfwm4/DEPENDS
@@ -4,7 +4,7 @@ if [ "$COMPOSITOR" = "y" ]; then
depends XDAMAGE "--enable-compositor"
fi &&
-if [ "$(get_spell_provider $SPELL XDAMAGE)" == "xorg-server" ]; then
+if [ "$(get_spell_provider $SPELL XDAMAGE)" == "libxdamage" ]; then
depends libxrender
fi &&
diff --git a/xfce/xfwm4/HISTORY b/xfce/xfwm4/HISTORY
index b03119b..4e013bd 100644
--- a/xfce/xfwm4/HISTORY
+++ b/xfce/xfwm4/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: provider for XDAMAGE is libxdamage, not xorg-server
+
2007-05-06 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: added libxrandr as optional if xorg is modular for gtk+2
[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (23ac9e75803b913ff83148845dac2e7031326528),
Arwed von Merkatz, 09/30/2007