- Update to version 2020.04, first release in many years (unfortunately,

  it was tagged just before the commit 06e4728 which fixed building with
  Python 3.x, point GH_TAGNAME to it instead of pulling a patch)
- Drop explicit `python:build' from USES list, because `waf' implies it
- Add missing USE_XORG and put `xorg' on USES list
- For the time being, don't force C++14 while C++11 is sufficient until
  the code really starts using new features (see GitHub commit a6bbc01)

PR:		246793
Submitted by:	David Schlachter

4 files changed, 13 insertions, 50 deletions

diff --git a/benchmarks/glmark2/Makefile b/benchmarks/glmark2/Makefile
index ddc74b6828ba..af6a057d2883 100644
--- a/benchmarks/glmark2/Makefile
+++ b/benchmarks/glmark2/Makefile
@@ -2,23 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	glmark2
-PORTVERSION=	2014.03
-PORTREVISION=	1
+PORTVERSION=	2020.04
 CATEGORIES=	benchmarks
-MASTER_SITES=	https://launchpadlibrarian.net/169075003/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Benchmark for OpenGL (ES) 2.0
 
 LICENSE=	GPLv3
 
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-09-15
-
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		gl jpeg localbase:ldflags pkgconfig python:2.7,build waf
+USES=		compiler:c++11-lang gl jpeg localbase:ldflags pkgconfig \
+		waf xorg
+USE_XORG=	x11
 USE_GL=		egl gl glesv2
+USE_GITHUB=	yes
+GH_TAGNAME=	06e4728
 CONFIGURE_ARGS=	--with-flavors=x11-gl,x11-glesv2 --no-opt --no-debug
 
 PORTDOCS=	NEWS
@@ -26,6 +25,7 @@ PORTDOCS=	NEWS
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
+	@${REINPLACE_CMD} -e '/-std=c++/s,14,11,' ${WRKSRC}/wscript
 	@${REINPLACE_CMD} -e "/lib/s/, 'dl'//" ${WRKSRC}/src/wscript_build
 	@${REINPLACE_CMD} -e 's/GLMARK_VERSION/ &/' \
 		${WRKSRC}/src/native-state-x11.cpp
diff --git a/benchmarks/glmark2/distinfo b/benchmarks/glmark2/distinfo
index debca09e5480..f9f234cfb579 100644
--- a/benchmarks/glmark2/distinfo
+++ b/benchmarks/glmark2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1394537514
-SHA256 (glmark2-2014.03.tar.gz) = bded41aaf918ce062d9b81e42cc5be943e6a80bc4ff9d046983b96102c3df6b5
-SIZE (glmark2-2014.03.tar.gz) = 7801401
+TIMESTAMP = 1588522805
+SHA256 (glmark2-glmark2-2020.04-06e4728_GH0.tar.gz) = d0f09a9c84560c66f174a3e1c0ab65d92f9b4b35476cd526c4aae4efc0645091
+SIZE (glmark2-glmark2-2020.04-06e4728_GH0.tar.gz) = 9364467
diff --git a/benchmarks/glmark2/files/patch-wscript b/benchmarks/glmark2/files/patch-wscript
deleted file mode 100644
index fa6a85c65e48..000000000000
--- a/benchmarks/glmark2/files/patch-wscript
+++ /dev/null
@@ -1,37 +0,0 @@
---- wscript.orig	2014-03-11 08:50:10 UTC
-+++ wscript
-@@ -87,14 +87,8 @@ def configure(ctx):
-     for (lib, uselib) in req_libs:
-         ctx.check_cxx(lib = lib, uselib_store = uselib)
- 
--    # Check required functions
--    req_funcs = [('memset', 'string.h', []) ,('sqrt', 'math.h', ['m'])]
--    for func, header, uselib in req_funcs:
--        ctx.check_cxx(function_name = func, header_name = header,
--                      uselib = uselib, mandatory = True)
--
-     # Check for a supported version of libpng
--    supp_png_pkgs = (('libpng12', '1.2'), ('libpng15', '1.5'),)
-+    supp_png_pkgs = (('libpng12', '1.2'), ('libpng16', '1.6'),)
-     have_png = False
-     for (pkg, atleast) in supp_png_pkgs:
-         try:
-@@ -123,7 +117,7 @@ def configure(ctx):
-         ctx.check_cfg(package = pkg, uselib_store = uselib,
-                       args = '--cflags --libs', mandatory = mandatory)
- 
--    ctx.env.append_unique('CXXFLAGS', '-Werror -Wall -Wextra -Wnon-virtual-dtor'.split(' '))
-+    ctx.env.append_unique('CXXFLAGS', '-Wall -Wextra -Wnon-virtual-dtor'.split(' '))
- 
-     # Prepend -O# and -g flags so that they can be overriden by the
-     # CFLAGS environment variable
-@@ -132,6 +126,9 @@ def configure(ctx):
-     if Options.options.debug:
-         ctx.env.prepend_value('CXXFLAGS', '-g')
- 
-+    # Fix manpages path for FreeBSD
-+    ctx.env.MANDIR = '%s/man' % ctx.env.PREFIX
-+
-     ctx.env.HAVE_EXTRAS = False
-     if Options.options.extras_path is not None:
-         ctx.env.HAVE_EXTRAS = True
diff --git a/benchmarks/glmark2/pkg-plist b/benchmarks/glmark2/pkg-plist
index 9e4f5edbc1ce..9ecdca0e1592 100644
--- a/benchmarks/glmark2/pkg-plist
+++ b/benchmarks/glmark2/pkg-plist
@@ -1,7 +1,7 @@
 bin/glmark2
 bin/glmark2-es2
-man/man1/glmark2.1.gz
-man/man1/glmark2-es2.1.gz
+share/man/man1/glmark2.1.gz
+share/man/man1/glmark2-es2.1.gz
 %%DATADIR%%/models/asteroid-high.3ds
 %%DATADIR%%/models/asteroid-low.3ds
 %%DATADIR%%/models/bunny.obj
@@ -9,6 +9,7 @@ man/man1/glmark2-es2.1.gz
 %%DATADIR%%/models/cube.3ds
 %%DATADIR%%/models/horse.3ds
 %%DATADIR%%/models/jellyfish.jobj
+%%DATADIR%%/shaders/README.shaders
 %%DATADIR%%/shaders/buffer-wireframe.frag
 %%DATADIR%%/shaders/buffer-wireframe.vert
 %%DATADIR%%/shaders/bump-height.frag
@@ -75,7 +76,6 @@ man/man1/glmark2-es2.1.gz
 %%DATADIR%%/shaders/loop.vert
 %%DATADIR%%/shaders/pulsar-light.vert
 %%DATADIR%%/shaders/pulsar.vert
-%%DATADIR%%/shaders/README.shaders
 %%DATADIR%%/shaders/shadow.frag
 %%DATADIR%%/shaders/shadow.vert
 %%DATADIR%%/shaders/terrain-blur.frag