svn commit: r454667 - in head/www: firefox firefox-esr libxul

[Jan Beich]

Author: jbeich
Date: Wed Nov 22 06:24:39 2017
New Revision: 454667
URL: https://svnweb.freebsd.org/changeset/ports/454667

Log:
  gecko: simplify conflicts

Modified:
  head/www/firefox-esr/Makefile   (contents, props changed)
  head/www/firefox/Makefile   (contents, props changed)
  head/www/libxul/Makefile   (contents, props changed)

Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile	Wed Nov 22 06:22:49 2017	(r454666)
+++ head/www/firefox-esr/Makefile	Wed Nov 22 06:24:39 2017	(r454667)
@@ -33,7 +33,7 @@ LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 USE_GECKO=	gecko
 CPE_PRODUCT=	${PORTNAME}_esr
-CONFLICTS_INSTALL=	firefox-[0-9]*
+CONFLICTS_INSTALL=	firefox
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-soundtouch
 MOZILLA_NAME=	Firefox

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Wed Nov 22 06:22:49 2017	(r454666)
+++ head/www/firefox/Makefile	Wed Nov 22 06:24:39 2017	(r454667)
@@ -32,7 +32,7 @@ BUILD_DEPENDS=	nspr>=4.17:devel/nspr \
 LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 USE_GECKO=	gecko
-CONFLICTS_INSTALL=	firefox-esr-45.* firefox-esr-3[18].* firefox-esr-24.*
+CONFLICTS_INSTALL=	firefox-esr
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-soundtouch
 MOZILLA_NAME=	Firefox

Modified: head/www/libxul/Makefile
==============================================================================
--- head/www/libxul/Makefile	Wed Nov 22 06:22:49 2017	(r454666)
+++ head/www/libxul/Makefile	Wed Nov 22 06:24:39 2017	(r454667)
@@ -31,7 +31,6 @@ BUILD_DEPENDS=	nspr>=4.12:devel/nspr \
 LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 WRKSRC:=	${WRKDIR}/firefox-${DISTVERSION}esr
-CONFLICTS_INSTALL=	libxul-1.9.*
 
 USE_GL=		gl
 USES=		pathfix shebangfix tar:xz