[SVN-Commit] r1848 - in trunk: audio/linux-f10-alsa-plugins-pulseaudio security/ca_root_nss www/firefox www/firefox-esr www/libxul

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Wed Jun 17 16:54:26 2015
New Revision: 1848

Log:
Drop build conflict

Modified:
   trunk/audio/linux-f10-alsa-plugins-pulseaudio/Makefile
   trunk/security/ca_root_nss/Makefile
   trunk/www/firefox-esr/Makefile
   trunk/www/firefox/Makefile
   trunk/www/libxul/Makefile

Modified: trunk/audio/linux-f10-alsa-plugins-pulseaudio/Makefile
==============================================================================
--- trunk/audio/linux-f10-alsa-plugins-pulseaudio/Makefile	Wed Jun 17 16:49:31 2015	(r1847)
+++ trunk/audio/linux-f10-alsa-plugins-pulseaudio/Makefile	Wed Jun 17 16:54:26 2015	(r1848)
@@ -7,7 +7,7 @@
 MAINTAINER=	emulation at FreeBSD.org
 COMMENT=	PulseAudio plugin for ALSA (Linux Fedora 10)
 
-CONFLICTS=	linux-c6-alsa-lib-[0-9]*
+CONFLICTS_INSTALL=	linux-c6-alsa-lib-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	f10

Modified: trunk/security/ca_root_nss/Makefile
==============================================================================
--- trunk/security/ca_root_nss/Makefile	Wed Jun 17 16:49:31 2015	(r1847)
+++ trunk/security/ca_root_nss/Makefile	Wed Jun 17 16:54:26 2015	(r1848)
@@ -18,7 +18,7 @@
 OPTIONS_SUB=		yes
 
 ETCSYMLINK_DESC=	Add symlink to /etc/ssl/cert.pem
-ETCSYMLINK_CONFLICTS=	ca-roots-[0-9]*
+ETCSYMLINK_CONFLICTS_INSTALL=	ca-roots-[0-9]*
 
 USES=		perl5
 USE_PERL5=	build

Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile	Wed Jun 17 16:49:31 2015	(r1847)
+++ trunk/www/firefox-esr/Makefile	Wed Jun 17 16:54:26 2015	(r1848)
@@ -35,7 +35,7 @@
 
 USE_GECKO=	gecko
 CPE_PRODUCT=	${PORTNAME}_esr
-CONFLICTS=	firefox-3[02-9].* firefox-2[0-35-9].*
+CONFLICTS_INSTALL=	firefox-3[02-9].* firefox-2[0-35-9].*
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	# empty
 MOZILLA_NAME=	Firefox

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Wed Jun 17 16:49:31 2015	(r1847)
+++ trunk/www/firefox/Makefile	Wed Jun 17 16:54:26 2015	(r1848)
@@ -32,7 +32,7 @@
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 USE_GECKO=	gecko
-CONFLICTS=	firefox-esr-31.* firefox-esr-24.* firefox-esr-17.*
+CONFLICTS_INSTALL=	firefox-esr-31.* firefox-esr-24.* firefox-esr-17.*
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-opus
 MOZILLA_NAME=	Firefox

Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile	Wed Jun 17 16:49:31 2015	(r1847)
+++ trunk/www/libxul/Makefile	Wed Jun 17 16:54:26 2015	(r1848)
@@ -32,7 +32,7 @@
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 WRKSRC=		${WRKDIR}/mozilla-esr31
-CONFLICTS=	libxul-1.9.*
+CONFLICTS_INSTALL=	libxul-1.9.*
 
 USE_QT5=	# empty
 QT_NONSTANDARD=	yes