svn commit: r487466 - in head/graphics: osg osg-devel

[Yuri Victorovich]

Author: yuri
Date: Fri Dec 14 20:12:34 2018
New Revision: 487466
URL: https://svnweb.freebsd.org/changeset/ports/487466

Log:
  graphics/osg and graphics/osg-devel: Add USES=gl; Simplify CONFLICTS statement
  
  Approved by:	portmgr

Modified:
  head/graphics/osg-devel/Makefile
  head/graphics/osg/Makefile

Modified: head/graphics/osg-devel/Makefile
==============================================================================
--- head/graphics/osg-devel/Makefile	Fri Dec 14 20:02:36 2018	(r487465)
+++ head/graphics/osg-devel/Makefile	Fri Dec 14 20:12:34 2018	(r487466)
@@ -21,9 +21,9 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-se
 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

Modified: head/graphics/osg/Makefile
==============================================================================
--- head/graphics/osg/Makefile	Fri Dec 14 20:02:36 2018	(r487465)
+++ head/graphics/osg/Makefile	Fri Dec 14 20:12:34 2018	(r487466)
@@ -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