From owner-freebsd-gecko@FreeBSD.ORG  Sat Dec 12 20:15:17 2009
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
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 A81BE1065740
	for <freebsd-gecko@freebsd.org>; Sat, 12 Dec 2009 20:15:17 +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 3F6838FC0C
	for <freebsd-gecko@freebsd.org>; Sat, 12 Dec 2009 20:15:16 +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 nBCKFFjt040032
	for <freebsd-gecko@freebsd.org>; Sat, 12 Dec 2009 20:15:15 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id nBCKFAr0039622
	for freebsd-gecko@freebsd.org; Sat, 12 Dec 2009 20:15:10 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Sat, 12 Dec 2009 20:15:10 GMT
Message-Id: <200912122015.nBCKFAr0039622@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] r196 - branches/experimental/mail/thunderbird3
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 <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Dec 2009 20:15:17 -0000

Author: beat
Date: Sat Dec 12 20:15:10 2009
New Revision: 196

Log:
- Ensure that Thunderbird 3 and its extensions use the same install
  directory.

Modified:
   branches/experimental/mail/thunderbird3/Makefile

Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile	Sat Dec 12 12:06:55 2009	(r195)
+++ branches/experimental/mail/thunderbird3/Makefile	Sat Dec 12 20:15:10 2009	(r196)
@@ -33,6 +33,8 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
+MOZILLA=	${PORTNAME}-${PORTVERSION}
+MOZILLA_EXEC_NAME=	${PORTNAME}
 MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data
 MOZ_GRAPHICS=	default,-xbm
 MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
@@ -80,7 +82,7 @@
 post-extract::
 	${SED} -e 's|@MOZILLA_ICON@|${MOZILLA_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
-		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA}.desktop
+		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 	${LN} -s  ${WRKSRC}/mail ${WRKSRC}/mozilla/mail
 
 post-patch:
@@ -106,7 +108,7 @@
 	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
 	${FAKEDIR}/bin/thunderbird
 	${RM} -f ${FAKEDIR}/bin/*.bak
-	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
+	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
 
 pre-install:
 	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
@@ -114,6 +116,6 @@
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
 
 .include <bsd.port.post.mk>