diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf b/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf deleted file mode 100644 index ffec7f0b06..0000000000 --- a/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf +++ /dev/null @@ -1,3 +0,0 @@ -WPA_INTERFACE=wlan0 -# Log to syslog by default -OPTS="-s" diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run b/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run deleted file mode 100755 index 5cd1491329..0000000000 --- a/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -install -d -m0750 -o root -g wheel /var/log/wpa_supplicant -echo "Logging to /var/log/wpa_supplicant/current" -exec chpst -u root:daemon svlogd -t /var/log/wpa_supplicant diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/run b/srcpkgs/wpa_supplicant/files/wpa_supplicant/run index 82f3c6479a..2e043a0cdd 100755 --- a/srcpkgs/wpa_supplicant/files/wpa_supplicant/run +++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/run @@ -1,5 +1,4 @@ #!/bin/sh [ -r ./conf ] && . ./conf -: ${WPA_INTERFACE:=wlan0} exec 2>&1 -exec wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -i ${WPA_INTERFACE} ${OPTS} +exec wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -i ${WPA_INTERFACE:=wlan0} ${OPTS:=-s} diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index a9c716eb25..c14253b222 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,7 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=2.5 -revision=1 +revision=2 build_wrksrc=$pkgname short_desc="WPA/WPA2/IEEE 802.1X Supplicant" maintainer="Juan RP " @@ -12,7 +12,7 @@ checksum=cce55bae483b364eae55c35ba567c279be442ed8bab5b80a3c7fb0d057b9b316 hostmakedepends="pkg-config" makedepends="libnl3-devel libressl-devel dbus-devel readline-devel" -conf_files="/etc/sv/wpa_supplicant/conf /etc/sv/wpa_supplicant/log/run /etc/${pkgname}/${pkgname}.conf" +conf_files="/etc/${pkgname}/${pkgname}.conf" pre_build() { sed -i 's|/usr/local|$(PREFIX)|g' Makefile