From 68ea76c1c765bccb3f0431c67cef57ca3bec4aec Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 22 Apr 2013 22:49:39 +0200 Subject: [PATCH] Convert wpa_suplicant-2.0 recipe to an actual recipe Also adjust the patch to use the correct private Haiku header directories. Doesn't build yet, since it requires newer Haiku API. --- .../patches/wpa_supplicant-2.0.patch | 6 +-- .../wpa_supplicant/wpa_supplicant-2.0.recipe | 51 ++++++++++++++----- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch b/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch index d2fa387d9..e6d7dea3b 100644 --- a/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch +++ b/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch @@ -829,9 +829,9 @@ index 0000000..7d73f13 +LIBS += -L/boot/common/lib + +# for private Haiku headers -+CFLAGS += -I/Source/haiku/git/haiku/src/libs/compat/freebsd_network/compat -+CFLAGS += -I/Source/haiku/git/haiku/src/libs/compat/freebsd_wlan -+CFLAGS += -I/Source/haiku/git/haiku/headers/private/net ++CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_network/compat ++CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_wlan ++CFLAGS += -I/system/develop/headers/private/net +CFLAGS += -Wno-multichar + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe index e99053fc4..e5f6fe587 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe @@ -1,19 +1,44 @@ -DESCRIPTION="A WPA Supplicant with support for WPA and WPA2." +SUMMARY="A WPA Supplicant with support for WPA and WPA2" +DESCRIPTION="wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both desktop/laptop computers and embedded systems. Supplicant is the IEEE 802.1X/WPA component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver." HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-2.0.tar.gz" CHECKSUM_MD5="3be2ebfdcced52e00eda0afe2889839d" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd wpa_supplicant-2.0/wpa_supplicant +LICENSE=" + BSD (2-clause) + GNU GPL v2 + " +COPYRIGHT="2003-2012 Jouni Malinen" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="wpa_supplicant-2.0.patch" + +PROVIDES=" + wpa_supplicant = $portVersion compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + openssl >= 1.0.0 + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:make + openssl >= 1.0.0 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName/wpa_supplicant" + +BUILD() +{ CFLAGS="-MMD -O2 -Wall" make wpa_supplicant } -INSTALL { - cd wpa_supplicant-2.0/wpa_supplicant - mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` - cp -v wpa_supplicant ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/ + +INSTALL() +{ + mkdir -p $binDir + cp -v wpa_supplicant $binDir } -LICENSE="BSD (2-clause) - GNU GPL v2" -COPYRIGHT="2003-2012 Jouni Malinen"