Date: Sat, 24 Apr 2010 11:34:25 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r310 - in trunk/www: . firefox firefox3 firefox35 Message-ID: <201004241134.o3OBYPTq049633@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat Date: Sat Apr 24 11:34:24 2010 New Revision: 310 Log: MFExp: - Update CONFLICTS for Firefox 3.7 Modified: trunk/www/ (props changed) trunk/www/firefox/Makefile trunk/www/firefox3/Makefile trunk/www/firefox35/Makefile Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sat Apr 24 11:29:50 2010 (r309) +++ trunk/www/firefox/Makefile Sat Apr 24 11:34:24 2010 (r310) @@ -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: trunk/www/firefox3/Makefile ============================================================================== --- trunk/www/firefox3/Makefile Sat Apr 24 11:29:50 2010 (r309) +++ trunk/www/firefox3/Makefile Sat Apr 24 11:34:24 2010 (r310) @@ -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: trunk/www/firefox35/Makefile ============================================================================== --- trunk/www/firefox35/Makefile Sat Apr 24 11:29:50 2010 (r309) +++ trunk/www/firefox35/Makefile Sat Apr 24 11:34:24 2010 (r310) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004241134.o3OBYPTq049633>