From owner-svn-ports-all@freebsd.org Sun Nov 15 22:18:57 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 234CA46B906; Sun, 15 Nov 2020 22:18:57 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CZ6750Hvqz3nZW; Sun, 15 Nov 2020 22:18:57 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F0FBF230C7; Sun, 15 Nov 2020 22:18:56 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AFMIume086949; Sun, 15 Nov 2020 22:18:56 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AFMIu4S086947; Sun, 15 Nov 2020 22:18:56 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202011152218.0AFMIu4S086947@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sun, 15 Nov 2020 22:18:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555436 - in head/games/cave9: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/games/cave9: . files X-SVN-Commit-Revision: 555436 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2020 22:18:57 -0000 Author: pkubaj Date: Sun Nov 15 22:18:56 2020 New Revision: 555436 URL: https://svnweb.freebsd.org/changeset/ports/555436 Log: games/cave9: fix build on GCC architectures In file included from display.c:19: /usr/local/include/SDL/SDL_opengl.h:116:1: error: "GL_GLEXT_VERSION" redefined In file included from /usr/local/include/GL/gl.h:2050, from /usr/local/include/SDL/SDL_opengl.h:46, from display.c:19: /usr/local/include/GL/glext.h:54:1: error: this is the location of the previous definition Modified: head/games/cave9/Makefile head/games/cave9/files/patch-src_GNUmakefile Modified: head/games/cave9/Makefile ============================================================================== --- head/games/cave9/Makefile Sun Nov 15 21:49:36 2020 (r555435) +++ head/games/cave9/Makefile Sun Nov 15 22:18:56 2020 (r555436) @@ -18,7 +18,7 @@ USE_GITHUB= yes GH_ACCOUNT= bart9h GH_TAGNAME= e6896eb -USES= gl gmake sdl +USES= compiler:c++11-lang gl gmake sdl USE_SDL= sdl ttf image USE_GL= gl glu Modified: head/games/cave9/files/patch-src_GNUmakefile ============================================================================== --- head/games/cave9/files/patch-src_GNUmakefile Sun Nov 15 21:49:36 2020 (r555435) +++ head/games/cave9/files/patch-src_GNUmakefile Sun Nov 15 22:18:56 2020 (r555436) @@ -6,7 +6,7 @@ -CFLAGS += -std=c99 -Wall -Werror -ggdb `sdl-config --cflags` -LDFLAGS += -lSDL_ttf -lSDL_image `sdl-config --libs` -L/usr/X11/lib -lGL -lGLU -lm -+CFLAGS += -std=c99 -Wall -Werror -isystem ${LOCALBASE}/include `sdl-config --cflags` ++CFLAGS += -std=c99 -Wall -isystem ${LOCALBASE}/include `sdl-config --cflags` +LDFLAGS += -lSDL_ttf -lSDL_image -L${LOCALBASE}/lib `sdl-config --libs` -lGL -lGLU -lm ifdef GLOBAL_SCORE