| 1 |
commit: b7f8fccbbd9ed486e3044f57df544289a22bc386 |
| 2 |
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
| 3 |
AuthorDate: Mon Dec 31 10:04:00 2012 +0000 |
| 4 |
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com> |
| 5 |
CommitDate: Mon Dec 31 10:04:00 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=b7f8fccb |
| 7 |
|
| 8 |
freebsd.eclass: fixed a conditional branch, support -head |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/freebsd.eclass | 20 +++++++++++--------- |
| 12 |
1 files changed, 11 insertions(+), 9 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass |
| 15 |
index 0c6b444..8603712 100644 |
| 16 |
--- a/eclass/freebsd.eclass |
| 17 |
+++ b/eclass/freebsd.eclass |
| 18 |
@@ -29,18 +29,20 @@ CDDL="freebsd-cddl-${PV}" |
| 19 |
# Release version (5.3, 5.4, 6.0, etc) |
| 20 |
RV="$(get_version_component_range 1-2)" |
| 21 |
|
| 22 |
-if [ "${PV%.9999}" != "${PV}" ]; then |
| 23 |
+if [[ ${PV} == *9999* ]]; then |
| 24 |
inherit subversion |
| 25 |
- if [[ "${PV%.9999}" == *\.* ]]; then |
| 26 |
- ESVN_REPO_URI="svn://svn.freebsd.org/base/releng/${PV%.9999}" |
| 27 |
- ESVN_PROJECT="freebsd-releng" |
| 28 |
+ if [ "${PV%.9999}" != "${PV}" ]; then |
| 29 |
+ if [[ "${PV%.9999}" == *\.* ]]; then |
| 30 |
+ ESVN_REPO_URI="svn://svn.freebsd.org/base/releng/${PV%.9999}" |
| 31 |
+ ESVN_PROJECT="freebsd-releng" |
| 32 |
+ else |
| 33 |
+ ESVN_REPO_URI="svn://svn.freebsd.org/base/stable/${PV%.9999}" |
| 34 |
+ ESVN_PROJECT="freebsd-stable" |
| 35 |
+ fi |
| 36 |
else |
| 37 |
- ESVN_REPO_URI="svn://svn.freebsd.org/base/stable/${PV%.9999}" |
| 38 |
- ESVN_PROJECT="freebsd-stable" |
| 39 |
+ ESVN_REPO_URI="svn://svn.freebsd.org/base/head" |
| 40 |
+ ESVN_PROJECT="freebsd-head" |
| 41 |
fi |
| 42 |
-else |
| 43 |
- ESVN_REPO_URI="svn://svn.freebsd.org/base/head" |
| 44 |
- ESVN_PROJECT="freebsd-head" |
| 45 |
fi |
| 46 |
|
| 47 |
if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then |
Archives