From owner-freebsd-gecko@FreeBSD.ORG  Sat Mar  8 05:17:10 2014
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5735FED6
 for <freebsd-gecko@freebsd.org>; Sat,  8 Mar 2014 05:17:10 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.244.247])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DF020ADD
 for <freebsd-gecko@freebsd.org>; Sat,  8 Mar 2014 05:17:09 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.244.247])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s285H6jk004249
 for <freebsd-gecko@freebsd.org>; Sat, 8 Mar 2014 05:17:06 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s285H1Xu003926
 for freebsd-gecko@freebsd.org; Sat, 8 Mar 2014 05:17:01 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Sat, 8 Mar 2014 05:17:01 GMT
Message-Id: <201403080517.s285H1Xu003926@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] r1538 - trunk/www/linux-tor-browser
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.17
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/options/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, 08 Mar 2014 05:17:10 -0000

Author: jbeich
Date: Sat Mar  8 05:17:01 2014
New Revision: 1538

Log:
avoid conflict with non-linux TBB in future

Modified:
   trunk/www/linux-tor-browser/Makefile
   trunk/www/linux-tor-browser/pkg-plist

Modified: trunk/www/linux-tor-browser/Makefile
==============================================================================
--- trunk/www/linux-tor-browser/Makefile	Wed Mar  5 14:37:44 2014	(r1537)
+++ trunk/www/linux-tor-browser/Makefile	Sat Mar  8 05:17:01 2014	(r1538)
@@ -32,10 +32,10 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}_${LOCALE}
 DATADIR?=	/tmp/${UNIQUENAME}
 
-DESKTOP_ENTRIES="Tor Browser Bundle" \
+DESKTOP_ENTRIES="Tor Browser Bundle (${DISTVERSIONPREFIX:S/-//})" \
 		"" \
 		"${PREFIX}/lib/${UNIQUENAME}/Browser/browser/chrome/icons/default/default48.png" \
-		"start-tor-browser" \
+		"${UNIQUENAME}" \
 		"Network;WebBrowser;Security;" \
 		false
 
@@ -82,6 +82,6 @@
 	${TAR} cf - -C${WRKSRC} --exclude '*.orig' --exclude '*.bak' . | \
 		${TAR} xof - -C${STAGEDIR}${PREFIX}/lib/${UNIQUENAME}
 	${LN} -sf ${PREFIX}/lib/${UNIQUENAME}/start-tor-browser \
-		${STAGEDIR}${PREFIX}/bin
+		${STAGEDIR}${PREFIX}/bin/${UNIQUENAME}
 
 .include <bsd.port.mk>

Modified: trunk/www/linux-tor-browser/pkg-plist
==============================================================================
--- trunk/www/linux-tor-browser/pkg-plist	Wed Mar  5 14:37:44 2014	(r1537)
+++ trunk/www/linux-tor-browser/pkg-plist	Sat Mar  8 05:17:01 2014	(r1538)
@@ -1,5 +1,5 @@
 @unexec rm -rf %%DATADIR%%
-bin/start-tor-browser
+bin/linux-tor-browser
 lib/linux-tor-browser/Browser/application.ini
 lib/linux-tor-browser/Browser/browser/blocklist.xml
 lib/linux-tor-browser/Browser/browser/chrome.manifest