Index: head/games/xonotic/Makefile =================================================================== --- head/games/xonotic/Makefile (revision 439673) +++ head/games/xonotic/Makefile (revision 439674) @@ -1,91 +1,82 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= xonotic -PORTVERSION= 0.8.1 -PORTREVISION= 2 +PORTVERSION= 0.8.2 CATEGORIES= games MASTER_SITES= http://nl.dl.xonotic.org/ \ http://mirror.bitmissile.com/xonotic/releases/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Fast-paced, chaotic, and intense multiplayer first person shooter LIB_DEPENDS= libcurl.so:ftp/curl \ - libpng.so:graphics/png + libpng.so:graphics/png \ + libd0_blind_id.so:security/d0_blind_id \ + libd0_rijndael.so:security/d0_blind_id \ + libode.so:devel/ode -USES= compiler:features jpeg shebangfix zip:infozip +USES= compiler:features gmake jpeg localbase shebangfix zip:infozip SHEBANG_FILES= server/rcon.pl server/rcon2irc/rcon2irc.pl WRKSRC= ${WRKDIR}/Xonotic BUILD_WRKSRC= ${WRKSRC}/source/darkplaces -MAKEFILE= BSDmakefile +MAKEFILE= makefile MAKE_ARGS= DP_FS_BASEDIR="${DATADIR}" \ DP_PRELOAD_DEPENDENCIES=yes \ - CFLAGS_LIBJPEG="-I${LOCALBASE}/include -DLINK_TO_LIBJPEG" \ - OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -funroll-loops" \ + OPTIM_RELEASE="${CFLAGS}" \ STRIP="${STRIP_CMD}" MAKE_JOBS_UNSAFE=yes ALL_TARGET= # empty PORTDATA= * -OPTIONS_DEFINE= ENCRYPTION +OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPTIONS_MULTI= COMPONENTS OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED -OPTIONS_DEFAULT= CLIENT DEDICATED ENCRYPTION +OPTIONS_DEFAULT= CLIENT DEDICATED CLIENT_DESC= Build client -CLIENT_LIB_DEPENDS= libmodplug.so:audio/libmodplug \ - libtheora.so:multimedia/libtheora \ +CLIENT_LIB_DEPENDS= libtheora.so:multimedia/libtheora \ libvorbis.so:audio/libvorbis \ + libvorbisenc.so:audio/libvorbis \ + libvorbisfile.so:audio/libvorbis \ libogg.so:audio/libogg -CLIENT_USE= SDL=sdl XORG=x11 +CLIENT_USE= SDL=sdl2 XORG=x11 CLIENT_ALL_TARGET= sdl-release CLIENT_PLIST_FILES= bin/${PORTNAME} share/pixmaps/${PORTNAME}.ico CLIENT_DESKTOP_ENTRIES= "Xonotic" \ "" \ "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ "${PORTNAME}" \ "Game;Shooter;" \ "" DEDICATED_DESC= Build dedicated server DEDICATED_ALL_TARGET= sv-release DEDICATED_PLIST_FILES= bin/${PORTNAME}-dedicated -ENCRYPTION_DESC= Build encryption (required for stats submission) -ENCRYPTION_LIB_DEPENDS= libd0_rijndael.so:security/d0_blind_id +OPTIMIZED_CFLAGS_CFLAGS= -O3 -fno-strict-aliasing -fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math -.include - -.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} == 42 -# internal compiler error with base gcc -USE_GCC= yes -.endif - post-patch: @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \ - ${BUILD_WRKSRC}/${MAKEFILE} ${BUILD_WRKSRC}/makefile.inc - @${REINPLACE_CMD} -e '/LDFLAGS_BSDSV/s,$$,-L${LOCALBASE}/lib,' \ - ${BUILD_WRKSRC}/makefile.inc - @${ECHO_CMD} >> ${BUILD_WRKSRC}/prvm_offsets.h # silence 'no newline' warnings + ${BUILD_WRKSRC}/makefile ${BUILD_WRKSRC}/makefile.inc do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/data ${INSTALL_DATA} ${WRKSRC}/data/*.pk3 ${STAGEDIR}${DATADIR}/data/ do-install-CLIENT-on: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-sdl ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/misc/logos/icons_ico/xonotic.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ do-install-DEDICATED-on: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-dedicated ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-dedicated cd ${WRKSRC} && ${COPYTREE_SHARE} "server" ${STAGEDIR}${DATADIR}/ # Fixup lost +x permissions on scripts after COPYTREE_SHARE ${FIND} ${STAGEDIR}${DATADIR}/server -type f -name *.sh -o -name rcon*.pl | \ ${XARGS} ${CHMOD} +x do-install-ENCRYPTION-on: ${INSTALL_DATA} ${WRKSRC}/key_0.d0pk ${STAGEDIR}${DATADIR}/ -.include +.include Index: head/games/xonotic/distinfo =================================================================== --- head/games/xonotic/distinfo (revision 439673) +++ head/games/xonotic/distinfo (revision 439674) @@ -1,2 +1,3 @@ -SHA256 (xonotic-0.8.1.zip) = be8bcc41e2993a2f26d4d04c65a7eab810443bd98b11b45e482ffdbbf284c46f -SIZE (xonotic-0.8.1.zip) = 984854761 +TIMESTAMP = 1491306088 +SHA256 (xonotic-0.8.2.zip) = a22f7230f486c5825b55cfdadd73399c9b0fae98c9e081dd8ac76eca08359ad5 +SIZE (xonotic-0.8.2.zip) = 991045679 Index: head/games/xonotic/files/patch-source__darkplaces__BSDmakefile =================================================================== --- head/games/xonotic/files/patch-source__darkplaces__BSDmakefile (revision 439673) +++ head/games/xonotic/files/patch-source__darkplaces__BSDmakefile (nonexistent) @@ -1,11 +0,0 @@ ---- source/darkplaces/BSDmakefile.orig 2015-08-25 12:10:24 UTC -+++ source/darkplaces/BSDmakefile -@@ -158,7 +158,7 @@ LIB_SOUND=$(LIB_SND_BSD) - - CFLAGS_MAKEDEP=-MD - .ifdef DP_FS_BASEDIR --CFLAGS_FS=-DDP_FS_BASEDIR='\"$(DP_FS_BASEDIR)\"' -+CFLAGS_FS=-DDP_FS_BASEDIR='\\\"$(DP_FS_BASEDIR)\\\"' - .else - CFLAGS_FS= - .endif Property changes on: head/games/xonotic/files/patch-source__darkplaces__BSDmakefile ___________________________________________________________________ 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/xonotic/files/patch-source_darkplaces_makefile =================================================================== --- head/games/xonotic/files/patch-source_darkplaces_makefile (nonexistent) +++ head/games/xonotic/files/patch-source_darkplaces_makefile (revision 439674) @@ -0,0 +1,15 @@ +--- source/darkplaces/makefile.orig 2017-04-05 10:52:46 UTC ++++ source/darkplaces/makefile +@@ -234,9 +234,9 @@ endif + + DP_LINK_ZLIB?=shared + DP_LINK_JPEG?=shared +- DP_LINK_ODE?=dlopen +- DP_LINK_CRYPTO?=dlopen +- DP_LINK_CRYPTO_RIJNDAEL?=dlopen ++ DP_LINK_ODE?=shared ++ DP_LINK_CRYPTO?=shared ++ DP_LINK_CRYPTO_RIJNDAEL?=shared + endif + + # Win32 configuration Property changes on: head/games/xonotic/files/patch-source_darkplaces_makefile ___________________________________________________________________ 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