From owner-svn-ports-head@freebsd.org Fri Jul 22 15:20:20 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 79FEDBA1CC3; Fri, 22 Jul 2016 15:20:20 +0000 (UTC) (envelope-from danfe@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 mx1.freebsd.org (Postfix) with ESMTPS id 5512F1454; Fri, 22 Jul 2016 15:20:20 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6MFKJun044901; Fri, 22 Jul 2016 15:20:19 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6MFKJEi044899; Fri, 22 Jul 2016 15:20:19 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201607221520.u6MFKJEi044899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 22 Jul 2016 15:20:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418923 - in head/games/vegastrike: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jul 2016 15:20:20 -0000 Author: danfe Date: Fri Jul 22 15:20:19 2016 New Revision: 418923 URL: https://svnweb.freebsd.org/changeset/ports/418923 Log: Unbreak the build across the gang. The port (re)defines copysign(), fmin(), and fmax() functions, which conflict with the ones already available in the math library. Simply removing those definitions fixes the issue. While at it, convert to USES+=localbase. The `files/patch-c++' was regenerated with `make makepatch'. Tested on: 9.2, 10.2, -CURRENT Modified: head/games/vegastrike/Makefile head/games/vegastrike/files/patch-c++ Modified: head/games/vegastrike/Makefile ============================================================================== --- head/games/vegastrike/Makefile Fri Jul 22 14:01:13 2016 (r418922) +++ head/games/vegastrike/Makefile Fri Jul 22 15:20:19 2016 (r418923) @@ -13,17 +13,13 @@ COMMENT= Open source 3D space simulator LICENSE= GPLv2 -BROKEN_FreeBSD_10= does not build (numerous C++ errors) -BROKEN_FreeBSD_11= does not build (numerous C++ errors) -BROKEN_FreeBSD_12= does not build (numerous C++ errors) - RUN_DEPENDS= ${DATADIR}/vegastrike.ico:games/vegastrike-data LIB_DEPENDS= libboost_python.so:devel/boost-python-libs \ libexpat.so:textproc/expat2 \ libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg -USES= dos2unix gmake openal:al pkgconfig python tar:bzip2 +USES= dos2unix gmake localbase openal:al pkgconfig python tar:bzip2 GNU_CONFIGURE= yes USE_SDL= sdl USE_GL= glut @@ -33,9 +29,6 @@ USE_GNOME= gtk20 DOS2UNIX_GLOB= *.cpp *.h EXTRACT_AFTER_ARGS= --exclude boost -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - # cegui and ffmpeg are not used yet CONFIGURE_ARGS= --disable-cegui --disable-ffmpeg \ --with-data-dir="${LOCALBASE}/share/${PORTNAME}" \ Modified: head/games/vegastrike/files/patch-c++ ============================================================================== --- head/games/vegastrike/files/patch-c++ Fri Jul 22 14:01:13 2016 (r418922) +++ head/games/vegastrike/files/patch-c++ Fri Jul 22 15:20:19 2016 (r418923) @@ -1,38 +1,65 @@ ---- src/resizable.h 2010-02-25 09:26:53.000000000 -0500 -+++ src/resizable.h 2014-06-07 12:38:44.000000000 -0400 -@@ -1,2 +1,4 @@ +--- objconv/basemaker/base_maker_texture.cpp.orig 2016-07-22 13:40:43 UTC ++++ objconv/basemaker/base_maker_texture.cpp +@@ -1,6 +1,7 @@ + #include "hashtable.h" + #include "base_maker_texture.h" + #include +#include -+ - #include - template < class ITEM > ---- src/cmd/unit_jump.h 2012-03-19 04:20:14.000000000 -0400 -+++ src/cmd/unit_jump.h 2014-06-07 12:46:15.000000000 -0400 -@@ -109,5 +109,5 @@ + #include + #ifdef _WIN32 + #define XMD_H +--- src/cmd/unit_generic.cpp.orig 2016-07-22 13:40:43 UTC ++++ src/cmd/unit_generic.cpp +@@ -630,14 +630,6 @@ void Unit::DeactivateJumpDrive() + jump.drive = -1; + } + +-float copysign( float x, float y ) +-{ +- if (y > 0) +- return x; +- else +- return -x; +-} +- + float rand01() + { + return (float) rand()/(float) RAND_MAX; +--- src/cmd/unit_jump.h.orig 2016-07-22 13:40:44 UTC ++++ src/cmd/unit_jump.h +@@ -108,7 +108,7 @@ bool GameUnit< UnitType >::TransferUnitT + (tester = *i) != NULL; ++i) if (tester->isUnit() == UNITPTR && tester != this) if ( ( this->LocalPosition()-tester->LocalPosition() ).Magnitude() < this->rSize()+tester->rSize() ) - SetCurPosition( this->LocalPosition()+this->cumulative_transformation_matrix.getR() + this->SetCurPosition( this->LocalPosition()+this->cumulative_transformation_matrix.getR() *( 4*( this->rSize()+tester->rSize() ) ) ); DealPossibleJumpDamage( this ); ---- objconv/basemaker/base_maker_texture.cpp 2010-03-09 21:56:23.000000000 -0500 -+++ objconv/basemaker/base_maker_texture.cpp 2014-06-07 12:48:22.000000000 -0400 -@@ -2,4 +2,5 @@ - #include "base_maker_texture.h" - #include -+#include - #include - #ifdef _WIN32 ---- src/gldrv/hashtable_3d.h 2014-06-07 13:28:18.000000000 -0400 -+++ src/gldrv/hashtable_3d.h 2014-06-07 13:51:23.000000000 -0400 -@@ -38,5 +38,5 @@ + static int jumparrive = AUDCreateSound( vs_config->getVariable( "unitaudio", "jumparrive", "sfx43.wav" ), false ); +--- src/cmd/unit_physics.h.orig 2016-07-22 13:40:44 UTC ++++ src/cmd/unit_physics.h +@@ -41,8 +41,6 @@ + #include "networking/lowlevel/vsnet_clientstate.h" + #include "networking/netclient.h" + +-extern float copysign( float x, float y ); +- + extern unsigned int apply_float_to_unsigned_int( float tmp ); //short fix + + template < class UnitType > +--- src/gldrv/hashtable_3d.h.orig 2016-07-22 13:40:44 UTC ++++ src/gldrv/hashtable_3d.h +@@ -37,7 +37,7 @@ class Hashtable3d + } public: ///Hashes a single value to a value on the collide table truncated to all 3d constraints. Consider using a swizzle - int hash_int( const double aye ) + static int hash_int( const double aye ) { return ( (int) ( ( (aye < 0) ? (aye ---- src/networking/lowlevel/packetmem.cpp.orig 2014-06-23 21:30:46 +0800 -+++ src/networking/lowlevel/packetmem.cpp 2014-06-23 21:31:01 +0800 + -COLLIDETABLEACCURACY) : aye ) +--- src/networking/lowlevel/packetmem.cpp.orig 2016-07-22 13:40:44 UTC ++++ src/networking/lowlevel/packetmem.cpp @@ -102,7 +102,7 @@ void PacketMem::inner_set( void* buffer, } else @@ -42,3 +69,39 @@ _len = 0; } } +--- src/physics.h.orig 2016-07-22 13:40:44 UTC ++++ src/physics.h +@@ -27,7 +27,6 @@ + static const float oocc = (float) 0.0000000000000000111265005605; //1/c^2 + static const float c = (float) 299792458.0; + static const float co10 = (float) 29979245.8; +-float copysign( float x, float y ); + + struct Force + { +--- src/resizable.h.orig 2016-07-22 13:40:44 UTC ++++ src/resizable.h +@@ -1,3 +1,5 @@ ++#include ++ + #include + template < class ITEM > + class Resizable +--- src/ship_commands.cpp.orig 2016-07-22 13:40:43 UTC ++++ src/ship_commands.cpp +@@ -5,15 +5,6 @@ + #include "universe_util.h" + #include "gldrv/winsys.h" + +-static inline float fmin( float a, float b ) +-{ +- return (a < b) ? a : b; +-} +-static inline float fmax( float a, float b ) +-{ +- return (a > b) ? a : b; +-} +- + class ShipCommands + { + Functor< ShipCommands > *csetkps;