SOURCE_HASH=sha512:9b4e2a0a36ca1dfc247393c5765a3461ed1341a5a008d5d50aaec1db9ca4742a83fb4f37a9685281b37924a47071460a6b0388fc9c71aa0e18a7445296c02d4c
+else
+ VERSION=0.5.7
+
SOURCE_HASH=sha512:e4cbde18d749bbeaa3c64801c74fa7cd95266b6b980387c6258e6d5d7e85a039b9a35fdc0e9ceb4c00393f943ecc3a571c55419e45cbcbc3f1cc7b59c8614a4f
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 544e820..0a8b1f0 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,12 @@
+2007-01-03 Juuso Alasuutari <iuso AT sourcemage.org>
+ * INSTALL: Install example config file to /usr/share/wpa_supplicant/
+ (this is not the same as the default config file).
+ * wpa_supplicant.conf: Changed help info to mention example config.
+ * PREPARE, DETAILS, CONFIGURE, DEPENDS, PRE_BUILD, BUILD: New
+ stable is 0.5.7, previous stable 0.4.9 becomes old, devel not
+ available yet.
+ * CONFIGURE: Added cross-version var compatibility code.
+
2006-12-23 Juuso Alasuutari <iuso AT sourcemage.org>
* CONFIGURE: Added query for making config file optional.
* INSTALL: Only install config file if selected or if init
diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 188369c..bf3fdba 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -3,6 +3,9 @@ make DESTDIR="$INSTALL_ROOT" install &&
cp doc/docbook/*.8 "$INSTALL_ROOT/usr/share/man/man8/" &&
cp doc/docbook/*.5 "$INSTALL_ROOT/usr/share/man/man5/" &&
+mkdir -p "$INSTALL_ROOT/usr/share/wpa_supplicant/" &&
+cp wpa_supplicant.conf "$INSTALL_ROOT/usr/share/wpa_supplicant/" &&
+
if is_depends_enabled $SPELL qt-x11
then
cp wpa_gui/wpa_gui "$INSTALL_ROOT/usr/sbin/"
diff --git a/net/wpa_supplicant/PREPARE b/net/wpa_supplicant/PREPARE
index 5366138..bbc2636 100755
--- a/net/wpa_supplicant/PREPARE
+++ b/net/wpa_supplicant/PREPARE
@@ -1,4 +1,14 @@
+# devel version was removed, stable is now latest
+if [[ $WPA_RELEASE == devel ]]
+then
+ WPA_RELEASE=stable &&
+ persistent_add WPA_RELEASE
+fi &&
+
+message "${MESSAGE_COLOR}Latest stable is 0.5.7, latest old is 0.4.9." \
+ "${DEFAULT_COLOR}" &&
+
config_query_list WPA_RELEASE \
"Select which release to build:" \
stable \
- devel
+ old
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index 3bc919a..8149cb2 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -4,7 +4,7 @@ cd "$SOURCE_DIRECTORY" &&
sed -i "s|/local||g" Makefile &&
# Dynamic EAP target borks install.
-if [[ $WPA_RELEASE == devel ]]
+if [[ $WPA_RELEASE != old ]]
then
sed -i "s/wpa_cli dynamic_eap_methods/wpa_cli/" Makefile
fi
diff --git a/net/wpa_supplicant/wpa_supplicant.conf
b/net/wpa_supplicant/wpa_supplicant.conf
index 6201004..25bea70 100644
--- a/net/wpa_supplicant/wpa_supplicant.conf
+++ b/net/wpa_supplicant/wpa_supplicant.conf
@@ -1,7 +1,7 @@
#
# wpa_supplicant default config for Source Mage GNU/Linux.
#
-# See 'man wpa_supplicant.conf' for more info.
+# See /usr/share/wpa_supplicant/wpa_supplicant.conf for more info.
#
# Control interface
[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (e53542c25f035d5a0db5d6c4d1dedf235db9f46e),
Juuso Alasuutari, 01/03/2007