From d59e877d6acf6ca42c5ede3ed092a197cb330e7c Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Fri, 14 Dec 2018 20:12:34 +0000 Subject: [PATCH] graphics/osg and graphics/osg-devel: Add USES=gl; Simplify CONFLICTS statement Approved by: portmgr --- graphics/osg-devel/Makefile | 4 ++-- graphics/osg/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile index 031991af42b6..3f10dc527cda 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg-devel/Makefile @@ -21,9 +21,9 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff -CONFLICTS= osg-[0-9]* +CONFLICTS= osg -USES= alias cmake:outsource jpeg pkgconfig zip +USES= alias cmake:outsource jpeg gl pkgconfig zip USE_GL= gl glu USE_XORG= x11 USE_LDCONFIG= yes diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index e4e5556ec25e..a42ecca9c117 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -22,9 +22,9 @@ USE_GITHUB= yes GH_ACCOUNT= openscenegraph GH_PROJECT= OpenSceneGraph -CONFLICTS= osg-devel-[0-9]* +CONFLICTS= osg-devel -USES= alias cmake:outsource compiler:c++11-lang jpeg pkgconfig +USES= alias cmake:outsource compiler:c++11-lang gl jpeg pkgconfig USE_GL= gl glu USE_XORG= x11 USE_LDCONFIG= yes