aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authoryuri <yuri@FreeBSD.org>2018-12-15 04:12:34 +0800
committeryuri <yuri@FreeBSD.org>2018-12-15 04:12:34 +0800
commit544c5ebb57302f2143e41e279d76f728fa0b7f4a (patch)
tree25fba6bc07ff31a1c8735519cb8285d1c64c6f4b /graphics
parentf74dfd852b729a76513612aff7acb7f0459f381b (diff)
downloadfreebsd-ports-gnome-544c5ebb57302f2143e41e279d76f728fa0b7f4a.tar.gz
freebsd-ports-gnome-544c5ebb57302f2143e41e279d76f728fa0b7f4a.tar.zst
freebsd-ports-gnome-544c5ebb57302f2143e41e279d76f728fa0b7f4a.zip
graphics/osg and graphics/osg-devel: Add USES=gl; Simplify CONFLICTS statement
Approved by: portmgr
Diffstat (limited to 'graphics')
-rw-r--r--graphics/osg-devel/Makefile4
-rw-r--r--graphics/osg/Makefile4
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