Date: Thu, 2 Dec 2010 10:44:05 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r455 - branches/experimental/Mk Message-ID: <201012021044.oB2Ai5vX085000@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat Date: Thu Dec 2 10:44:04 2010 New Revision: 455 Log: - Fix check of wanted version against installed one if the wanted version is a range. Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Wed Dec 1 23:22:24 2010 (r454) +++ branches/experimental/Mk/bsd.gecko.mk Thu Dec 2 10:44:04 2010 (r455) @@ -299,8 +299,26 @@ _FIREFOX_VER!= ${LOCALBASE}/bin/firefox3 --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/' .endif +# Check if installed Firefox version matches the wanted one .if defined(_FIREFOX_VER) -.if ${_FIREFOX_VER} != ${USE_FIREFOX} +_SUPFIREFOX= no +.if ${USE_FIREFOX:C/[0-9][0-9]//} == "+" +.for ver in ${_FIREFOX_RANGE_VERSIONS} +.if ${USE_FIREFOX} == "${ver}" +_MATCHED_FIREFOX_VER:= ${ver:S/+//} +.for firefox in ${_FIREFOX_${_MATCHED_FIREFOX_VER}P} +.if ${_FIREFOX_VER} == ${firefox} +_SUPFIREFOX= yes +.endif +.endfor +.endif +.endfor +.else +.if ${_FIREFOX_VER} == ${USE_FIREFOX} +_SUPFIREFOX= yes +.endif +.endif +.if ${_SUPFIREFOX} == no IGNORE= cannot install: Firefox versions mismatch: firefox-${_FIREFOX_VER:C/([0-9])([0-9])/\1.\2/} is installed and wanted version is firefox-${USE_FIREFOX:C/([0-9])([0-9])/\1.\2/} .endif .endif @@ -380,8 +398,26 @@ _SEAMONKEY_VER!= ${LOCALBASE}/bin/seamonkey --version | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\)\.\([0-9]*\).*/\1\2/' .endif +# Check if installed SeaMonkey version matches the wanted one .if defined(_SEAMONKEY_VER) -.if ${_SEAMONKEY_VER} != ${USE_SEAMONKEY} +_SUPSEAMONKEY= no +.if ${USE_SEAMONKEY:C/[0-9][0-9]//} == "+" +.for ver in ${_SEAMONKEY_RANGE_VERSIONS} +.if ${USE_SEAMONKEY} == "${ver}" +_MATCHED_SEAMONKEY_VER:= ${ver:S/+//} +.for seamonkey in ${_SEAMONKEY_${_MATCHED_SEAMONKEY_VER}P} +.if ${_SEAMONKEY_VER} == ${seamonkey} +_SUPSEAMONKEY= yes +.endif +.endfor +.endif +.endfor +.else +.if ${_SEAMONKEY_VER} == ${USE_SEAMONKEY} +_SUPSEAMONKEY= yes +.endif +.endif +.if ${_SUPSEAMONKEY} == no IGNORE= cannot install: SeaMonkey versions mismatch: seamonkey-${_SEAMONKEY_VER:C/([0-9])([0-9])/\1.\2/} is installed and wanted version is seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/} .endif .endif @@ -461,8 +497,26 @@ _THUNDERBIRD_VER!= ${LOCALBASE}/bin/thunderbird --version | ${SED} -e 's/ Thunderbird \([0-9]\)\.\([0-9]*\).*/\1\2/' .endif +# Check if installed Thunderbird version matches the wanted one .if defined(_THUNDERBIRD_VER) -.if ${_THUNDERBIRD_VER} != ${USE_THUNDERBIRD} +_SUPTHUNDERBIRD= no +.if ${USE_THUNDERBIRD:C/[0-9][0-9]//} == "+" +.for ver in ${_THUNDERBIRD_RANGE_VERSIONS} +.if ${USE_THUNDERBIRD} == "${ver}" +_MATCHED_THUNDERBIRD_VER:= ${ver:S/+//} +.for thunderbird in ${_THUNDERBIRD_${_MATCHED_THUNDERBIRD_VER}P} +.if ${_THUNDERBIRD_VER} == ${thunderbird} +_SUPTHUNDERBIRD= yes +.endif +.endfor +.endif +.endfor +.else +.if ${_THUNDERBIRD_VER} == ${USE_THUNDERBIRD} +_SUPTHUNDERBIRD= yes +.endif +.endif +.if ${_SUPTHUNDERBIRD} != yes IGNORE= cannot install: Thunderbird versions mismatch: thunderbird-${_THUNDERBIRD_VER:C/([0-9])([0-9])/\1.\2/} is installed and wanted version is thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/} .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012021044.oB2Ai5vX085000>