diff --git a/audio-libs/dssi/PRE_SUB_DEPENDS b/audio-libs/dssi/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..b9d5357
--- /dev/null
+++ b/audio-libs/dssi/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ HOST) [[ $DSSI_HOST == y ]];;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/audio-libs/dssi/REPAIR^none^PRE_SUB_DEPENDS
b/audio-libs/dssi/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..b9d5357
--- /dev/null
+++ b/audio-libs/dssi/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ HOST) [[ $DSSI_HOST == y ]];;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/audio-libs/dssi/SUB_DEPENDS b/audio-libs/dssi/SUB_DEPENDS
new file mode 100755
index 0000000..608cd8e
--- /dev/null
+++ b/audio-libs/dssi/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ HOST) if [[ $DSSI_HOST != y ]]; then
+ message "Requested JACK/ALSA-sequencer plugin host, forcing option
DSSI_HOST=y" &&
+ DSSI_HOST=y
+ fi;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/audio-players/mpd/CONFIGURE b/audio-players/mpd/CONFIGURE
index 56105dc..6b59084 100755
--- a/audio-players/mpd/CONFIGURE
+++ b/audio-players/mpd/CONFIGURE
@@ -6,14 +6,34 @@ config_query_option MPD_OPTS "Enable writing to a FIFO?" y \
"--enable-fifo" \
"--disable-fifo" &&
-config_query_option MPD_OPTS "Enable writing to a pipe?" y \
+config_query_option MPD_OPTS "Enable support for clients connecting via
TCP?" y \
+ "--enable-tcp" \
+ "--disable-tcp" &&
+
+config_query_option MPD_OPTS "Enable support for clients connecting via unix
domain sockets?" y \
+ "--enable-un" \
+ "--disable-un" &&
+
+config_query_option MPD_OPTS "Enable writing to a pipe?" n \
"--enable-pipe-output" \
"--disable-pipe-output" &&
config_query_option MPD_OPTS "Enable HTTP server output?" y \
"--enable-httpd-output" \
- "--disable-httpd-output"
+ "--disable-httpd-output" &&
config_query_option MPD_OPTS "Enable recorder file output plugin?" n \
"--enable-recorder-output" \
- "--disable-recorder-output"
+ "--disable-recorder-output" &&
+
+config_query_option MPD_OPTS "Enable support for Hauppauge Media MVP?" n \
+ "--enable-mvp" \
+ "--disable-mvp" &&
+
+config_query_option MPD_OPTS "Enable support for Inotify automatic database
update?" y \
+ "--enable-inotify" \
+ "--disable-inotify" &&
+
+config_query_option MPD_OPTS "Enable debugging?" n \
+ "--enable-debug" \
+ "--disable-debug"
diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index ea248ac..fb04e3e 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -1,16 +1,17 @@
depends zlib &&
depends glib2 &&
+# TODO: missing libraries in grimoire:
+# - libroar (--enable-roar) for RoarAudio support
+# - libgme (--enable-gme) for Blargg's game music emulator plugin
+# - libiso9660 (--enable-iso9660) for iso9660 archive support
+# - despotify (--enable-despotify) for despotify (spotify.com) support
+
optional_depends libao \
"--enable-ao" \
"--disable-ao" \
"for libao support" &&