summaryrefslogtreecommitdiffstats
path: root/display/qingy
diff options
context:
space:
mode:
authorAndraž 'ruskie' Levstik2008-08-29 20:21:36 +0200
committerAndraž 'ruskie' Levstik2008-08-29 20:21:36 +0200
commit965ee38e98f3af7112736e38329722539964b562 (patch)
tree2093a1c99962a65e25ebd3d7e246530820e4dece /display/qingy
parent153a2159caca0f437e575ab5855a70edacdf8d1e (diff)
parent0b681af40bd832d8722e6d45b2f83aeda830ee3c (diff)
Merge branch 'master' into devel-xorg-modular
Conflicts: ChangeLog audio-soft/qjackctl/HISTORY display/qingy/DEPENDS editors/openoffice/HISTORY editors/vim/HISTORY gnome2-libs/libxklavier/DEPENDS gnome2-libs/libxklavier/HISTORY kde4-apps/dragonplayer/DEPENDS kde4-apps/dragonplayer/HISTORY kde4/KDE_DEPENDS kde4/kdebase4-runtime/DEPENDS php-pear/php/BUILD php-pear/php/DEPENDS php-pear/php4/HISTORY science/astrolog/DEPENDS science/astrolog/HISTORY shell-term-fm/mrxvt/HISTORY windowmanagers/blackbox/DEPENDS windowmanagers/blackbox/HISTORY wm-addons/bbkeys/HISTORY x11-libs/xfree86-devel/DEPENDS x11-libs/xfree86-devel/DETAILS x11-libs/xfree86-devel/HISTORY x11-libs/xfree86-devel/TRIGGERS x11-libs/xfree86/CONFLICTS x11-libs/xfree86/HISTORY x11-toolkits/fltk2/HISTORY x11/sunclock/DEPENDS x11/sunclock/HISTORY xfce/xfce4-profile/HISTORY xorg-lib/pixman/CONFLICTS
Diffstat (limited to 'display/qingy')
-rwxr-xr-xdisplay/qingy/DEPENDS16
-rw-r--r--display/qingy/HISTORY3
2 files changed, 18 insertions, 1 deletions
diff --git a/display/qingy/DEPENDS b/display/qingy/DEPENDS
index ce20b4d2be..29ef0bbe06 100755
--- a/display/qingy/DEPENDS
+++ b/display/qingy/DEPENDS
@@ -4,13 +4,27 @@ elif [[ "QINGY_CRYPTO" == 'libgcrypt' ]]; then
depends libgcrypt
fi &&
-depends directfb &&
+depends directfb &&
+# according to configure it _should_ be optional, but isn't
+# contacting the author about it...
+#optional_depends directfb
+# '--enable-directFB-support' \
+# '--disable-directFB-support' \
+# 'For DirectFB graphics' &&
optional_depends xorg-server \
'' \
'' \
'For X sessions' &&
+
+source $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_server
+then
+ depends libxscrnsaver
+fi &&
+
+
optional_depends gpm \
'--enable-gpm-lock' \
'--disable-gpm-lock' \
diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY
index ee7c4a2e39..979b4dc337 100644
--- a/display/qingy/HISTORY
+++ b/display/qingy/HISTORY
@@ -1,3 +1,6 @@
+2008-08-21 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: fix for xorg-modular, add option to disable x support at all
+
2008-07-13 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 0.9.7