Index: head/games/ultimatestunts/Makefile =================================================================== --- head/games/ultimatestunts/Makefile (revision 518844) +++ head/games/ultimatestunts/Makefile (revision 518845) @@ -1,79 +1,83 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= ultimatestunts PORTVERSION= 0.7.7.1 PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/sourcecode \ SF/nemysisfreebsdp/${CATEGORIES}/:icons DISTNAME= ${PORTNAME}-srcdata-${PORTVERSION:S/.//g} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}_icons${EXTRACT_SUFX}:icons MAINTAINER= ports@FreeBSD.org COMMENT= Racing game with elaborate stunts LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libvorbisfile.so:audio/libvorbis USES= compiler gettext gl gnome openal:al,alut pkgconfig sdl USE_GL= gl glu 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 OPTIONS_SUB= yes INSTALLS_ICONS= yes ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 128x128 DESKTOP_ENTRIES="Ultimate Stunts" "" "${PORTNAME}" \ "ustunts" "Game;ArcadeGame;" "" .include post-extract: @${FIND} ${WRKSRC} -name .svn -print0 | ${XARGS} -0 ${RM} -r @(cd ${WRKSRC} && ${CP} ${PORTNAME}.conf.in ${PORTNAME}.conf) post-patch: ${REINPLACE_CMD} -e 's|@usdatadir@|${DATADIR}|; \ s|@PACKAGE_VERSION@|${PORTVERSION:R}|' \ ${WRKSRC}/${PORTNAME}.conf ${REINPLACE_CMD} -e 's|^localedir.*|localedir = ${DATADIR}/lang|' \ ${WRKSRC}/po/Makefile.in.in ${REINPLACE_CMD} -e 's|$${usdatadir}|${STAGEDIR}${DATADIR}|; \ s|lang ||' \ ${WRKSRC}/data/Makefile.in .if ! ${PORT_OPTIONS:MNLS} ${REINPLACE_CMD} -e 's|install-exec install-data|install-exec|' \ ${WRKSRC}/po/Makefile.in.in .endif post-install: .for s in ${ICON_SIZES} @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png .endfor ${RLN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps .if ${PORT_OPTIONS:MDOCS} @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .endif .include Index: head/games/ultimatestunts/files/patch-simulation_udpnet.cpp =================================================================== --- head/games/ultimatestunts/files/patch-simulation_udpnet.cpp (nonexistent) +++ head/games/ultimatestunts/files/patch-simulation_udpnet.cpp (revision 518845) @@ -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); Property changes on: head/games/ultimatestunts/files/patch-simulation_udpnet.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property