Date: Mon, 14 Dec 2015 14:22:08 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403724 - in head/games/warzone2100: . files Message-ID: <201512141422.tBEEM8mW012490@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Dec 14 14:22:08 2015 New Revision: 403724 URL: https://svnweb.freebsd.org/changeset/ports/403724 Log: - Switch to USES=localbase which fixes picking up includes from net/miniupnpc instead of bundled miniupnpc - While here, clarify license Modified: head/games/warzone2100/Makefile head/games/warzone2100/files/patch-lib__ivis_opengl__screen.cpp head/games/warzone2100/files/patch-lib__netplay__netsocket.cpp Modified: head/games/warzone2100/Makefile ============================================================================== --- head/games/warzone2100/Makefile Mon Dec 14 13:52:11 2015 (r403723) +++ head/games/warzone2100/Makefile Mon Dec 14 14:22:08 2015 (r403724) @@ -8,7 +8,7 @@ MASTER_SITES= SF/${PORTNAME}/releases/${ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Innovative 3D real-time strategy game -LICENSE= GPLv2 +LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ @@ -22,7 +22,7 @@ LIB_DEPENDS= libphysfs.so:${PORTSDIR}/de libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu -USES= tar:xz bison gmake openal:al pkgconfig compiler:c++11-lang # actually, old gcc fails on unknown -W flag +USES= bison compiler:c++11-lang gmake localbase openal:al pkgconfig tar:xz # actually, old gcc fails on unknown -W flag GNU_CONFIGURE= yes USE_GL= glew glu USE_SDL= sdl @@ -32,8 +32,6 @@ CONFIGURE_ARGS= --program-transform-name CONFIGURE_ENV= PATH="${LOCALBASE}/bin:$$PATH" \ CCOMPILER="${CC}" \ CXXCOMPILER="${CXX}" -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib REINPLACE_ARGS= -i '' PORTDOCS= * Modified: head/games/warzone2100/files/patch-lib__ivis_opengl__screen.cpp ============================================================================== --- head/games/warzone2100/files/patch-lib__ivis_opengl__screen.cpp Mon Dec 14 13:52:11 2015 (r403723) +++ head/games/warzone2100/files/patch-lib__ivis_opengl__screen.cpp Mon Dec 14 14:22:08 2015 (r403724) @@ -1,6 +1,6 @@ ---- lib/ivis_opengl/screen.cpp.orig 2013-12-12 06:20:34.000000000 +0400 -+++ lib/ivis_opengl/screen.cpp 2014-08-18 16:11:06.000000000 +0400 -@@ -261,7 +261,7 @@ +--- lib/ivis_opengl/screen.cpp.orig 2013-12-12 02:20:34 UTC ++++ lib/ivis_opengl/screen.cpp +@@ -261,7 +261,7 @@ void screen_EnableMissingFunctions() __glewUseProgram = __glewUseProgramObjectARB; __glewGetShaderiv = __glewGetObjectParameterivARB; __glewLinkProgram = __glewLinkProgramARB; Modified: head/games/warzone2100/files/patch-lib__netplay__netsocket.cpp ============================================================================== --- head/games/warzone2100/files/patch-lib__netplay__netsocket.cpp Mon Dec 14 13:52:11 2015 (r403723) +++ head/games/warzone2100/files/patch-lib__netplay__netsocket.cpp Mon Dec 14 14:22:08 2015 (r403724) @@ -1,6 +1,6 @@ ---- lib/netplay/netsocket.cpp.orig 2013-01-15 03:54:07.000000000 +0400 -+++ lib/netplay/netsocket.cpp 2013-01-18 19:32:35.110932805 +0400 -@@ -1399,9 +1399,6 @@ +--- lib/netplay/netsocket.cpp.orig 2013-11-24 01:25:10 UTC ++++ lib/netplay/netsocket.cpp +@@ -1399,9 +1399,6 @@ SocketAddress *resolveHost(const char *h hint.ai_family = AF_UNSPEC; hint.ai_socktype = SOCK_STREAM; hint.ai_protocol = 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512141422.tBEEM8mW012490>