diff --git a/gnome2-libs/dconf/HISTORY b/gnome2-libs/dconf/HISTORY
index 7c0fa3f..9fcf465 100644
--- a/gnome2-libs/dconf/HISTORY
+++ b/gnome2-libs/dconf/HISTORY
@@ -1,3 +1,6 @@
+2016-07-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: dropped vala -- not required for build
+
2014-11-23 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Use disable_pic function to fix CFLAGS
diff --git a/net/wpa_supplicant/DEPENDS b/net/wpa_supplicant/DEPENDS
index 3f4fd2c..b3b524a 100755
--- a/net/wpa_supplicant/DEPENDS
+++ b/net/wpa_supplicant/DEPENDS
@@ -30,6 +30,6 @@ if [[ $CONFIG_CTRL_IFACE != n ]]; then
fi &&
optional_depends dbus \
- CONFIG_CTRL_IFACE_DBUS \
+ "CONFIG_CTRL_IFACE_DBUS CONFIG_CTRL_IFACE_DBUS_NEW" \
"" \
"to enable D-Bus control interface"
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index e00931d..e7de6c3 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,6 @@
+2016-07-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, INSTALL: corrected dbus build flags and configs
+
2016-07-01 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply libressl.patch
* libressl.patch: added, backported from OpenBSD to fix build against
diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 6a0db9a..562f52f 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -13,14 +13,27 @@ if is_depends_enabled $SPELL qt4; then
fi &&
if is_depends_enabled $SPELL dbus; then
- install -vm 755 -d "$INSTALL_ROOT/usr/share/dbus-1/system-services" &&
+ local DBUS_CONFIG_DIR="$INSTALL_ROOT/etc/dbus-1/system.d" &&
+ local DBUS_SYSTEM_DIR="$INSTALL_ROOT/usr/share/dbus-1/system-services" &&
-
DBUS_FILE="$INSTALL_ROOT/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service"
&&
+ if [ ! -d "$DBUS_SYSTEM_DIR" ]; then
+ install -vm 755 -d "$DBUS_SYSTEM_DIR"
+ fi &&
+
+ if [ ! -d "$DBUS_CONFIG_DIR" ]; then
+ install -vm 755 -d "$DBUS_CONFIG_DIR"
+ fi &&
+
+ DBUS_FILE="$DBUS_SYSTEM_DIR/fi.epitest.hostap.WPASupplicant.service" &&
+ DBUS_FILE2="$DBUS_SYSTEM_DIR/fi.w1.wpa_supplicant1.service" &&