Use userspecified LDFLAGS,CFLAGS, use make install

Package-Manager: portage-2.0.53_rc7

diff --git a/net-wireless/madwifi-tools/ChangeLog b/net-wireless/madwifi-tools/ChangeLog
index 604b0df7a87e8406ffe459690eabf5a240a562e7..3840a5317a86c4c7c98d1f478593bf689677df41 100644 (file)
--- a/net-wireless/madwifi-tools/ChangeLog
+++ b/net-wireless/madwifi-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/madwifi-tools
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/ChangeLog,v 1.9 2005/11/12 22:22:23 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/ChangeLog,v 1.10 2005/11/12 22:51:57 genstef Exp $
+
+  12 Nov 2005; Stefan Schweizer <genstef@gentoo.org>
+  madwifi-tools-0.1_pre20051031.ebuild:
+  Use userspecified LDFLAGS,CFLAGS, use make install
 
   12 Nov 2005; Peter Johanson <latexer@gentoo.org>
   madwifi-tools-0.1_pre20051031.ebuild:

diff --git a/net-wireless/madwifi-tools/Manifest b/net-wireless/madwifi-tools/Manifest
index d24b2670e63fa21b6a11f06ea217dd6e56cda79e..0845d8537dfa4a0c36c2e0dbdbf0ac165151bb2c 100644 (file)
--- a/net-wireless/madwifi-tools/Manifest
+++ b/net-wireless/madwifi-tools/Manifest
@@ -1,10 +1,10 @@
-MD5 9d629aa5f12d0a1227a153c1ff980de8 madwifi-tools-0.1_pre20050106.ebuild 1194
-MD5 4cf0f5b3be0b9c55e7fc6851a0443973 madwifi-tools-0.1_pre20050107.ebuild 894
-MD5 e05ad0ad30eb76ebe19bfbe78bd14340 ChangeLog 1812
-MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
-MD5 b51ffccefc25227db9e0af7033042b3d madwifi-tools-0.1_pre20050420.ebuild 883
-MD5 02e33ae2d7c64b44911106ddc4b73c5c madwifi-tools-0.1_pre20051031.ebuild 935
+MD5 0593a7cea8bdbf5a167bcfc7f9b2596f ChangeLog 1960
 MD5 07d3f62f481b9725f606d77cd023edd5 files/digest-madwifi-tools-0.1_pre20050106 84
 MD5 283e94543234c3f396d65824fbcccb32 files/digest-madwifi-tools-0.1_pre20050107 85
 MD5 d4937e6f87128084a32ef792ddbccc6e files/digest-madwifi-tools-0.1_pre20050420 85
 MD5 f14c460ff95aa3e3ad0f065c5e5d8aa3 files/digest-madwifi-tools-0.1_pre20051031 81
+MD5 9d629aa5f12d0a1227a153c1ff980de8 madwifi-tools-0.1_pre20050106.ebuild 1194
+MD5 4cf0f5b3be0b9c55e7fc6851a0443973 madwifi-tools-0.1_pre20050107.ebuild 894
+MD5 b51ffccefc25227db9e0af7033042b3d madwifi-tools-0.1_pre20050420.ebuild 883
+MD5 8ff89245a4ae8a6b3925df1ed08d0fac madwifi-tools-0.1_pre20051031.ebuild 977
+MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159

diff --git a/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20051031.ebuild b/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20051031.ebuild
index c567c6030881654103960b645fdcbb4dccc4c5fb..12da9577ed6c14d103b98e4cfb8adf2f5afe1a6e 100644 (file)
--- a/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20051031.ebuild
+++ b/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20051031.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20051031.ebuild,v 1.2 2005/11/12 22:22:23 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-tools/madwifi-tools-0.1_pre20051031.ebuild,v 1.3 2005/11/12 22:51:57 genstef Exp $
 
 MADWIFI_SVN_REV="1227"
 DESCRIPTION="Wireless tools for Atheros chipset a/b/g cards"
@@ -14,19 +14,16 @@ DEPEND="virtual/libc"
 
 S=${WORKDIR}/madwifi-trunk-r${MADWIFI_SVN_REV}-${PV:7:8}/tools
 
-pkg_setup() {
-       use x86 && TARGET=i386-elf
-       use amd64 && TARGET=x86_64-elf
-       export TARGET
-}
-
 src_unpack() {
        unpack ${A}
        cd ${S}
-       sed -i -e 's/err(1, ifr.ifr_name);/err(1, "%s", ifr.ifr_name);'/g ${S}/athstats.c
+       sed -i 's:err(1, ifr.ifr_name);:err(1, "%s", ifr.ifr_name);:g' athstats.c || die
+       sed -i "s:CFLAGS=:CFLAGS+=:" Makefile
+       sed -i "s:LDFLAGS=:LDFLAGS+=:" Makefile
 }
 
 src_install() {
-       dobin 80211debug 80211stats athchans athctrl athdebug athkey athstats
-       dosbin wlanconfig
+       make install DESTDIR=${D} BINDIR=/usr/bin MANDIR=/usr/share/man || die "make install failed"
+       dodir /sbin
+       mv ${D}/usr/bin/wlanconfig ${D}/sbin
 }