From owner-freebsd-gecko@FreeBSD.ORG Sat Mar 9 18:03:51 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CDE83D48 for ; Sat, 9 Mar 2013 18:03:51 +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 5B8AD2B2 for ; Sat, 9 Mar 2013 18:03:50 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r29I3oV3072174 for ; Sat, 9 Mar 2013 18:03:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r29I3jSE071581 for freebsd-gecko@freebsd.org; Sat, 9 Mar 2013 18:03:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 9 Mar 2013 18:03:45 GMT Message-Id: <201303091803.r29I3jSE071581@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 Subject: [SVN-Commit] r1205 - in trunk: Mk mail/thunderbird mail/thunderbird-i18n MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 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: Sat, 09 Mar 2013 18:03:52 -0000 Author: jbeich Date: Sat Mar 9 18:03:44 2013 New Revision: 1205 Log: fixup last commit Modified: trunk/Mk/bsd.gecko.mk trunk/mail/thunderbird-i18n/Makefile trunk/mail/thunderbird/Makefile Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sat Mar 9 17:40:42 2013 (r1204) +++ trunk/Mk/bsd.gecko.mk Sat Mar 9 18:03:44 2013 (r1205) @@ -201,7 +201,7 @@ # version is given by the maintainer via the port # or by the user via defined variable try to find # the highest stable installed version. -# Available values: yes 10+ 17+ 10 17 +# Available values: yes 17+ 17 # NOTE: # default value 17 is used in case of USE_THUNDERBIRD=yes # @@ -363,13 +363,12 @@ _THUNDERBIRD_BUILD_DEPENDS= yes .endif -_THUNDERBIRD_DEFAULT_VERSION= 10 -_THUNDERBIRD_VERSIONS= 10 17 -_THUNDERBIRD_RANGE_VERSIONS= 10+ 17+ - -# For specifying [10, ..]+ -_THUNDERBIRD_17P= 17 ${_THUNDERBIRD_10P} -_THUNDERBIRD_10P= 10 +_THUNDERBIRD_DEFAULT_VERSION= 17 +_THUNDERBIRD_VERSIONS= 17 +_THUNDERBIRD_RANGE_VERSIONS= 17+ + +# For specifying [17, ..]+ +_THUNDERBIRD_17P= 17 # Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given .if ${USE_THUNDERBIRD} == "yes" @@ -413,7 +412,6 @@ .endif # Dependence lines for different Thunderbird versions -10_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird-esr 17_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird # Add dependencies Modified: trunk/mail/thunderbird-i18n/Makefile ============================================================================== --- trunk/mail/thunderbird-i18n/Makefile Sat Mar 9 17:40:42 2013 (r1204) +++ trunk/mail/thunderbird-i18n/Makefile Sat Mar 9 18:03:44 2013 (r1205) @@ -4,7 +4,7 @@ PORTNAME= thunderbird-i18n PORTVERSION= 17.0.2 CATEGORIES= mail -MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/linux-i686/xpi +MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}esr/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${THUNDERBIRD_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Sat Mar 9 17:40:42 2013 (r1204) +++ trunk/mail/thunderbird/Makefile Sat Mar 9 18:03:44 2013 (r1205) @@ -23,9 +23,8 @@ USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 -LATEST_LINK= thunderbird-esr USE_GECKO= gecko -CONFLICTS= thunderbird-2[0-9].* thunderbird-1[1-689].* thunderbird-10.* +CONFLICTS= thunderbird-24.* thunderbird-1[1-6].* thunderbird-10.* USE_MOZILLA= # empty MAKE_JOBS_SAFE= yes