Index: head/games/0ad/Makefile =================================================================== --- head/games/0ad/Makefile (revision 402485) +++ head/games/0ad/Makefile (revision 402486) @@ -1,85 +1,94 @@ # $FreeBSD$ PORTNAME= 0ad -PORTVERSION= 0.0.18 -PORTREVISION= 2 +PORTVERSION= 0.0.19 CATEGORIES= games MASTER_SITES= SF/zero-ad/releases DISTFILES= ${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \ ${PORTNAME}-${PORTVERSION}-alpha-unix-data.tar.xz MAINTAINER= madpilot@FreeBSD.org COMMENT= Real-time strategy (RTS) game of ancient warfare BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libpng.so:${PORTSDIR}/graphics/png \ libogg.so:${PORTSDIR}/audio/libogg \ libvorbis.so:${PORTSDIR}/audio/libvorbis \ libcurl.so:${PORTSDIR}/ftp/curl \ - libgamin-1.so:${PORTSDIR}/devel/gamin \ libgloox.so:${PORTSDIR}/net-im/gloox \ libminiupnpc.so:${PORTSDIR}/net/miniupnpc \ libnspr4.so:${PORTSDIR}/devel/nspr \ libenet.so:${PORTSDIR}/net/enet WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha BUILD_WRKSRC= ${WRKSRC}/build/workspaces/gcc MAKE_ARGS= config=release USES= compiler:c++11-lib dos2unix gmake iconv openal:al \ pkgconfig tar:xz -USE_SDL= sdl USE_GNOME= libxml2 gtk20 USE_GL= gl BUNDLE_LIBS= yes DOS2UNIX_REGEX= .*\.([ch]p{0,2}|make) USE_WX= 2.8+ WX_COMPS= wx:lib MAKE_ENV+= JOBS=${_MAKE_JOBS} +OPTIONS_SINGLE= SDL_VERSION +OPTIONS_SINGLE_SDL_VERSION= SDL SDL2 +OPTIONS_DEFAULT= SDL2 + +SDL_VERSION_DESC= SDL version +SDL_DESC= Use SDL 1.2 (deprecated) +SDL2_DESC= Use SDL 2.0 + +SDL_USE= SDL=sdl +SDL_VARS= 0ADSDLARG=--sdl1 +SDL2_USE= SDL=sdl2 + MANUAL_PACKAGE_BUILD= huge PORTDATA= * .include .if ${OSVERSION} < 1000024 BROKEN= segfaults during build .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|%%CC%%|${CC}|' \ ${WRKSRC}/build/premake/premake4.lua .if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == gcc @${REINPLACE_CMD} -e '1055,1251s/-rdynamic/-lssp_nonshared &/' \ -e '1441s/"execinfo",/& "ssp_nonshared",/' \ ${WRKSRC}/build/premake/premake4.lua .endif @${REINPLACE_CMD} 's,^\(Exec=\)/usr/local,\1${PREFIX},' \ ${WRKSRC}/build/resources/0ad.desktop @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \ ${WRKSRC}/build/resources/0ad.sh pre-build: - (cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --with-system-miniupnpc ${SMOPT} --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME}) + (cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh ${0ADSDLARG} --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME}) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/pyrogenesis ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/build/resources/0ad.sh ${STAGEDIR}${PREFIX}/bin/0ad ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/ActorEditor ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.so libCollada.so libnvcore.so libnvimage.so libnvmath.so libnvtt.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libmozjs31-ps-release.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) ${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.png ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/binaries/data && ${COPYTREE_SHARE} "config l10n tests tools" ${STAGEDIR}${DATADIR}) ${MKDIR} ${STAGEDIR}${DATADIR}/mods/public ${STAGEDIR}${DATADIR}/mods/mod ${TAR} xf ${WRKSRC}/binaries/data/mods/public/public.zip -C ${STAGEDIR}${DATADIR}/mods/public --no-same-permissions ${TAR} xf ${WRKSRC}/binaries/data/mods/mod/mod.zip -C ${STAGEDIR}${DATADIR}/mods/mod --no-same-permissions .include Index: head/games/0ad/distinfo =================================================================== --- head/games/0ad/distinfo (revision 402485) +++ head/games/0ad/distinfo (revision 402486) @@ -1,4 +1,4 @@ -SHA256 (0ad-0.0.18-alpha-unix-build.tar.xz) = bd2f04d3269ae9af104626827446a89ea4a0dd4859f89539701fd331cbae0397 -SIZE (0ad-0.0.18-alpha-unix-build.tar.xz) = 26179952 -SHA256 (0ad-0.0.18-alpha-unix-data.tar.xz) = b1a4078eb945ac873accb45c831dbe988866e3559d16bea189eb439c2c71ac44 -SIZE (0ad-0.0.18-alpha-unix-data.tar.xz) = 571228108 +SHA256 (0ad-0.0.19-alpha-unix-build.tar.xz) = 2d43262bbcedbfa19eee23b0e78ae20fc9e0b8f4589855fca95d9908c6839bb3 +SIZE (0ad-0.0.19-alpha-unix-build.tar.xz) = 26192128 +SHA256 (0ad-0.0.19-alpha-unix-data.tar.xz) = 9353f554e94adf66d69e33950f7f2515cfe308eca2c0ad381c6f39f1ad378038 +SIZE (0ad-0.0.19-alpha-unix-data.tar.xz) = 573111260 Index: head/games/0ad/files/patch-source_network_NetServer.cpp =================================================================== --- head/games/0ad/files/patch-source_network_NetServer.cpp (revision 402485) +++ head/games/0ad/files/patch-source_network_NetServer.cpp (nonexistent) @@ -1,19 +0,0 @@ ---- source/network/NetServer.cpp.orig 2015-01-24 14:46:52 UTC -+++ source/network/NetServer.cpp -@@ -228,6 +228,7 @@ void* CNetServerWorker::SetupUPnP(void*) - - int ret = 0; - bool allocatedUrls = false; -+ int error = 0; // Set this for upnpDiscover - - // Try a cached URL first - if (!rootDescURL.empty() && UPNP_GetIGDFromUrl(rootDescURL.c_str(), &urls, &data, internalIPAddress, sizeof(internalIPAddress))) -@@ -236,7 +237,7 @@ void* CNetServerWorker::SetupUPnP(void*) - ret = 1; - } - // No cached URL, or it did not respond. Try getting a valid UPnP device for 10 seconds. -- else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL) -+ else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0,&error)) != NULL) - { - ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress)); - allocatedUrls = ret != 0; // urls is allocated on non-zero return values Property changes on: head/games/0ad/files/patch-source_network_NetServer.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/0ad/files/patch-build__premake__extern_libs4.lua =================================================================== --- head/games/0ad/files/patch-build__premake__extern_libs4.lua (revision 402485) +++ head/games/0ad/files/patch-build__premake__extern_libs4.lua (revision 402486) @@ -1,20 +1,21 @@ ---- build/premake/extern_libs4.lua.orig 2015-02-20 05:52:18 UTC +--- build/premake/extern_libs4.lua.orig 2015-11-19 23:47:41 UTC +++ build/premake/extern_libs4.lua @@ -237,7 +237,7 @@ extern_lib_defs = { end -- TODO: This actually applies to most libraries we use on BSDs, make this a global setting. if os.is("bsd") then - includedirs { "/usr/local/include" } + includedirs { "%%LOCALBASE%%/include" } end end, link_settings = function() -@@ -346,8 +346,6 @@ extern_lib_defs = { +@@ -347,9 +347,6 @@ extern_lib_defs = { elseif os.is("macosx") then add_default_include_paths("iconv") defines { "LIBICONV_STATIC" } - elseif os.getversion().description == "FreeBSD" then - defines { "HAVE_ICONV_CONST" } +- defines { "ICONV_CONST=const" } end end, link_settings = function()