svn commit: r518845 - in head/games/ultimatestunts: . files

[Tobias Kortkamp]

Author: tobik
Date: Mon Dec  2 12:57:00 2019
New Revision: 518845
URL: https://svnweb.freebsd.org/changeset/ports/518845

Log:
  games/ultimatestunts: Unbreak build
  
  udpnet.cpp:61:6: error: no viable conversion from '__bind<int &, sockaddr *, unsigned long>' to 'int'
          int rc = bind (m_Socket, (struct sockaddr *) &MyAddress, sizeof(MyAddress));
              ^    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  http://beefy9.nyi.freebsd.org/data/113amd64-default/518685/logs/errors/ultimatestunts-0.7.7.1_5.log
  
  While here apply r518709 to this port too and link with lld when possible

Added:
  head/games/ultimatestunts/files/patch-simulation_udpnet.cpp   (contents, props changed)
Modified:
  head/games/ultimatestunts/Makefile

Modified: head/games/ultimatestunts/Makefile
==============================================================================
--- head/games/ultimatestunts/Makefile	Mon Dec  2 10:10:43 2019	(r518844)
+++ head/games/ultimatestunts/Makefile	Mon Dec  2 12:57:00 2019	(r518845)
@@ -25,12 +25,16 @@ USE_SDL=	sdl image
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openal
 MAKE_JOBS_UNSAFE=	yes
+# XXX Drop after FreeBSD 12.0 EOL
+.if exists(/usr/lib/clang/6.0.1)
 LLD_UNSAFE=	yes
+.endif
 
 CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
 CXXFLAGS_clang=	-Wno-c++11-narrowing
 CPPFLAGS+=	$$(pkgconf --cflags-only-I sdl)
 LDFLAGS+=	$$(pkgconf --libs-only-L sdl)
+LDFLAGS_i386=	-Wl,-z,notext
 
 PORTDOCS=	*
 OPTIONS_DEFINE=	DOCS NLS

Added: head/games/ultimatestunts/files/patch-simulation_udpnet.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/ultimatestunts/files/patch-simulation_udpnet.cpp	Mon Dec  2 12:57:00 2019	(r518845)
@@ -0,0 +1,15 @@
+udpnet.cpp:61:6: error: no viable conversion from '__bind<int &, sockaddr *, unsigned long>' to 'int'
+        int rc = bind (m_Socket, (struct sockaddr *) &MyAddress, sizeof(MyAddress));
+            ^    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+--- simulation/udpnet.cpp.orig	2019-12-02 12:38:14 UTC
++++ simulation/udpnet.cpp
+@@ -58,7 +58,7 @@ CUDPNet::CUDPNet(unsigned int port)
+ 	MyAddress.sin_addr.s_addr = htonl(INADDR_ANY);
+ 	MyAddress.sin_port = htons(port);
+ 
+-	int rc = bind (m_Socket, (struct sockaddr *) &MyAddress, sizeof(MyAddress));
++	int rc = ::bind (m_Socket, (struct sockaddr *) &MyAddress, sizeof(MyAddress));
+ 	if(rc < 0)
+ 	{
+ 		printf("cannot bind port number %d \n", port);