Date: Thu, 18 Apr 2013 06:49:42 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1247 - in trunk: mail/thunderbird www/firefox www/firefox-esr www/libxul Message-ID: <201304180649.r3I6ngsa079792@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Apr 18 06:49:42 2013
New Revision: 1247
Log:
improve conflicts
- firefox24 would be esr
- esr shouldn't conflict with itself
- thunderbird install can replace *any* previous version
Modified:
trunk/mail/thunderbird/Makefile
trunk/www/firefox-esr/Makefile
trunk/www/firefox/Makefile
trunk/www/libxul/Makefile
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Wed Apr 17 20:07:59 2013 (r1246)
+++ trunk/mail/thunderbird/Makefile Thu Apr 18 06:49:42 2013 (r1247)
@@ -23,7 +23,6 @@
USE_AUTOTOOLS= autoconf213:env
USE_PYTHON_BUILD=-2.7
USE_GECKO= gecko
-CONFLICTS= thunderbird-24.* thunderbird-1[1-6].* thunderbird-10.*
USE_MOZILLA= # empty
MAKE_JOBS_SAFE= yes
Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile Wed Apr 17 20:07:59 2013 (r1246)
+++ trunk/www/firefox-esr/Makefile Thu Apr 18 06:49:42 2013 (r1247)
@@ -22,7 +22,7 @@
USE_PYTHON_BUILD=-2.7
LATEST_LINK= firefox-esr
USE_GECKO= gecko
-CONFLICTS= firefox-2[0-9].* firefox-1[1-689].* firefox-10.*
+CONFLICTS= firefox-2[0-35-9].* firefox-1[1-689].*
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= # empty
MOZILLA_NAME= Firefox
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Wed Apr 17 20:07:59 2013 (r1246)
+++ trunk/www/firefox/Makefile Thu Apr 18 06:49:42 2013 (r1247)
@@ -23,7 +23,7 @@
USE_PYTHON_BUILD=-2.7
OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
-CONFLICTS= firefox-1[07].*
+CONFLICTS= firefox-24.* firefox-1[07].*
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= # empty
MOZILLA_NAME= Firefox
Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile Wed Apr 17 20:07:59 2013 (r1246)
+++ trunk/www/libxul/Makefile Thu Apr 18 06:49:42 2013 (r1247)
@@ -18,7 +18,7 @@
unzip:${PORTSDIR}/archivers/unzip
WRKSRC= ${WRKDIR}/mozilla-esr17
-CONFLICTS= libxul-24.* libxul-10.* libxul-1.9.*
+CONFLICTS= libxul-1.9.*
USE_AUTOTOOLS= autoconf213:env
USE_PYTHON_BUILD=-2.7
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304180649.r3I6ngsa079792>