From owner-svn-ports-all@freebsd.org Mon Dec 2 12:57:00 2019 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 ED08C1A91F9; Mon, 2 Dec 2019 12:57:00 +0000 (UTC) (envelope-from tobik@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) server-signature RSA-PSS (4096 bits) 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 47RQ9m5s8hz3Kfd; Mon, 2 Dec 2019 12:57:00 +0000 (UTC) (envelope-from tobik@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 AD5EA27410; Mon, 2 Dec 2019 12:57:00 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB2Cv0ZO095006; Mon, 2 Dec 2019 12:57:00 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB2Cv0CR095004; Mon, 2 Dec 2019 12:57:00 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201912021257.xB2Cv0CR095004@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 2 Dec 2019 12:57:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518845 - in head/games/ultimatestunts: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/games/ultimatestunts: . files X-SVN-Commit-Revision: 518845 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.29 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: Mon, 02 Dec 2019 12:57:01 -0000 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' 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' 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);