git: a493958303d4 - main - graphics/osg34: Fix build with llvm16

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Sun, 23 Jul 2023 20:02:44 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a493958303d4c9aa1a24e41bc1ffb632369e764b

commit a493958303d4c9aa1a24e41bc1ffb632369e764b
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-07-23 19:59:13 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-07-23 20:02:30 +0000

    graphics/osg34: Fix build with llvm16
    
    - Pet portclippy
    
    Approved by:    portmgr (blanket)
    Sponsored by:   The FreeBSD Foundation
---
 graphics/osg34/Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/graphics/osg34/Makefile b/graphics/osg34/Makefile
index 56aa2b56a7f4..ee6d0e39151d 100644
--- a/graphics/osg34/Makefile
+++ b/graphics/osg34/Makefile
@@ -17,30 +17,32 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
+USES=		alias cmake compiler:c++11-lang gl jpeg localbase pkgconfig xorg
+USE_CXXSTD=	c++14
 USE_GITHUB=	yes
 GH_ACCOUNT=	openscenegraph
 GH_PROJECT=	OpenSceneGraph
-
-CONFLICTS_INSTALL=osg
-
-USES=		alias cmake compiler:c++11-lang gl jpeg localbase pkgconfig xorg
 USE_GL=		gl glu
-USE_XORG=	x11
 USE_LDCONFIG=	yes
+USE_XORG=	x11
+
 # needed to ensure build on gcc-based archs; harmless otherwise
 CXXFLAGS+=	-Wno-narrowing -I${LOCALBASE}/include/Imath -DInt64=uint64_t
 
+CONFLICTS_INSTALL=osg
+
+PORTSCOUT=	limitw:1,even
+
 PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
 		OSG_SHLIBVER=131 \
 		OPENTHREADS_VERSION=3.3.0 \
 		OPENTHREADS_SHLIBVER=20
 
-PORTSCOUT=	limitw:1,even
-
 OPTIONS_DEFINE=	CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA \
 		JASPER LIBLAS LUA NVTT OPENEXR PDF QT5 SDL \
 		SVG VNC XINE XRANDR
 OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR
+OPTIONS_SUB=	yes
 
 GDAL_DESC=	GDAL support
 GTA_DESC=	GTA file format support
@@ -49,8 +51,6 @@ NVTT_DESC=	Use NVidia texture tools
 SDL_DESC=	Use SDL (joystick support in present3d)
 VNC_DESC=	LibVNCServer support
 
-OPTIONS_SUB=	yes
-
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_VARS=		FORCE_REQUIRE+=CURL
 CURL_VARS_OFF=		FORCE_IGNORE+=CURL
@@ -112,9 +112,9 @@ VNC_VARS_OFF=		FORCE_IGNORE+=LibVNCServer
 XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 XINE_VARS=		FORCE_REQUIRE+=Xine
 XINE_VARS_OFF=		FORCE_IGNORE+=Xine
+XRANDR_USE=		xorg=xrandr
 XRANDR_CMAKE_ON=	-DOSGVIEWER_USE_XRANDR:BOOL=ON
 XRANDR_CMAKE_OFF=	-DOSGVIEWER_USE_XRANDR:BOOL=OFF
-XRANDR_USE=		xorg=xrandr
 
 # GUI toolkits are only needed for building examples, which are not even installed
 FORCE_IGNORE=	FLTK GLUT FOX Qt3 wxWidgets OpenAL GtkGl SDL2	# only for examples