From owner-freebsd-gecko@FreeBSD.ORG  Sat Mar  8 05:20:24 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 B6FADF04
 for <freebsd-gecko@freebsd.org>; Sat,  8 Mar 2014 05:20:24 +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 4A734B59
 for <freebsd-gecko@freebsd.org>; Sat,  8 Mar 2014 05:20:24 +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 s285KMLt011106
 for <freebsd-gecko@freebsd.org>; Sat, 8 Mar 2014 05:20:22 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s285KHSm010741
 for freebsd-gecko@freebsd.org; Sat, 8 Mar 2014 05:20:17 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Sat, 8 Mar 2014 05:20:17 GMT
Message-Id: <201403080520.s285KHSm010741@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] r1540 - 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:20:24 -0000

Author: jbeich
Date: Sat Mar  8 05:20:17 2014
New Revision: 1540

Log:
drop CONFLICTS after r1538

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

Modified: trunk/www/linux-tor-browser/Makefile
==============================================================================
--- trunk/www/linux-tor-browser/Makefile	Sat Mar  8 05:17:11 2014	(r1539)
+++ trunk/www/linux-tor-browser/Makefile	Sat Mar  8 05:20:17 2014	(r1540)
@@ -17,7 +17,6 @@
 FETCH_ENV=	SSL_CA_CERT_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
 
 ONLY_FOR_ARCHS=	i386 amd64
-CONFLICTS=	tor-browser-[0-9]*
 
 USE_XZ=		yes
 USES=		dos2unix