From eff9bf3cef302c87784f718756ea334729dad723 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Sat, 21 Apr 2007 12:28:43 +0000 Subject: [PATCH] Add support for 7.0 upcoming release Fix header --- eclass/freebsd.eclass | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index 1806eaa4442d..8b1974ace33f 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.12 2007/04/07 08:52:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.13 2007/04/21 12:28:43 drizzt Exp $ # # Diego Pettenò @@ -54,22 +54,22 @@ freebsd_get_bmake() { bmake=$(get_bmake) [[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd" - echo ${bmake} + echo "${bmake}" } freebsd_do_patches() { for patch in ${PATCHES}; do - epatch ${patch} + epatch "${patch}" done } freebsd_rename_libraries() { ebegin "Renaming libraries" # We don't use libtermcap, we use libncurses - find ${S} -name Makefile -print0 | xargs -0 \ + find "${S}" -name Makefile -print0 | xargs -0 \ sed -i -e 's:-ltermcap:-lncurses:g; s:{LIBTERMCAP}:{LIBNCURSES}:g' # flex provides libfl, not libl - find ${S} -name Makefile -print0 | xargs -0 \ + find "${S}" -name Makefile -print0 | xargs -0 \ sed -i -e 's:-ll:-lfl:g; s:{LIBL}:{LIBFL}:g' eend $? @@ -77,7 +77,7 @@ freebsd_rename_libraries() { freebsd_src_unpack() { unpack ${A} - cd ${S} + cd "${S}" dummy_mk ${REMOVE_SUBDIRS} @@ -90,16 +90,16 @@ freebsd_src_compile() { use profile || \ case "${RV}" in 5.*) mymakeopts="${mymakeopts} NOPROFILE= " ;; - 6.*) mymakeopts="${mymakeopts} NO_PROFILE= " ;; + 6.*|7.*) mymakeopts="${mymakeopts} NO_PROFILE= " ;; esac mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS=" # Many things breaks when using ricer flags here - [[ -z ${NOFLAGSTRIP} ]] && strip-flags + [[ -z "${NOFLAGSTRIP}" ]] && strip-flags # Make sure to use FreeBSD definitions while crosscompiling - [[ -z ${BMAKE} ]] && BMAKE="$(freebsd_get_bmake)" + [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)" bsdmk_src_compile } @@ -108,12 +108,12 @@ freebsd_src_install() { use profile || \ case "${RV}" in 5.*) mymakeopts="${mymakeopts} NOPROFILE= " ;; - 6.*) mymakeopts="${mymakeopts} NO_PROFILE= " ;; + 6.*|7.*) mymakeopts="${mymakeopts} NO_PROFILE= " ;; esac mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS=" - [[ -z ${BMAKE} ]] && BMAKE="$(freebsd_get_bmake)" + [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)" bsdmk_src_install } -- 2.26.2