From owner-svn-ports-all@freebsd.org Sun Oct 28 00:52:18 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 763E610DA497; Sun, 28 Oct 2018 00:52:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2903C847AA; Sun, 28 Oct 2018 00:52:18 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0BD7C17EFE; Sun, 28 Oct 2018 00:52:18 +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 w9S0qHYY063952; Sun, 28 Oct 2018 00:52:17 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9S0qHg6063951; Sun, 28 Oct 2018 00:52:17 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810280052.w9S0qHg6063951@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 28 Oct 2018 00:52:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483208 - head/misc/raspberrypi-userland X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/misc/raspberrypi-userland X-SVN-Commit-Revision: 483208 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2018 00:52:18 -0000 Author: jbeich Date: Sun Oct 28 00:52:17 2018 New Revision: 483208 URL: https://svnweb.freebsd.org/changeset/ports/483208 Log: misc/raspberrypi-userland: adjust GL conflict after r440699 pkg-static: mesa-libs-18.2.3_1 conflicts with raspberrypi-userland-20161026 (installs files into the same place). Problematic file: /usr/local/include/EGL/egl.h Modified: head/misc/raspberrypi-userland/Makefile (contents, props changed) Modified: head/misc/raspberrypi-userland/Makefile ============================================================================== --- head/misc/raspberrypi-userland/Makefile Sat Oct 27 23:25:01 2018 (r483207) +++ head/misc/raspberrypi-userland/Makefile Sun Oct 28 00:52:17 2018 (r483208) @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE ONLY_FOR_ARCHS= armv6 armv7 -CONFLICTS_INSTALL= libglesv2 libEGL +CONFLICTS_INSTALL= mesa-libs USES= cmake:outsource pkgconfig shebangfix