From owner-freebsd-gecko@FreeBSD.ORG Wed Aug 4 14:38:48 2010 Return-Path: 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 602A01065714 for ; Wed, 4 Aug 2010 14:38:48 +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 D2EFE8FC0C for ; Wed, 4 Aug 2010 14:38:47 +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 o74Eckct098853 for ; Wed, 4 Aug 2010 14:38:46 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id o74EcfGa097807 for freebsd-gecko@freebsd.org; Wed, 4 Aug 2010 14:38:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 4 Aug 2010 14:38:41 GMT Message-Id: <201008041438.o74EcfGa097807@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] r369 - in branches/experimental/www: firefox firefox-devel firefox3-devel firefox35 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Aug 2010 14:38:48 -0000 Author: beat Date: Wed Aug 4 14:38:40 2010 New Revision: 369 Log: - Update CONFLICTS between the Firefox ports. Firefox 4 no longer conflicts with the different Firefox 3 versions. Reminded by: jsa@ Modified: branches/experimental/www/firefox-devel/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/firefox3-devel/Makefile branches/experimental/www/firefox35/Makefile Modified: branches/experimental/www/firefox-devel/Makefile ============================================================================== --- branches/experimental/www/firefox-devel/Makefile Wed Aug 4 06:31:37 2010 (r368) +++ branches/experimental/www/firefox-devel/Makefile Wed Aug 4 14:38:40 2010 (r369) @@ -38,7 +38,6 @@ USE_GL= gl MAKE_JOBS_SAFE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.[5,6,7].* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Wed Aug 4 06:31:37 2010 (r368) +++ branches/experimental/www/firefox/Makefile Wed Aug 4 14:38:40 2010 (r369) @@ -39,7 +39,7 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.[0,5].* +CONFLICTS= firefox-3.[5,7].* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png Modified: branches/experimental/www/firefox3-devel/Makefile ============================================================================== --- branches/experimental/www/firefox3-devel/Makefile Wed Aug 4 06:31:37 2010 (r368) +++ branches/experimental/www/firefox3-devel/Makefile Wed Aug 4 14:38:40 2010 (r369) @@ -41,7 +41,7 @@ USE_GL= gl MAKE_JOBS_SAFE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.[0,5,6].* +CONFLICTS= firefox-3.[5,6].* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png Modified: branches/experimental/www/firefox35/Makefile ============================================================================== --- branches/experimental/www/firefox35/Makefile Wed Aug 4 06:31:37 2010 (r368) +++ branches/experimental/www/firefox35/Makefile Wed Aug 4 14:38:40 2010 (r369) @@ -40,7 +40,7 @@ USE_BZIP2= yes USE_GMAKE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.[0,6,7].* +CONFLICTS= firefox-3.[6,7].* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png