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 7A4691381FA for ; Mon, 31 Dec 2012 10:04:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33A3D21C01F; Mon, 31 Dec 2012 10:04:14 +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 A368021C01F for ; Mon, 31 Dec 2012 10:04:13 +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 BA756335E30 for ; Mon, 31 Dec 2012 10:04:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5948EE543D for ; Mon, 31 Dec 2012 10:04:11 +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: <1356948240.b7f8fccbbd9ed486e3044f57df544289a22bc386.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: b7f8fccbbd9ed486e3044f57df544289a22bc386 X-VCS-Branch: master Date: Mon, 31 Dec 2012 10:04:11 +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: c50fec95-6db5-45aa-bdb0-c25bd81e8638 X-Archives-Hash: c4323475a7359935fa82da24887e638b commit: b7f8fccbbd9ed486e3044f57df544289a22bc386 Author: Yuta SATOH gentoo gr jp> AuthorDate: Mon Dec 31 10:04:00 2012 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Mon Dec 31 10:04:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=b7f8fccb freebsd.eclass: fixed a conditional branch, support -head --- eclass/freebsd.eclass | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index 0c6b444..8603712 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -29,18 +29,20 @@ CDDL="freebsd-cddl-${PV}" # Release version (5.3, 5.4, 6.0, etc) RV="$(get_version_component_range 1-2)" -if [ "${PV%.9999}" != "${PV}" ]; then +if [[ ${PV} == *9999* ]]; then inherit subversion - if [[ "${PV%.9999}" == *\.* ]]; then - ESVN_REPO_URI="svn://svn.freebsd.org/base/releng/${PV%.9999}" - ESVN_PROJECT="freebsd-releng" + if [ "${PV%.9999}" != "${PV}" ]; then + if [[ "${PV%.9999}" == *\.* ]]; then + ESVN_REPO_URI="svn://svn.freebsd.org/base/releng/${PV%.9999}" + ESVN_PROJECT="freebsd-releng" + else + ESVN_REPO_URI="svn://svn.freebsd.org/base/stable/${PV%.9999}" + ESVN_PROJECT="freebsd-stable" + fi else - ESVN_REPO_URI="svn://svn.freebsd.org/base/stable/${PV%.9999}" - ESVN_PROJECT="freebsd-stable" + ESVN_REPO_URI="svn://svn.freebsd.org/base/head" + ESVN_PROJECT="freebsd-head" fi -else - ESVN_REPO_URI="svn://svn.freebsd.org/base/head" - ESVN_PROJECT="freebsd-head" fi if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then