From owner-freebsd-gecko@FreeBSD.ORG Sat Apr 24 10:26:33 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 A89E8106564A for ; Sat, 24 Apr 2010 10:26:33 +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 2882F8FC18 for ; Sat, 24 Apr 2010 10:26:32 +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 o3OAQWo6067768 for ; Sat, 24 Apr 2010 10:26:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id o3OAQQii067313 for freebsd-gecko@freebsd.org; Sat, 24 Apr 2010 10:26:26 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 24 Apr 2010 10:26:26 GMT Message-Id: <201004241026.o3OAQQii067313@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] r306 - in branches/experimental/www: firefox firefox3 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: Sat, 24 Apr 2010 10:26:33 -0000 Author: beat Date: Sat Apr 24 10:26:26 2010 New Revision: 306 Log: - Update CONFLICTS for Firefox 3.7 Modified: branches/experimental/www/firefox/Makefile branches/experimental/www/firefox3-devel/Makefile branches/experimental/www/firefox3/Makefile branches/experimental/www/firefox35/Makefile Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sat Apr 24 10:20:26 2010 (r305) +++ branches/experimental/www/firefox/Makefile Sat Apr 24 10:26:26 2010 (r306) @@ -39,7 +39,7 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.[0,5].* +CONFLICTS= firefox-3.[0,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 Sat Apr 24 10:20:26 2010 (r305) +++ branches/experimental/www/firefox3-devel/Makefile Sat Apr 24 10:26:26 2010 (r306) @@ -41,7 +41,7 @@ USE_GL= gl MAKE_JOBS_SAFE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.[0,5].* +CONFLICTS= firefox-3.[0,5,6].* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png Modified: branches/experimental/www/firefox3/Makefile ============================================================================== --- branches/experimental/www/firefox3/Makefile Sat Apr 24 10:20:26 2010 (r305) +++ branches/experimental/www/firefox3/Makefile Sat Apr 24 10:26:26 2010 (r306) @@ -22,7 +22,7 @@ DEPRECATED= Upstream support dropped. Please consider using www/firefox or www/firefox35 instead LATEST_LINK= firefox3 USE_GECKO= gecko -CONFLICTS= firefox-3.[1-6]* +CONFLICTS= firefox-3.[1-7]* MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -png -nss -dbm -jpeg MOZILLA_NAME= Firefox${MOZILLA_SUFX} Modified: branches/experimental/www/firefox35/Makefile ============================================================================== --- branches/experimental/www/firefox35/Makefile Sat Apr 24 10:20:26 2010 (r305) +++ branches/experimental/www/firefox35/Makefile Sat Apr 24 10:26:26 2010 (r306) @@ -40,7 +40,7 @@ USE_BZIP2= yes USE_GMAKE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.0.* firefox-3.6* +CONFLICTS= firefox-3.[0,6,7].* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png