diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2005-04-14 13:33:48 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2005-04-14 13:33:48 +0000 |
| commit | d6fe82c0ac71747880918412f67c3a0ae730abdc (patch) | |
| tree | f4eec094f451483f82aeccf1ed574bfbc61893f0 /net-dialup/fritzcapi | |
| parent | Marked stable for bug #89064. (diff) | |
| download | gentoo-2-d6fe82c0ac71747880918412f67c3a0ae730abdc.tar.gz gentoo-2-d6fe82c0ac71747880918412f67c3a0ae730abdc.tar.bz2 gentoo-2-d6fe82c0ac71747880918412f67c3a0ae730abdc.zip | |
Fixes thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug 89023
(Portage version: 1.585-cvs)
Diffstat (limited to 'net-dialup/fritzcapi')
| -rw-r--r-- | net-dialup/fritzcapi/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild | 18 |
2 files changed, 16 insertions, 8 deletions
diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog index c7c406977164..58062689c04d 100644 --- a/net-dialup/fritzcapi/ChangeLog +++ b/net-dialup/fritzcapi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dialup/fritzcapi # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.12 2005/02/26 22:23:07 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.13 2005/04/14 13:33:48 genstef Exp $ + + 14 Apr 2005; Stefan Schweizer <genstef@gentoo.org> + fritzcapi-2.6.32.ebuild: + Fixes thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug 89023 26 Feb 2005; Stefan Schweizer <genstef@gentoo.org> fritzcapi-2.6.32.ebuild: diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild index 6f4743e9c67e..0201f22fac6d 100644 --- a/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild +++ b/net-dialup/fritzcapi/fritzcapi-2.6.32.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-dialup/fritzcapi/fritzcapi-2.6.32.ebuild,v 1.5 2005/02/27 17:59:43 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild,v 1.6 2005/04/14 13:33:48 genstef Exp $ inherit linux-mod rpm eutils @@ -30,9 +30,6 @@ FRITZCAPI_MODULES=("fcclassic" "fcpci" "fcpcmcia" "fcpnp" "fcusb" "fcusb2" FRITZCAPI_TARGETS=("fritz.classic" "fritz.pci" "fritz.pcmcia" "fritz.pnp" "fritz.usb" "fritz.usb2" "fritz.xusb_CZ" "fritz.xusb" "e2220pc" "e5520pc") -BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${WORKDIR}/var/lib/fritz" -BUILD_TARGETS="all" - get_card_module_name() { local CARD=$1 echo "${FRITZCAPI_MODULES[CARD]}(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)" @@ -51,6 +48,9 @@ pkg_setup() { die "For using the driver you need a kernel with enabled CAPI support." fi + BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${WORKDIR}/var/lib/fritz" + BUILD_TARGETS="all" + local USERCARD CARD FRITZCAPI_BUILD_CARDS="" FRITZCAPI_BUILD_TARGETS="" @@ -97,11 +97,11 @@ pkg_setup() { } src_unpack() { - rpm_unpack ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm - rpm_unpack ${DISTDIR}/capi4linux-2004.4.5-0.i586.rpm + rpm_unpack ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm || die "error unpacking ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm" + rpm_unpack ${DISTDIR}/capi4linux-2004.4.5-0.i586.rpm || die "error unpacking ${DISTDIR}/capi4linux-2004.4.5-0.i586.rpm" cd ${S} for ((CARD=0; CARD < ${#AVM_SRC[*]}; CARD++)); do - unpack ${AVM_FILES[CARD]}.tar.gz + unpack ${AVM_FILES[CARD]}.tar.gz || die "error unpacking ${AVM_FILES[CARD]}.tar.gz" CRD_NAME=${AVM_FILES[CARD]/-*} CRD_NAME=${CRD_NAME/fc} CRD_NAME=${CRD_NAME/f} @@ -113,6 +113,10 @@ src_unpack() { if kernel_is ge 2 6 10; then epatch ${FILESDIR}/${PN}-fix-for-2.6.10.patch fi + for i in $(find . -name Makefile); do + sed -i 's:-C \$(KDIR) SUBDIRS=:-C $(KDIR) $(if $(KBUILD_OUTPUT),O=$(KBUILD_OUTPUT)) SUBDIRS=:' ${i} + convert_to_m ${i} + done } src_install() { |