From 86fdf07e11b6d6eb9be98874a60da6500b14ebb4 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Thu, 22 Sep 2016 09:30:58 +0200
Subject: [PATCH] Cosmetics

---
 satellites/broadcom-wl.sat                |  6 +++---
 satellites/functions/compile/configure.sh |  4 ++--
 satellites/hostapd.sat                    | 13 ++++++++++++-
 satellites/nxengine.sat                   |  4 ++--
 satellites/qt5-base.sat                   |  2 +-
 satellites/wine.sat                       |  2 +-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/satellites/broadcom-wl.sat b/satellites/broadcom-wl.sat
index dd8ab69..1864b73 100644
--- a/satellites/broadcom-wl.sat
+++ b/satellites/broadcom-wl.sat
@@ -2,7 +2,7 @@ name=broadcom-wl
 version=6_30_223_271
 update_url="https://aur.archlinux.org/packages/$name-dkms/"
 
-define_option "kver=$(uname -r): The kernel version we're building for."
+define_option "kver=$(uname -r): The kernel version we're building for"
 
 dlextract "http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-$version.tar.gz" \
           '115903050c41d466161784d4c843f4f9'
@@ -23,7 +23,7 @@ patch -p1 -i 001-null-pointer-fix.patch
 patch -p1 -i 002-rdtscl.patch
 patch -p1 -i 003-linux47.patch
 make KBUILD_DIR="$dir_sysroot/lib/modules/$kver/build"
-install -Dm 644 "wl.ko" "$dir_install/lib/modules/$kver/kernel/drivers/net/wireless/wl.ko"
-install -Dm 644 "$name-dkms.conf" "$dir_install/etc/modprobe.d/$name.conf"
+install -Dm644 -t "$dir_install/lib/modules/$kver/kernel/drivers/net/wireless" wl.ko
+install -Dm644 "$name-dkms.conf" "$dir_install/$dir_sysconfdir/modprobe.d/$name.conf"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/functions/compile/configure.sh b/satellites/functions/compile/configure.sh
index 9454130..d19aff2 100644
--- a/satellites/functions/compile/configure.sh
+++ b/satellites/functions/compile/configure.sh
@@ -1,5 +1,5 @@
-define_option 'cross=: Cross compile a program to run on the specified target triplet.'
-define_option "build=: Explicity specify the host machine's target triplet."
+define_option 'cross=: Cross compile a program to run on the specified target triplet'
+define_option "build=: Explicity specify the host machine's target triplet"
 
 compile_configure() {
     local builddir=""
diff --git a/satellites/hostapd.sat b/satellites/hostapd.sat
index 676ade7..094f5b6 100644
--- a/satellites/hostapd.sat
+++ b/satellites/hostapd.sat
@@ -2,12 +2,23 @@ name=hostapd
 version=2.5
 update_url="http://w1.fi/$name/"
 
+define_option '!rtlxdrv: Build with support for RTL8188{C|CU|CUS} wifi chips'
+
 dlextract "http://w1.fi/releases/$name-$version.tar.gz" \
           '69f9cec3f76d74f402864a43e4f8624f'
+
+if option rtlxdrv; then
+    dlfile 'https://raw.githubusercontent.com/pritambaral/hostapd-rtl871xdrv/547005ed466bbd632cff87b706e339874025acb0/rtlxdrv.patch' \
+           'ca8697f0254e3444f1e3758100c4f949'
+fi
 header_end
 
-cd "$name-$version/$name"
+cd "$name-$version"
+option rtlxdrv patch -p1 -i ../rtlxdrv.patch
+
+cd "$name"
 cp defconfig .config
+option rtlxdrv echo CONFIG_DRIVER_RTW=y >> .config
 make
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name" "${name}_cli"
 
diff --git a/satellites/nxengine.sat b/satellites/nxengine.sat
index 76bc924..d663faf 100644
--- a/satellites/nxengine.sat
+++ b/satellites/nxengine.sat
@@ -2,8 +2,8 @@ name=nxengine
 version=1006
 update_url='http://nxengine.sourceforge.net/'
 
-define_option 'dir_runtime=$HOME/.nxengine: The directory used to store the nxengine configuration and save files.'
-define_option 'console_key=`: The key used to access the debug console.'
+define_option 'dir_runtime=$HOME/.nxengine: The directory used to store the nxengine configuration and save files'
+define_option 'console_key=`: The key used to access the debug console'
 
 dlextract "http://nxengine.sourceforge.net/dl/nx-src-$version.tar.bz2" \
           'cc0d1f5608bba70df86a6f5a3b4dd3bd'
diff --git a/satellites/qt5-base.sat b/satellites/qt5-base.sat
index fe98403..cbae1a5 100644
--- a/satellites/qt5-base.sat
+++ b/satellites/qt5-base.sat
@@ -7,7 +7,7 @@ update_names="qt-everywhere-opensource-src-$version.tar.gz"
 
 optional_libraries='libpng libjpeg freetype harfbuzz'
 for opt in $optional_libraries; do
-    define_option "$opt: Enable support for $opt."
+    define_option "$opt: Enable support for $opt"
 done
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \
diff --git a/satellites/wine.sat b/satellites/wine.sat
index a8768bd..275a67e 100644
--- a/satellites/wine.sat
+++ b/satellites/wine.sat
@@ -6,7 +6,7 @@ version=$majver.19
 update_url='https://www.winehq.org/'
 update_names="/announce/$version\""
 
-define_option 'wine32=: On x86_64, enable 32bit wine support. Specify the 32bit libdir here.'
+define_option 'wine32=: On x86_64, enable 32bit wine support. Specify the 32bit libdir here'
 
 dlextract "http://dl.winehq.org/$name/source/$majver/$name-$version.tar.bz2" \
           'd9d3794d7394b9a22f7514d63f3a95f1'