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

["Yuta SATOH" <nigoro.gentoo@0x100.com>]

commit:     5b39241499b12af1877bfd9b857709defcd2eab0
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Feb  7 15:47:56 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> 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}"