16:17 jbeich 

games/assaultcube: unbreak build with newer C++ library

- Add upstream fixes for clang/libc++ 3.8 and gcc/libstdc++ 6.0
- Remove merged files/patch-source_src_bot_bot_waypoint.cpp file
- Bump PORTREVISION

In file included from crypto.cpp:1:
In file included from ./cube.h:8:
./tools.h:58:21: error: static declaration of 'round' follows non-static
declaration
static inline float round(float x) { return floor(x + 0.5f); }
			^
/usr/include/c++/v1/math.h:1364:46: note: previous definition is here
inline _LIBCPP_INLINE_VISIBILITY float       round(float __lcpp_x) _NOEXCEPT
   {return roundf(__lcpp_x);}
						 ^
In file included from cube.h:8:0,
		     from crypto.cpp:1:
tools.h: In function 'float round(float)':
tools.h:58:34: error: 'float round(float)' conflicts with a previous declaration
 static inline float round(float x) { return floor(x + 0.5f); }
				      ^
In file included from /usr/local/lib/gcc6/include/c++/math.h:36:0,
		     from platform.h:9,
		     from cube.h:7,
		     from crypto.cpp:1:
/usr/local/lib/gcc6/include/c++/cmath:1708:3: note: previous declaration
'constexpr float std::round(float)'
   round(float __x)
   ^~~~~

PR:		208754
Reported by:	dim (libc++), lightside (libstdc++)
Submitted by:	lightside <lightside@gmx.com> (maintainer)

 

11:16 jbeich 

games/assaultcube: unbreak on DragonFly and the package cluster

- Disable PCH (precompiled header) to unbreak build with GCC in
  jails for older branches and recent 11.0C kernel
- Add upstream patch for bundled libenet to unbreak build on DragonFly [1]
- Convert patch for ${BUILD_WRKSRC}/Makefile into sed(1) variant
- Pet portlint since r383894 by formatting patches with makepatch target

PR:		199912
Submitted by:	lightside <lightside@gmx.com> (maintainer)
Obtained from:	https://github.com/lsalzman/enet/commit/8df6e58 [1]

 

11:51 jbeich 

Improve style, consistency and fix minor issues in Cube-based ports

- Convert to option helpers
- Drop unused libGLU dependency (except for games/cube)
- Track direct dependency on libX11 (for XFetchBytes)
- Drop redundant MKDIR before COPYTREE_* macros [1]
- Wrap cd related commands with parentheses [1]
- Wrap lines exceeding 80 characters
- Bump PORTREVISION to pick up changes in dependencies, plist (assaultcube)
  and catch regressions early [1]
- games/assaultcube: CLIENT uses openal/vorbisfile *instead* of SDL_mixer
- games/assaultcube: drop unused gettext-tools dependency [1]
- games/assaultcube: convert to PLIST_DIRS [1]
- games/assaultcube: add patch for source/src/bot/bot_waypoint.cpp
  file to fix "invalid source encoding" warning [1]

(Only the first 15 lines of the commit message are shown above )