[SVN-Commit] r1116 - in trunk: mail/thunderbird mail/thunderbird-esr mail/thunderbird-esr-i18n www/firefox www/firefox-esr www/firefox-esr-i18n

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Thu Dec 6 21:56:37 UTC 2012 

Author: jbeich
Date: Thu Dec  6 21:56:23 2012
New Revision: 1116

Log:
adjust -esr makefiles after r1106

Modified:
   trunk/mail/thunderbird-esr-i18n/Makefile
   trunk/mail/thunderbird-esr/Makefile
   trunk/mail/thunderbird-esr/distinfo
   trunk/mail/thunderbird/Makefile
   trunk/www/firefox-esr-i18n/Makefile
   trunk/www/firefox-esr/Makefile
   trunk/www/firefox-esr/distinfo
   trunk/www/firefox/Makefile

Modified: trunk/mail/thunderbird-esr-i18n/Makefile
==============================================================================
--- trunk/mail/thunderbird-esr-i18n/Makefile	Wed Dec  5 20:03:23 2012	(r1115)
+++ trunk/mail/thunderbird-esr-i18n/Makefile	Thu Dec  6 21:56:23 2012	(r1116)
@@ -4,7 +4,7 @@
 PORTNAME=	thunderbird-i18n
 PORTVERSION=	17.0
 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}
@@ -22,6 +22,7 @@
 RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
 .endif
 
+LATEST_LINK=	thunderbird-esr-i18n
 NO_BUILD=	yes
 USE_THUNDERBIRD=	17
 USE_XPI=	thunderbird linux-thunderbird

Modified: trunk/mail/thunderbird-esr/Makefile
==============================================================================
--- trunk/mail/thunderbird-esr/Makefile	Wed Dec  5 20:03:23 2012	(r1115)
+++ trunk/mail/thunderbird-esr/Makefile	Thu Dec  6 21:56:23 2012	(r1116)
@@ -5,9 +5,9 @@
 DISTVERSION=	17.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
-DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}esr/source
+DISTFILES=	${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
@@ -23,8 +23,9 @@
 
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
+LATEST_LINK=	thunderbird-esr
 USE_GECKO=	gecko
-CONFLICTS=	thunderbird-10.*
+CONFLICTS=	thunderbird-2[0-9].* thunderbird-1[1-689].* thunderbird-10.*
 USE_MOZILLA=	# empty
 
 MAKE_JOBS_SAFE=	yes

Modified: trunk/mail/thunderbird-esr/distinfo
==============================================================================
--- trunk/mail/thunderbird-esr/distinfo	Wed Dec  5 20:03:23 2012	(r1115)
+++ trunk/mail/thunderbird-esr/distinfo	Thu Dec  6 21:56:23 2012	(r1116)
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-17.0.source.tar.bz2) = 08a102f21511afb696980b7c35b75f385f4260fba5f1c0b1b488ab81a49dbede
-SIZE (thunderbird-17.0.source.tar.bz2) = 113270266
+SHA256 (thunderbird-17.0esr.source.tar.bz2) = 08a102f21511afb696980b7c35b75f385f4260fba5f1c0b1b488ab81a49dbede
+SIZE (thunderbird-17.0esr.source.tar.bz2) = 113270266
 SHA256 (enigmail-1.4.6.tar.gz) = f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036
 SIZE (enigmail-1.4.6.tar.gz) = 1262280

Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile	Wed Dec  5 20:03:23 2012	(r1115)
+++ trunk/mail/thunderbird/Makefile	Thu Dec  6 21:56:23 2012	(r1116)
@@ -25,7 +25,7 @@
 USE_PYTHON_BUILD=-2.7
 OBJDIR_BUILD=	# in-tree build broken after bug 789837
 USE_GECKO=	gecko
-CONFLICTS=	thunderbird-10.*
+CONFLICTS=	thunderbird-1[07].*
 USE_MOZILLA=	# empty
 
 MAKE_JOBS_SAFE=	yes

Modified: trunk/www/firefox-esr-i18n/Makefile
==============================================================================
--- trunk/www/firefox-esr-i18n/Makefile	Wed Dec  5 20:03:23 2012	(r1115)
+++ trunk/www/firefox-esr-i18n/Makefile	Thu Dec  6 21:56:23 2012	(r1116)
@@ -4,7 +4,7 @@
 PORTNAME=	firefox-i18n
 PORTVERSION=	17.0
 CATEGORIES=	www
-MASTER_SITE_SUBDIR=	firefox/releases/${PORTVERSION}/linux-i686/xpi
+MASTER_SITE_SUBDIR=	firefox/releases/${PORTVERSION}esr/linux-i686/xpi
 PKGNAMEPREFIX=
 DISTFILES=	${FIREFOX_I18N_:S/$/.xpi/}
 DIST_SUBDIR=	xpi/${DISTNAME}
@@ -16,6 +16,7 @@
 
 USE_FIREFOX=	17
 USE_XPI=	firefox linux-firefox
+LATEST_LINK=	firefox-esr-i18n
 
 USE_SUBMAKE=	yes
 
@@ -85,7 +86,7 @@
 		${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d'
 
 List-Langs:
-	@fetch -o- "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PORTVERSION}/linux-i686/xpi"|\
+	@fetch -o- "http://releases.mozilla.org/pub/mozilla.org/${MASTER_SITE_SUBDIR}"|\
 		${PERL} -ne 'if(/.*href="([a-zA-Z-]+).xpi.*/){print "$$1\n"}' |\
 		${AWK} 'BEGIN{ORS=" "}{print $1}END{printf "\nNumber of languages: %d\n",NR}'
 

Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile	Wed Dec  5 20:03:23 2012	(r1115)
+++ trunk/www/firefox-esr/Makefile	Thu Dec  6 21:56:23 2012	(r1116)
@@ -6,8 +6,8 @@
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}.source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}esr/source
+DISTNAME=	${PORTNAME}-${DISTVERSION}esr.source
 
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -21,8 +21,9 @@
 
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
+LATEST_LINK=	firefox-esr
 USE_GECKO=	gecko
-CONFLICTS=	firefox-10.*
+CONFLICTS=	firefox-2[0-9].* firefox-1[1-689].* firefox-10.*
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	# empty
 MOZILLA_NAME=	Firefox

Modified: trunk/www/firefox-esr/distinfo
==============================================================================
--- trunk/www/firefox-esr/distinfo	Wed Dec  5 20:03:23 2012	(r1115)
+++ trunk/www/firefox-esr/distinfo	Thu Dec  6 21:56:23 2012	(r1116)
@@ -1,2 +1,2 @@
-SHA256 (firefox-17.0.source.tar.bz2) = 7f05658701be88505747ea3537546b98a1c0e74ba23ba428d754ea838a192348
-SIZE (firefox-17.0.source.tar.bz2) = 90780755
+SHA256 (firefox-17.0esr.source.tar.bz2) = 7f05658701be88505747ea3537546b98a1c0e74ba23ba428d754ea838a192348
+SIZE (firefox-17.0esr.source.tar.bz2) = 90780755

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Wed Dec  5 20:03:23 2012	(r1115)
+++ trunk/www/firefox/Makefile	Thu Dec  6 21:56:23 2012	(r1116)
@@ -27,7 +27,7 @@
 USE_PYTHON_BUILD=-2.7
 OBJDIR_BUILD=	# in-tree build broken after bug 789837
 USE_GECKO=	gecko
-CONFLICTS=	firefox-10.*
+CONFLICTS=	firefox-1[07].*
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	# empty
 MOZILLA_NAME=	Firefox

More information about the freebsd-gecko mailing list