Date: Thu, 2 Dec 2010 10:58:09 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r456 - branches/experimental/Mk Message-ID: <201012021058.oB2Aw9DQ013295@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Thu Dec 2 10:58:08 2010
New Revision: 456
Log:
- Relocate unknown version check. Otherwise this check is always
superseeded by the installed version check.
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Thu Dec 2 10:44:04 2010 (r455)
+++ branches/experimental/Mk/bsd.gecko.mk Thu Dec 2 10:58:08 2010 (r456)
@@ -262,10 +262,6 @@
USE_FIREFOX= ${_FIREFOX_DEFAULT_VERSION}
.endif
-.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
# the range specified in port's USE_FIREFOX
.if defined(WITH_FIREFOX_VER)
@@ -323,6 +319,10 @@
.endif
.endif
+.if !defined(_FIREFOX_${USE_FIREFOX:S/+//}P)
+IGNORE= cannot install: unknown Firefox version: firefox-${USE_FIREFOX:C/([0-9])([0-9])/\1.\2/}
+.endif
+
# Dependence lines for different Firefox versions
36_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox
35_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35
@@ -363,10 +363,6 @@
USE_SEAMONKEY= ${_SEAMONKEY_DEFAULT_VERSION}
.endif
-.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
# the range specified in port's USE_SEAMONKEY
.if defined(WITH_SEAMONKEY_VER)
@@ -422,6 +418,10 @@
.endif
.endif
+.if !defined(_SEAMONKEY_${USE_SEAMONKEY:S/+//}P)
+IGNORE= cannot install: unknown SeaMonkey version: seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/}
+.endif
+
# Dependence lines for different SeaMonkey versions
11_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
20_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey2
@@ -462,10 +462,6 @@
USE_THUNDERBIRD= ${_THUNDERBIRD_DEFAULT_VERSION}
.endif
-.if !defined(_THUNDERBIRD_${USE_THUNDERBIRD:S/+//}P)
-IGNORE:= cannot install: unknown Thunderbird version: thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/}
-.endif
-
# Check if we have user-defined WITH_THUNDERBIRD_VER and if it matches
# the range specified in port's USE_THUNDERBIRD
.if defined(WITH_THUNDERBIRD_VER)
@@ -521,6 +517,10 @@
.endif
.endif
+.if !defined(_THUNDERBIRD_${USE_THUNDERBIRD:S/+//}P)
+IGNORE= cannot install: unknown Thunderbird version: thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/}
+.endif
+
# Dependence lines for different Thunderbird versions
31_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
30_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012021058.oB2Aw9DQ013295>