[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     5fdebd5d0c9b22a9e046fba384ddbd4c06587830
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Sun Oct  9 09:15:50 2016 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Oct  9 09:15:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=5fdebd5d

freebsd.eclass: freebsd 11.0 does not support NO_ variable.

 eclass/freebsd.eclass | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 8bab9af..5d4562a 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -228,18 +228,21 @@ freebsd_src_compile() {
        use profile && filter-flags "-fomit-frame-pointer"
        if version_is_at_least 11.0 ${RV} ; then
                if ! use profile ; then
-                       mymakeopts="${mymakeopts} MK_PROFILE=no "
+                       mymakeopts="${mymakeopts} WITHOUT_PROFILE= "
                fi
-               use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no "
+               use debug || mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= "
                # Test does not support yet.
-               mymakeopts="${mymakeopts} MK_TESTS=no "
+               mymakeopts="${mymakeopts} WITHOUT_TESTS= "
                # Force set SRCTOP.
                mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} "
+               # Set common option.
+               mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= 
WITHOUT_INFOCOMPRESS= "
        else
                use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+               mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
        fi
 
-       mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
+       mymakeopts="${mymakeopts} NO_FSCHG="
 
        # Make sure to use FreeBSD definitions while crosscompiling
        [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
@@ -300,18 +303,21 @@ freebsd_multilib_multibuild_wrapper() {
 freebsd_src_install() {
        if version_is_at_least 11.0 ${RV} ; then
                if ! use profile ; then
-                       mymakeopts="${mymakeopts} MK_PROFILE=no "
+                       mymakeopts="${mymakeopts} WITHOUT_PROFILE= "
                fi
-               use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no "
+               use debug || mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= "
                # Test does not support yet.
-               mymakeopts="${mymakeopts} MK_TESTS=no "
+               mymakeopts="${mymakeopts} WITHOUT_TESTS= "
                # Force set SRCTOP.
                mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} "
+               # Set common option.
+               mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= 
WITHOUT_INFOCOMPRESS= "
        else
                use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+               mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
        fi
 
-       mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
+       mymakeopts="${mymakeopts} NO_FSCHG="
 
        [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"