svn commit: r483210 - branches/2018Q4/misc/raspberrypi-userland

Sun Oct 28 00:58:30 UTC 2018

Author: jbeich
Date: Sun Oct 28 00:58:29 2018
New Revision: 483210
URL: https://svnweb.freebsd.org/changeset/ports/483210

Log:
  MFH: r483208
  
  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
  
  Approved by:	ports-secteam blanket

Modified:
  branches/2018Q4/misc/raspberrypi-userland/Makefile
Directory Properties:
  branches/2018Q4/   (props changed)

Modified: branches/2018Q4/misc/raspberrypi-userland/Makefile
==============================================================================

--- branches/2018Q4/misc/raspberrypi-userland/Makefile	Sun Oct 28 00:52:30 2018	(r483209)
+++ branches/2018Q4/misc/raspberrypi-userland/Makefile	Sun Oct 28 00:58:29 2018	(r483210)
@@ -12,7 +12,7 @@ LICENSE=	BSD3CLAUSE
 
 ONLY_FOR_ARCHS=	armv6 armv7
 
-CONFLICTS_INSTALL=	libglesv2 libEGL
+CONFLICTS_INSTALL=	mesa-libs
 
 USES=		cmake:outsource pkgconfig shebangfix
 
