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 E777B1388E4 for ; Thu, 7 Feb 2013 15:48:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C759E049A; Thu, 7 Feb 2013 15:48:12 +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 CAA00E049A for ; Thu, 7 Feb 2013 15:48:11 +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 A200033E0A1 for ; Thu, 7 Feb 2013 15:48:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 459D4E4073 for ; Thu, 7 Feb 2013 15:48:09 +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: <1360252076.5b39241499b12af1877bfd9b857709defcd2eab0.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: 5b39241499b12af1877bfd9b857709defcd2eab0 X-VCS-Branch: master Date: Thu, 7 Feb 2013 15:48:09 +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: ec37a7f1-0f41-4702-8c6f-85a6cfcdc68c X-Archives-Hash: d7345eda101c934524c1250434b738b5 commit: 5b39241499b12af1877bfd9b857709defcd2eab0 Author: Yuta SATOH gentoo gr jp> AuthorDate: Thu Feb 7 15:47:56 2013 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Thu Feb 7 15:47:56 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=5b392414 changed to use _p instead of -r. added comments. thanks aballier. --- eclass/freebsd.eclass | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index bfc757a..f705cf1 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -29,19 +29,25 @@ CDDL="freebsd-cddl-${PV}" # Release version (5.3, 5.4, 6.0, etc) RV="$(get_version_component_range 1-2)" -if [[ "${PV}" == *9999* ]]; then +if [[ ${PV} == *9999* ]]; then inherit subversion - MY_PR=${PR/r/} - [[ -n ${MY_PR} ]] && [[ ${MY_PR} -gt 10000 ]] && ESVN_REVISION="${MY_PR}" + MY_PV=${PV/_p*} + + # Set SVN revision using patch level. + PLEVEL=${PV##*_p} + [[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}" + + # freebsd-mk-defs is always run svn checkout/update. + # Other packages use sources that it checked out. [[ ${PN} == "freebsd-mk-defs" ]] || ESVN_OFFLINE="1" - case ${PV%.9999} in + case ${MY_PV%.9999} in *.*.*) BRANCH="release";; *.*) BRANCH="releng" ;; 9999) BRANCH="head" ;; *) BRANCH="stable" ;; esac - [[ "${BRANCH}" == "head" ]] || SVN_SUB_URI="${BRANCH}/${PV%.9999}" + [[ "${BRANCH}" == "head" ]] || SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}" [[ "${BRANCH}" == "head" ]] && SVN_SUB_URI="${BRANCH}" ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}" ESVN_PROJECT="freebsd-${BRANCH}"