From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0CE7B1381F3 for ; Fri, 30 Aug 2013 18:30:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BEFD0E0E63; Fri, 30 Aug 2013 18:30:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D4CBE0E62 for ; Fri, 30 Aug 2013 18:30:28 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70FBF33EC4B for ; Fri, 30 Aug 2013 18:30:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 694B0E546A for ; Fri, 30 Aug 2013 18:30:20 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1377885173.7aff4d7ada6a697ed792bff248f720d703a726a1.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: eclass/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: eclass/freebsd.eclass X-VCS-Directories: eclass/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 7aff4d7ada6a697ed792bff248f720d703a726a1 X-VCS-Branch: master Date: Fri, 30 Aug 2013 18:30:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0c445815-0e76-4893-a7d4-2107e8c7d60e X-Archives-Hash: 6ea9a9b1c7b7fb3ea6955c93a31a7779 commit: 7aff4d7ada6a697ed792bff248f720d703a726a1 Author: Yuta SATOH gentoo gr jp> AuthorDate: Fri Aug 30 17:52:53 2013 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Fri Aug 30 17:52:53 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=7aff4d7a freebsd.eclass: Changed to use to force /usr/share/mk on FreeBSD 10.0. --- eclass/freebsd.eclass | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index ea6b21a..aa5911d 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -132,6 +132,13 @@ freebsd_src_unpack() { else unpack ${A} fi + + # When share/mk exists in ${WORKDIR}, it is used on FreeBSD 10.0. + # I would enable the code until I find a better solution. + if [[ ${PV} == 9999 ]] && [[ ${PN} != freebsd-mk-defs ]]; then + [[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk + fi + cd "${S}" dummy_mk ${REMOVE_SUBDIRS}