From owner-freebsd-gecko@FreeBSD.ORG Thu Dec 2 10:58:15 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A44351065670 for ; Thu, 2 Dec 2010 10:58:15 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 327B38FC12 for ; Thu, 2 Dec 2010 10:58:14 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oB2AwEqd013320 for ; Thu, 2 Dec 2010 10:58:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oB2Aw9DQ013295 for freebsd-gecko@freebsd.org; Thu, 2 Dec 2010 10:58:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 2 Dec 2010 10:58:09 GMT Message-Id: <201012021058.oB2Aw9DQ013295@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r456 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2010 10:58:15 -0000 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