piglit: fix build

[coypu <coypu%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Sun Aug 26 23:00:04 2018 +0300
Changeset:	f75997cac6be7814a5902000c02d5d62173402aa

Modified Files:
	piglit-git/Makefile
	piglit-git/PLIST
	piglit-git/distinfo
Removed Files:
	piglit-git/patches/patch-CMakeLists.txt
	piglit-git/patches/patch-tests_util_CMakeLists.txt

Log Message:
piglit: fix build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f75997cac6be7814a5902000c02d5d62173402aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 piglit-git/Makefile                                |  2 +
 piglit-git/PLIST                                   |  3 +-
 piglit-git/distinfo                                |  2 -
 piglit-git/patches/patch-CMakeLists.txt            | 55 ----------------------
 piglit-git/patches/patch-tests_util_CMakeLists.txt | 21 ---------
 5 files changed, 3 insertions(+), 80 deletions(-)

diffs:
diff --git a/piglit-git/Makefile b/piglit-git/Makefile
index 67571acd99..4ee04d2d82 100644
--- a/piglit-git/Makefile
+++ b/piglit-git/Makefile
@@ -32,6 +32,8 @@ REPLACE_PYTHON=			piglit piglit-*.py
 GENERATE_PLIST+=	cd ${DESTDIR}${PREFIX} &&			\
 			find lib/piglit \( -type f -or -type l \) -print ;
 
+CMAKE_ARGS+=	-DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
+
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/piglit/lib
 
 .include "../../lang/python/application.mk"
diff --git a/piglit-git/PLIST b/piglit-git/PLIST
index 34dc4692b6..00ba817100 100644
--- a/piglit-git/PLIST
+++ b/piglit-git/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD$
 bin/piglit
 share/doc/piglit/COPYING
-share/doc/piglit/README
+share/doc/piglit/README.md
 share/doc/piglit/RELEASE
diff --git a/piglit-git/distinfo b/piglit-git/distinfo
index f15080acdd..afc76512f4 100644
--- a/piglit-git/distinfo
+++ b/piglit-git/distinfo
@@ -1,4 +1,2 @@
 $NetBSD$
 
-SHA1 (patch-CMakeLists.txt) = 3732172e4b4b7d3a1eeb5adeb18029d5c4483474
-SHA1 (patch-tests_util_CMakeLists.txt) = 54bbdc390aa034513b174bc382325832150b6b09
diff --git a/piglit-git/patches/patch-CMakeLists.txt b/piglit-git/patches/patch-CMakeLists.txt
deleted file mode 100644
index 4a99bf9cc2..0000000000
--- a/piglit-git/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD$
-
---- CMakeLists.txt.orig	2017-02-27 02:30:49.000000000 +0000
-+++ CMakeLists.txt
-@@ -33,11 +33,11 @@ if(X11_FOUND)
- 	add_definitions(-DPIGLIT_HAS_X11)
- endif()
- 
--if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+#if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- 	set(PIGLIT_BUILD_GLES_TESTS_DEFAULT ON)
--else()
--	set(PIGLIT_BUILD_GLES_TESTS_DEFAULT OFF)
--endif()
-+#else()
-+#	set(PIGLIT_BUILD_GLES_TESTS_DEFAULT OFF)
-+#endif()
- 
- option(PIGLIT_BUILD_GL_TESTS "Build tests for OpenGL" ON)
- option(PIGLIT_BUILD_GLES1_TESTS "Build tests for OpenGL ES1" ${PIGLIT_BUILD_GLES_TESTS_DEFAULT})
-@@ -49,11 +49,11 @@ if(PIGLIT_BUILD_GL_TESTS)
- 	find_package(OpenGL REQUIRED)
- endif()
- 
--if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+#if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- 	option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" ON)
--else()
--	option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" OFF)
--endif()
-+#else()
-+#	option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" OFF)
-+#endif()
- 
- if(PIGLIT_USE_WAFFLE)
- 	if (NOT WIN32)
-@@ -128,7 +128,8 @@ if(PIGLIT_BUILD_CL_TESTS)
- 	find_package(OpenCL REQUIRED)
- endif(PIGLIT_BUILD_CL_TESTS)
- 
--IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+#IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+IF("Linux" MATCHES "Linux")
- 	if(X11_FOUND AND OPENGL_gl_LIBRARY)
- 		# Assume the system has GLX. In the future, systems may exist
- 		# with libGL and libX11 but no GLX, but that world hasn't
-@@ -418,7 +419,7 @@ if(HAVE_LIBCACA)
- endif(HAVE_LIBCACA)
- endif(GBM_FOUND)
- 
--if(PIGLIT_USE_WAFFLE AND ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-+if(PIGLIT_USE_WAFFLE)
- 	pkg_check_modules(EGL egl>=11.0)
- endif()
- 
diff --git a/piglit-git/patches/patch-tests_util_CMakeLists.txt b/piglit-git/patches/patch-tests_util_CMakeLists.txt
deleted file mode 100644
index c9969c6b88..0000000000
--- a/piglit-git/patches/patch-tests_util_CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- tests/util/CMakeLists.txt.orig	2017-02-27 02:30:50.000000000 +0000
-+++ tests/util/CMakeLists.txt
-@@ -119,7 +119,7 @@ else()
- 	)
- endif()
- 
--if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+#if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- 	# One needs to have at least one hardware driver present, otherwise
- 	# there is no point compiling just the dispatcher.
- 	if(PIGLIT_BUILD_DMA_BUF_TESTS)
-@@ -158,6 +158,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- 		list(APPEND UTIL_GL_LIBS ${WAYLAND_LIBRARIES})
-         endif()
- 
--endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+#endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- 
- piglit_include_target_api()