svn commit: r459428 - in head/games/shaaft: . files

[Alexey Dokuchaev]

Author: danfe
Date: Fri Jan 19 15:08:00 2018
New Revision: 459428
URL: https://svnweb.freebsd.org/changeset/ports/459428

Log:
  Unbreak the port presumably everywhere by not trying to redefine GLintptrARB
  and GLsizeiptrARB: they are already (correctly) defined in <GL/gl.h>.  While
  here, set USE_GL to `gl' instead of old-school, umbrella `yes'.

Added:
  head/games/shaaft/files/patch-utilsgl_gl++.hpp   (contents, props changed)
Modified:
  head/games/shaaft/Makefile

Modified: head/games/shaaft/Makefile
==============================================================================
--- head/games/shaaft/Makefile	Fri Jan 19 15:07:23 2018	(r459427)
+++ head/games/shaaft/Makefile	Fri Jan 19 15:08:00 2018	(r459428)
@@ -15,12 +15,9 @@ LIB_DEPENDS=	libpng.so:graphics/png
 
 CONFLICTS=	criticalmass-*
 
-BROKEN_aarch64=		fails to compile: error: conflicting declaration typedef int GLintptrARB
-BROKEN_sparc64=		does not compile
-
 USES=		tar:bzip2
 USE_SDL=	mixer image sdl
-USE_GL=		yes
+USE_GL=		gl
 USE_GCC=	any
 USE_CXXSTD=	gnu++98
 GNU_CONFIGURE=	yes

Added: head/games/shaaft/files/patch-utilsgl_gl++.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/shaaft/files/patch-utilsgl_gl++.hpp	Fri Jan 19 15:08:00 2018	(r459428)
@@ -0,0 +1,15 @@
+--- utilsgl/gl++.hpp.orig	2004-01-01 04:32:28 UTC
++++ utilsgl/gl++.hpp
+@@ -27,12 +27,6 @@
+ # if defined(_WIN64)
+ 	typedef __int64 GLintptrARB;
+ 	typedef __int64 GLsizeiptrARB;
+-# elif defined(__ia64__) || defined(__x86_64__)
+-	typedef long int GLintptrARB;
+-	typedef long int GLsizeiptrARB;
+-# else
+-	typedef int GLintptrARB;
+-	typedef int GLsizeiptrARB;
+ # endif
+ #endif
+