From owner-freebsd-gecko@FreeBSD.ORG Sun Dec 5 15:54:43 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 0DD7D106566C for ; Sun, 5 Dec 2010 15:54:43 +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 7E74A8FC0C for ; Sun, 5 Dec 2010 15:54:41 +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 oB5FsfFG072898 for ; Sun, 5 Dec 2010 15:54:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oB5FsZGe071904 for freebsd-gecko@freebsd.org; Sun, 5 Dec 2010 15:54:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 5 Dec 2010 15:54:35 GMT Message-Id: <201012051554.oB5FsZGe071904@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] r461 - branches/experimental/www/firefox branches/experimental/www/firefox35 trunk/www/firefox trunk/www/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: Sun, 05 Dec 2010 15:54:43 -0000 Author: beat Date: Sun Dec 5 15:54:35 2010 New Revision: 461 Log: - Remove CONFLICTS with Firefox 3.0 which has been removed in June. - Replace CONFLICTS with CONFLICTS_INSTALL. Modified: branches/experimental/www/firefox/Makefile branches/experimental/www/firefox35/Makefile trunk/www/firefox/Makefile trunk/www/firefox35/Makefile Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sun Dec 5 09:51:22 2010 (r460) +++ branches/experimental/www/firefox/Makefile Sun Dec 5 15:54:35 2010 (r461) @@ -40,7 +40,7 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.[0,5].* +CONFLICTS_INSTALL= firefox-3.5.* 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 Sun Dec 5 09:51:22 2010 (r460) +++ branches/experimental/www/firefox35/Makefile Sun Dec 5 15:54:35 2010 (r461) @@ -40,7 +40,7 @@ USE_BZIP2= yes USE_GMAKE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.0.* firefox-3.6* +CONFLICTS_INSTALL= firefox-3.6* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sun Dec 5 09:51:22 2010 (r460) +++ trunk/www/firefox/Makefile Sun Dec 5 15:54:35 2010 (r461) @@ -40,7 +40,7 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.[0,5].* +CONFLICTS_INSTALL= firefox-3.5.* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png Modified: trunk/www/firefox35/Makefile ============================================================================== --- trunk/www/firefox35/Makefile Sun Dec 5 09:51:22 2010 (r460) +++ trunk/www/firefox35/Makefile Sun Dec 5 15:54:35 2010 (r461) @@ -40,7 +40,7 @@ USE_BZIP2= yes USE_GMAKE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.0.* firefox-3.6* +CONFLICTS_INSTALL= firefox-3.6* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png