Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/mail/thunderbird/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/mail/thunderbird/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- pkgsrc/mail/thunderbird/Makefile	2012/11/03 22:51:53	1.103
+++ pkgsrc/mail/thunderbird/Makefile	2012/11/23 07:17:53	1.104
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.103 2012/11/03 22:51:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.104 2012/11/23 07:17:53 ryoon Exp $
 #
 
 DISTNAME=	# empty
 PKGNAME=	thunderbird-${TB_VER}
-TB_VER=		16.0.2
+TB_VER=		17.0
+LIGHTNINGVER=	1.9
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} \
-		${MASTER_SITE_MOZILLA_ALL:=thunderbird/releases/${TB_VER}/source/}
-DISTFILES=	thunderbird-${TB_VER}.source.tar.bz2 \
-		lightning-1.8.source.tar.bz2
-SITES.lightning-1.8.source.tar.bz2=	${MASTER_SITE_MOZILLA:=calendar/lightning/releases/1.8/source/}
-EXTRACT_DIR.lightning-1.8.source.tar.bz2=	${WRKSRC}/lightning
+MASTER_SITES=	${MASTER_SITE_MOZILLA_ESR:=thunderbird/releases/${TB_VER}esr/source/} \
+		${MASTER_SITE_MOZILLA_ALL:=thunderbird/releases/${TB_VER}esr/source/}
+DISTFILES=	thunderbird-${TB_VER}esr.source.tar.bz2 \
+		lightning-${LIGHTNINGVER}.source.tar.bz2
+SITES.lightning-${LIGHTNINGVER}.source.tar.bz2=	${MASTER_SITE_MOZILLA:=calendar/lightning/releases/${LIGHTNINGVER}/source/}
+EXTRACT_DIR.lightning-${LIGHTNINGVER}.source.tar.bz2=	${WRKSRC}/lightning
 
 MAINTAINER=	tnn@NetBSD.org
 HOMEPAGE=	http://www.mozillamessaging.com/en-US/thunderbird/
 COMMENT=	Organize, secure and customize your mail
 
 USE_TOOLS+=	unzip pax
-WRKSRC=		${WRKDIR}/comm-release
+WRKSRC=		${WRKDIR}/comm-esr17
 MOZILLA_DIR=	mozilla/
 PLIST_SRC+=	${PLIST_SRC_DFLT}
 
@@ -40,8 +41,8 @@ ALL_ENV+=		MOZILLA_PKG_NAME=thunderbird
 
 post-extract:
 	cd ${WRKSRC} && ${RM} -r calendar
-	${CP} -r ${EXTRACT_DIR.lightning-1.8.source.tar.bz2}/comm-beta/calendar ${WRKSRC}
-	${RM} -r ${EXTRACT_DIR.lightning-1.8.source.tar.bz2}
+	${CP} -r ${EXTRACT_DIR.lightning-${LIGHTNINGVER}.source.tar.bz2}/comm-beta/calendar ${WRKSRC}
+	${RM} -r ${EXTRACT_DIR.lightning-${LIGHTNINGVER}.source.tar.bz2}
 
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf