Index: head/games/dunelegacy/Makefile =================================================================== --- head/games/dunelegacy/Makefile (revision 445039) +++ head/games/dunelegacy/Makefile (revision 445040) @@ -1,25 +1,23 @@ # Created by: Steve Wills # $FreeBSD$ PORTNAME= dunelegacy -PORTVERSION= 0.96.3 -PORTREVISION= 3 +PORTVERSION= 0.96.4 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= swills@FreeBSD.org COMMENT= Open source clone of Dune II LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_powerpc64= fails to compile: functional.h: 'std::bind' has not been declared -USES= autoreconf compiler:c++11-lib tar:bzip2 +USES= autoreconf compiler:c++11-lib tar:bzip2 pkgconfig GNU_CONFIGURE= yes -USE_SDL= sdl mixer +USE_SDL= sdl2 mixer2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAKE_JOBS_UNSAFE= yes .include Index: head/games/dunelegacy/distinfo =================================================================== --- head/games/dunelegacy/distinfo (revision 445039) +++ head/games/dunelegacy/distinfo (revision 445040) @@ -1,2 +1,3 @@ -SHA256 (dunelegacy-0.96.3-src.tar.bz2) = 677159c174d9f9e8eb20e5e5cec997decf8e5a7091dc1583dc23fe340c5f6222 -SIZE (dunelegacy-0.96.3-src.tar.bz2) = 1652302 +TIMESTAMP = 1497803155 +SHA256 (dunelegacy-0.96.4-src.tar.bz2) = 4740df9e94712b34f5d6fa1ca3c24658c4808b40431aa156ed66c318be9f4de8 +SIZE (dunelegacy-0.96.4-src.tar.bz2) = 2513167 Index: head/games/dunelegacy/files/patch-include__misc__memory.h =================================================================== --- head/games/dunelegacy/files/patch-include__misc__memory.h (revision 445039) +++ head/games/dunelegacy/files/patch-include__misc__memory.h (nonexistent) @@ -1,18 +0,0 @@ ---- ./include/misc/memory.h.orig 2011-07-15 23:19:01.000000000 +0000 -+++ ./include/misc/memory.h 2014-08-15 18:13:48.594576019 +0000 -@@ -1,12 +1,12 @@ - #ifndef MEMORY_INCLUDED - #define MEMORY_INCLUDED - --#include -+#include - - namespace std { -- using std::tr1::shared_ptr; -+ using std::shared_ptr; - -- using std::tr1::dynamic_pointer_cast; -+ using std::dynamic_pointer_cast; - } - - #endif //MEMORY_INCLUDED Property changes on: head/games/dunelegacy/files/patch-include__misc__memory.h ___________________________________________________________________ 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/dunelegacy/files/patch-include__misc__functional.h =================================================================== --- head/games/dunelegacy/files/patch-include__misc__functional.h (revision 445039) +++ head/games/dunelegacy/files/patch-include__misc__functional.h (nonexistent) @@ -1,21 +0,0 @@ ---- ./include/misc/functional.h.orig 2011-01-07 18:30:22.000000000 +0000 -+++ ./include/misc/functional.h 2014-08-15 18:13:48.592575865 +0000 -@@ -1,14 +1,14 @@ - #ifndef FUNCTIONAL_INCLUDED - #define FUNCTIONAL_INCLUDED - --#include -+#include - - namespace std { -- using std::tr1::bind; -- using std::tr1::function; -+ using std::bind; -+ using std::function; - - namespace placeholders { -- using namespace std::tr1::placeholders; -+ using namespace std::placeholders; - } - } - Property changes on: head/games/dunelegacy/files/patch-include__misc__functional.h ___________________________________________________________________ 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/dunelegacy/files/patch-configure.ac =================================================================== --- head/games/dunelegacy/files/patch-configure.ac (revision 445039) +++ head/games/dunelegacy/files/patch-configure.ac (revision 445040) @@ -1,32 +1,32 @@ ---- configure.ac.orig 2014-08-15 18:38:46.000000000 +0000 -+++ configure.ac 2014-08-15 18:40:54.000000000 +0000 -@@ -16,13 +16,25 @@ +--- configure.ac.orig 2016-12-26 20:59:49.000000000 +0000 ++++ configure.ac 2017-07-04 16:35:44.818612000 +0000 +@@ -18,14 +18,23 @@ AC_SUBST(dunelegacydatadir) -dnl Some flags for gcc --CXXFLAGS="-O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -DNDEBUG" - dnl Additional flags: -Wconversion -Wno-sign-conversion - --dnl Some flags for clang --dnl CXXFLAGS="-O3 -pipe -pedantic -Weverything -Wno-sign-conversion -Wno-conversion -Wno-shadow -Wno-missing-noreturn -Wno-padded -Wno-packed -Wno-weak-vtables -Wno-c++11-narrowing -Wno-cast-align -Wno-unreachable-code -Wno-missing-prototypes -Wno-float-equal -Wno-global-constructors -Wno-exit-time-destructors -Wno-format-nonliteral -Wno-unused-macros -Wextra -Wno-unused-parameter" +-CXXFLAGS="-std=c++11 -pthread -fPIC -O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -Wno-shift-negative-value -DNDEBUG" +-CFLAGS="-std=c99 -pthread -fPIC -O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -Wno-shift-negative-value -DNDEBUG" +-dnl Additional flags: -Wconversion -Wno-sign-conversion -Wlogical-op +AC_MSG_CHECKING([if compiling with clang]) +-dnl Some flags for clang +-dnl CXXFLAGS="-std=c++11 -O3 -pipe -pedantic -Weverything -Wno-sign-conversion -Wno-conversion -Wno-shadow -Wno-missing-noreturn -Wno-padded -Wno-packed -Wno-weak-vtables -Wno-c++11-narrowing -Wno-cast-align -Wno-unreachable-code -Wno-missing-prototypes -Wno-float-equal -Wno-global-constructors -Wno-exit-time-destructors -Wno-format-nonliteral -Wno-unused-macros -Wreserved-id-macro -Wextra -Wno-unused-parameter -Wno-narrowing" +AC_COMPILE_IFELSE( +[AC_LANG_PROGRAM([], [[ +#ifndef __clang__ + not clang +#endif +]])], +[CLANG=yes], [CLANG=no]) -+ + +AC_MSG_RESULT([$CLANG]) + +if test "x$CLANG" = xyes; then + CXXFLAGS="-std=c++11 -O3 -pipe -pedantic -Weverything -Wno-sign-conversion -Wno-conversion -Wno-shadow -Wno-missing-noreturn -Wno-padded -Wno-packed -Wno-weak-vtables -Wno-c++11-narrowing -Wno-cast-align -Wno-unreachable-code -Wno-missing-prototypes -Wno-float-equal -Wno-global-constructors -Wno-exit-time-destructors -Wno-format-nonliteral -Wno-unused-macros -Wextra -Wno-unused-parameter" +else + CXXFLAGS="-O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -DNDEBUG" +fi - dnl test for -ffp-contract=off (gcc >= 4.6) and use -mno-fused-madd instead - oldCFLAGS="$CFLAGS" + AC_ARG_ENABLE([debug], + [AS_HELP_STRING([--enable-debug], Index: head/games/dunelegacy/pkg-plist =================================================================== --- head/games/dunelegacy/pkg-plist (revision 445039) +++ head/games/dunelegacy/pkg-plist (revision 445040) @@ -1,28 +1,57 @@ bin/dunelegacy %%DATADIR%%/Dune2-Versions.txt +%%DATADIR%%/GFXHD.PAK %%DATADIR%%/LEGACY.PAK %%DATADIR%%/OPENSD2.PAK %%DATADIR%%/locale/English.en.po %%DATADIR%%/locale/French.fr.po %%DATADIR%%/locale/German.de.po +%%DATADIR%%/locale/Spanish.es.po %%DATADIR%%/locale/dunelegacy.pot +%%DATADIR%%/maps/multiplayer/2P - 32x128 - Gatekeeper.ini %%DATADIR%%/maps/multiplayer/2P - 32x32 - X-Factor.ini %%DATADIR%%/maps/multiplayer/2P - 64x32 - Cliffs Of Rene.ini %%DATADIR%%/maps/multiplayer/2P - 64x64 - Bottle Neck.ini %%DATADIR%%/maps/multiplayer/2P - 64x64 - Broken Mountains.ini %%DATADIR%%/maps/multiplayer/2P - 64x64 - David's Pass.ini %%DATADIR%%/maps/multiplayer/2P - 64x64 - Face Off.ini %%DATADIR%%/maps/multiplayer/2P - 64x64 - Great Divide.ini %%DATADIR%%/maps/multiplayer/2P - 64x64 - Sanctuarys.ini +%%DATADIR%%/maps/multiplayer/4P - 128x128 - Deserted.ini +%%DATADIR%%/maps/multiplayer/4P - 128x128 - Equilibrium.ini +%%DATADIR%%/maps/multiplayer/4P - 128x128 - Four Cities.ini +%%DATADIR%%/maps/multiplayer/4P - 128x128 - Hungry Hippos.ini +%%DATADIR%%/maps/multiplayer/4P - 128x128 - Silicon Valley XL.ini +%%DATADIR%%/maps/multiplayer/4P - 128x128 - Snake Pass.ini +%%DATADIR%%/maps/multiplayer/4P - 128x128 - Spicestorm.ini %%DATADIR%%/maps/multiplayer/4P - 128x128 - The Sardaukar Outpost.ini +%%DATADIR%%/maps/multiplayer/4P - 128x128 - Worm Investation.ini +%%DATADIR%%/maps/multiplayer/4P - 128x128 - Wormhole.ini +%%DATADIR%%/maps/multiplayer/4P - 128x64 - Gamma Sector.ini +%%DATADIR%%/maps/multiplayer/4P - 64x64 - Channels.ini %%DATADIR%%/maps/multiplayer/4P - 64x64 - Clear Path.ini +%%DATADIR%%/maps/multiplayer/4P - 64x64 - Combed.ini %%DATADIR%%/maps/multiplayer/4P - 64x64 - Four Chambers.ini %%DATADIR%%/maps/multiplayer/4P - 64x64 - Four Courners.ini %%DATADIR%%/maps/multiplayer/4P - 64x64 - Sietch Stefan.ini +%%DATADIR%%/maps/multiplayer/4P - 64x64 - Silicon Valley.ini +%%DATADIR%%/maps/multiplayer/4P - 64x64 - Stronghold.ini %%DATADIR%%/maps/multiplayer/4P - 64x64 - Vast Armies Have Arrived.ini +%%DATADIR%%/maps/multiplayer/5P - 128x128 - Fortress.ini +%%DATADIR%%/maps/multiplayer/5P - 128x128 - Gridlocked.ini +%%DATADIR%%/maps/multiplayer/5P - 128x128 - Hellvetika.ini +%%DATADIR%%/maps/multiplayer/5P - 128x128 - Kragetam.ini +%%DATADIR%%/maps/multiplayer/5P - 128x128 - Meadow.ini +%%DATADIR%%/maps/multiplayer/5P - 128x64 - Watch Your Track.ini +%%DATADIR%%/maps/multiplayer/6P - 128x128 - Gargantuan Mountains.ini +%%DATADIR%%/maps/multiplayer/6P - 64x128 - Rocking Fields.ini +%%DATADIR%%/maps/multiplayer/6P - 64x64 - Fertile Basin.ini %%DATADIR%%/maps/singleplayer/2P - 32x128 - Canyon.ini %%DATADIR%%/maps/singleplayer/2P - 64x64 - Duality.ini %%DATADIR%%/maps/singleplayer/2P - 64x64 - North vs. South.ini %%DATADIR%%/maps/singleplayer/2P - 64x64 - Twin Fists.ini %%DATADIR%%/maps/singleplayer/3P - 64x32 - Middle Man.ini +%%DATADIR%%/maps/singleplayer/4P - 64x64 - 3 vs 1.ini %%DATADIR%%/maps/singleplayer/5P - 128x128 - All against Atreides.ini +%%DATADIR%%/maps/singleplayer/5P - 128x128 - Sardaukar Base Easy.ini +%%DATADIR%%/maps/singleplayer/5P - 128x128 - Sardaukar Base.ini