From owner-freebsd-gecko@FreeBSD.ORG Wed Jun 17 16:54:30 2015 Return-Path: Delivered-To: freebsd-gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1221202 for ; Wed, 17 Jun 2015 16:54:30 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "trillian.chruetertee.ch", Issuer "trillian.chruetertee.ch" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 2C03914F for ; Wed, 17 Jun 2015 16:54:29 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) by trillian.chruetertee.ch (8.14.9/8.14.9) with ESMTP id t5HGsRZ8067401 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 17 Jun 2015 16:54:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.9/8.14.9/Submit) id t5HGsQGU067395 for freebsd-gecko@freebsd.org; Wed, 17 Jun 2015 16:54:26 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 17 Jun 2015 16:54:26 GMT Message-Id: <201506171654.t5HGsQGU067395@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 Subject: [SVN-Commit] r1848 - in trunk: audio/linux-f10-alsa-plugins-pulseaudio security/ca_root_nss www/firefox www/firefox-esr www/libxul MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2015 16:54:30 -0000 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@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