Author: beat
Date: Wed Dec 1 23:22:24 2010
New Revision: 454
Log:
- Fix typo in for loop
- Fix version check for ranges
- Style nits
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Wed Dec 1 22:04:25 2010
(r453)
+++ branches/experimental/Mk/bsd.gecko.mk Wed Dec 1 23:22:24 2010
(r454)
@@ -262,8 +262,8 @@
USE_FIREFOX= ${_FIREFOX_DEFAULT_VERSION}
.endif
-.if !defined(_FIREFOX_${USE_FIREFOX}P)
-IGNORE:= cannot install: unknown Firefox version:
firefox-${USE_FIREFOX:C/([0-9])([0-9])/\1.\2/}
+.if !defined(_FIREFOX_${USE_FIREFOX:S/+//}P)
+IGNORE:= cannot install: unknown Firefox version:
firefox-${USE_FIREFOX:C/([0-9])([0-9])/\1.\2/}
.endif
# Check if we have user-defined WITH_FIREFOX_VER and if it matches
@@ -272,7 +272,7 @@
.for ver in ${_FIREFOX_RANGE_VERSIONS}
.if ${USE_FIREFOX} == "${ver}"
_MATCHED_FIREFOX_VER:= ${USE_FIREFOX:S/+//}
-.for firefox in ${_FIREFOXL_${_MATCHED_FIREFOX_VER}P}
+.for firefox in ${_FIREFOX_${_MATCHED_FIREFOX_VER}P}
.if ${WITH_FIREFOX_VER} == ${firefox}
# Check if user supplied WITH_FIREFOX is in the INVALID_FIREFOX_VER list
_BRKFIREFOX= no
@@ -328,7 +328,7 @@
.if !defined(USE_SEAMONKEY)
.if defined(USE_SEAMONKEY_BUILD)
USE_SEAMONKEY:= ${USE_SEAMONKEY_BUILD}
-_SEAMONKEY_BUILD_DEPENDS= yes
+_SEAMONKEY_BUILD_DEPENDS= yes
.endif
.endif
@@ -345,8 +345,8 @@
USE_SEAMONKEY= ${_SEAMONKEY_DEFAULT_VERSION}
.endif
-.if !defined(_SEAMONKEY_${USE_SEAMONKEY}P)
-IGNORE:= cannot install: unknown SeaMonkey version:
seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/}
+.if !defined(_SEAMONKEY_${USE_SEAMONKEY:S/+//}P)
+IGNORE:= cannot install: unknown SeaMonkey version:
seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/}
.endif
# Check if we have user-defined WITH_SEAMONKEY_VER and if it matches
@@ -355,7 +355,7 @@
.for ver in ${_SEAMONKEY_RANGE_VERSIONS}
.if ${USE_SEAMONKEY} == "${ver}"
_MATCHED_SEAMONKEY_VER:= ${USE_SEAMONKEY:S/+//}
-.for seamonkey in ${_SEAMONKEYL_${_MATCHED_SEAMONKEY_VER}P}
+.for seamonkey in ${_SEAMONKEY_${_MATCHED_SEAMONKEY_VER}P}
.if ${WITH_SEAMONKEY_VER} == ${seamonkey}
# Check if user supplied WITH_SEAMONKEY is in the INVALID_SEAMONKEY_VER list
_BRKSEAMONKEY= no
@@ -426,7 +426,7 @@
USE_THUNDERBIRD= ${_THUNDERBIRD_DEFAULT_VERSION}
.endif
-.if !defined(_THUNDERBIRD_${USE_THUNDERBIRD}P)
+.if !defined(_THUNDERBIRD_${USE_THUNDERBIRD:S/+//}P)
IGNORE:= cannot install: unknown Thunderbird version:
thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/}
.endif
@@ -436,7 +436,7 @@
.for ver in ${_THUNDERBIRD_RANGE_VERSIONS}
.if ${USE_THUNDERBIRD} == "${ver}"
_MATCHED_THUNDERBIRD_VER:= ${USE_THUNDERBIRD:S/+//}
-.for thunderbird in ${_THUNDERBIRDL_${_MATCHED_THUNDERBIRD_VER}P}
+.for thunderbird in ${_THUNDERBIRD_${_MATCHED_THUNDERBIRD_VER}P}
.if ${WITH_THUNDERBIRD_VER} == ${thunderbird}
# Check if user supplied WITH_THUNDERBIRD is in the INVALID_THUNDERBIRD_VER
list
_BRKTHUNDERBIRD= no
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
