From owner-svn-ports-head@freebsd.org Wed Nov 22 06:24:40 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0CE7DE1F41; Wed, 22 Nov 2017 06:24:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8CB6D6E4F9; Wed, 22 Nov 2017 06:24:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAM6OdcM014465; Wed, 22 Nov 2017 06:24:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAM6Od84014462; Wed, 22 Nov 2017 06:24:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201711220624.vAM6Od84014462@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 22 Nov 2017 06:24:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454667 - in head/www: firefox firefox-esr libxul X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/www: firefox firefox-esr libxul X-SVN-Commit-Revision: 454667 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Nov 2017 06:24:40 -0000 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