[SVN-Commit] r1205 - in trunk: Mk mail/thunderbird mail/thunderbird-i18n

[svn-freebsd-gecko at chruetertee.ch]

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