diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-10-28 00:52:17 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-10-28 00:52:17 +0000 |
| commit | 22c488495ff95c8b4bf60bdb163b403331b78cb1 (patch) | |
| tree | 840019b2d114de4fb83868a0c9e6f601b61f7502 /misc | |
| parent | 68859a573f037aada27d4f9f8bea683cc030a449 (diff) | |
| download | ports-22c488495ff95c8b4bf60bdb163b403331b78cb1.tar.gz ports-22c488495ff95c8b4bf60bdb163b403331b78cb1.zip | |
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
Notes
Notes:
svn path=/head/; revision=483208
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/raspberrypi-userland/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/raspberrypi-userland/Makefile b/misc/raspberrypi-userland/Makefile index 94327464bff3..ca2c67c3ab0e 100644 --- a/misc/raspberrypi-userland/Makefile +++ b/misc/raspberrypi-userland/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE ONLY_FOR_ARCHS= armv6 armv7 -CONFLICTS_INSTALL= libglesv2 libEGL +CONFLICTS_INSTALL= mesa-libs USES= cmake:outsource pkgconfig shebangfix |