diff --git a/net/wireless/wpa_supplicant/wpa_supplicant.confd b/net/wireless/wpa_supplicant/wpa_supplicant.confd
index 56a6c11b..97859bb6 100644
--- a/net/wireless/wpa_supplicant/wpa_supplicant.confd
+++ b/net/wireless/wpa_supplicant/wpa_supplicant.confd
@@ -1,10 +1,11 @@
 # conf.d file for wpa_supplicant
-#
+
+# uncomment this if wpa_supplicant starts up before your network interface
+# is ready and it causes issues
+# rc_want="dev-settle"
+
 # Please check man 8 wpa_supplicant for more information about the options
 # wpa_supplicant accepts.
+#
 wpa_supplicant_args=""
 
-# The dbus interface will be enabled by default if wpa_supplicant.conf is
-# missing. use wpa_supplicant_dbus to explicitly enable/disable dbus interface
-
-#wpa_supplicant_dbus=no
diff --git a/net/wireless/wpa_supplicant/wpa_supplicant.initd b/net/wireless/wpa_supplicant/wpa_supplicant.initd
index c1a4834d..362d1f5f 100644
--- a/net/wireless/wpa_supplicant/wpa_supplicant.initd
+++ b/net/wireless/wpa_supplicant/wpa_supplicant.initd
@@ -1,38 +1,54 @@
 #!/sbin/openrc-run
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
-supervisor=supervise-daemon
 
-name="WPA Supplicant"
-description="Wi-Fi Protected Access client and IEEE 802.1X supplicant"
-
-command=/sbin/wpa_supplicant
+command=/usr/sbin/wpa_supplicant
+: ${wpa_supplicant_conf:=/etc/wpa_supplicant/wpa_supplicant.conf}
 wpa_supplicant_if=${wpa_supplicant_if:+-i}$wpa_supplicant_if
-command_args="$wpa_supplicant_args $wpa_supplicant_if"
+command_args="$wpa_supplicant_args -B -c$wpa_supplicant_conf $wpa_supplicant_if"
+name="WPA Supplicant Daemon"
 
-default_conf=/etc/wpa_supplicant/wpa_supplicant.conf
-
-depend() {
+depend()
+{
 	need localmount
-	use logger dbus
-	after bootmisc modules entropy udev-settle
+	use logger
+	after bootmisc modules
 	before dns dhcpcd net
 	keyword -shutdown
 }
 
-find_wireless() {
+find_wireless()
+{
 	local iface=
-	for iface in /sys/class/net/*; do
-		if [ -e "$iface"/wireless -o -e "$iface"/phy80211 ]; then
-			echo "${iface##*/}"
-			return 0
-		fi
-	done
 
+	case "$RC_UNAME" in
+	Linux)
+		for iface in /sys/class/net/*; do
+			if [ -e "$iface"/wireless -o \
+				-e "$iface"/phy80211 ]
+			then
+				echo "${iface##*/}"
+				return 0
+			fi
+		done
+		;;
+	*)
+		for iface in /dev/net/* $(ifconfig -l 2>/dev/null); do
+			if ifconfig "${iface##*/}" 2>/dev/null | \
+				grep -q "[ ]*ssid "
+			then
+				echo "${iface##*/}"
+				return 0
+			fi
+		done
+		;;
+	esac
+	
 	return 1
 }
 
-append_wireless() {
+append_wireless()
+{
 	local iface= i=
 
 	iface=$(find_wireless)
@@ -45,35 +61,11 @@ append_wireless() {
 	fi
 }
 
-start_pre() {
+start_pre()
+{
 	case " $command_args" in
 	*" -i"*) ;;
 	*) append_wireless;;
 	esac
-
-	# set default conf if dbus is explicitly disabled
-	if [ -n "${wpa_supplicant_dbus}" ] && ! yesno "${wpa_supplicant_dbus}"; then
-		: ${wpa_supplicant_conf:=${default_conf}}
-	fi
-
-	# use default conf if it exists
-	if [ -f "${default_conf}" ]; then
-		: ${wpa_supplicant_conf:=${default_conf}}
-	fi
-
-	# enable default dbus if we still dont have a config
-	if [ -z "${wpa_supplicant_conf}" ]; then
-		: ${wpa_supplicant_dbus:=yes}
-	else
-		command_args="${command_args} -c$wpa_supplicant_conf"
-	fi
-	case " ${command_args}" in
-	*" -u"*);;
-	*)	if yesno "{wpa_supplicant_dbus}"; then
-			command_args="-u ${command_args}"
-		fi
-		;;
-	esac
-
-    checkpath -d -m 0755 -o root:root /var/run/wpa_supplicant
 }
+
diff --git a/x11/libs/cairo/ympbuild b/x11/libs/cairo/ympbuild
index 70b526b3..9cd255f4 100644
--- a/x11/libs/cairo/ympbuild
+++ b/x11/libs/cairo/ympbuild
@@ -8,7 +8,7 @@ email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
 source=("https://gitlab.freedesktop.org/cairo/cairo/-/archive/$version/cairo-$version.tar.gz")
-depends=(pixman libpng glib libpcre2 cairo)
+depends=(pixman libpng glib libpcre2)
 makedepends=()
 md5sums=('bbea11bcc63e465e58aa054b56350b04')
 group=(x11.libs)