Here is an update to Warzone 2100 3.1.1. OK?
Index: Makefile =================================================================== RCS file: /home/cvs/ports/games/warzone2100/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile 4 Jun 2013 18:41:45 -0000 1.22 +++ Makefile 17 Dec 2013 09:00:56 -0000 @@ -4,8 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386 COMMENT= 3D realtime strategy on a future earth -DISTNAME= warzone2100-3.1.0 -REVISION= 0 +DISTNAME= warzone2100-3.1.1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/} EXTRACT_SUFX= .tar.xz @@ -15,9 +14,9 @@ HOMEPAGE= http://wz2100.net/ # GPLv2+ PERMIT_PACKAGE_CDROM= Yes -WANTLIB += GL GLEW GLU QtNetwork QtScript SDL X11 Xrandr c expat -WANTLIB += fontconfig freetype fribidi m ogg openal physfs png -WANTLIB += pthread stdc++ theora vorbis vorbisfile z +WANTLIB += GL GLEW GLU QtNetwork QtScript SDL X11 Xrandr c fontconfig +WANTLIB += freetype fribidi m ogg openal physfs png pthread stdc++ +WANTLIB += theora vorbis vorbisfile z MODULES= devel/gettext \ x11/qt4 @@ -31,20 +30,16 @@ LIB_DEPENDS= audio/libogg \ graphics/png \ multimedia/libtheora BUILD_DEPENDS= archivers/unzip \ - archivers/zip \ - devel/bison \ - devel/flex + archivers/zip RUN_DEPENDS= devel/desktop-file-utils USE_GMAKE= Yes CONFIGURE_STYLE= autoconf -AUTOCONF_VERSION= 2.69 +AUTOCONF_VERSION= 2.68 CONFIGURE_ARGS+= --with-distributor="OpenBSD" CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig:${X11BASE}/lib/pkgconfig:${LOCALBASE}/lib/pkgconfig:${LOCALBASE}/lib/qt4/pkgconfig" \ - YACC="bison -y" \ - ac_cv_prog_LEX="flex" \ ac_cv_path_MOC4="${LOCALBASE}/bin/moc4" \ ac_cv_path_UIC4="${LOCALBASE}/bin/uic4" Index: distinfo =================================================================== RCS file: /home/cvs/ports/games/warzone2100/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 21 Jan 2013 16:37:41 -0000 1.6 +++ distinfo 17 Dec 2013 09:01:57 -0000 @@ -1,2 +1,2 @@ -SHA256 (warzone2100-3.1.0.tar.xz) = w+JLCicD/+WxcUAeDrney+mxMNZHjmQwDM+3OmD2HAM= -SIZE (warzone2100-3.1.0.tar.xz) = 67316000 +SHA256 (warzone2100-3.1.1.tar.xz) = yTei4sev2tALAHZ2NiNLvsTYsY77AIBzRFQ50y7bds8= +SIZE (warzone2100-3.1.1.tar.xz) = 85749512 Index: patches/patch-build_tools_autorevision =================================================================== RCS file: patches/patch-build_tools_autorevision diff -N patches/patch-build_tools_autorevision --- patches/patch-build_tools_autorevision 21 Jan 2013 16:37:41 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-build_tools_autorevision,v 1.1 2013/01/21 16:37:41 pascal Exp $ ---- build_tools/autorevision.orig Tue Jan 15 00:54:06 2013 -+++ build_tools/autorevision Mon Jan 21 00:34:28 2013 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # Copyright (c) 2012 dak180 - # See http://opensource.org/licenses/bsd-license.php for licence terms -@@ -577,7 +577,7 @@ EOF - # Detect and collect repo data. - if [[ -f "${CACHEFILE}" ]] && [[ "${CACHEFORCE}" = "1" ]]; then - # When requested only read from the cache to populate our symbols. -- source "${CACHEFILE}" -+ . "${CACHEFILE}" - elif [[ ! -z "$(git rev-parse HEAD 2>/dev/null)" ]]; then - gitRepo - elif [[ ! -z "$(hg root 2>/dev/null)" ]]; then -@@ -588,7 +588,7 @@ elif [[ ! -z "$(svn info 2>/dev/null)" ]]; then - svnRepo - elif [[ -f "${CACHEFILE}" ]]; then - # We are not in a repo; try to use a previously generated cache to populate our symbols. -- source "${CACHEFILE}" -+ . "${CACHEFILE}" - else - echo "error: No repo or cache detected." 1>&2 - exit 1 Index: patches/patch-configure_ac =================================================================== RCS file: /home/cvs/ports/games/warzone2100/patches/patch-configure_ac,v retrieving revision 1.7 diff -u -p -r1.7 patch-configure_ac --- patches/patch-configure_ac 30 Jan 2013 01:40:49 -0000 1.7 +++ patches/patch-configure_ac 5 Dec 2013 21:21:11 -0000 @@ -1,33 +1,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2013/01/30 01:40:49 brad Exp $ ---- configure.ac.orig Mon Jan 14 18:54:06 2013 -+++ configure.ac Tue Jan 22 22:04:29 2013 -@@ -81,7 +81,7 @@ AX_CHECK_STRLCAT - AX_STACK_PROTECT_CC - AX_STACK_PROTECT_CXX - --AC_CHECK_HEADERS(alloca.h) -+AC_CHECK_HEADERS(alloca.h sys/ucontext.h) - - # Check for gettext - AM_GNU_GETTEXT([external]) -@@ -135,15 +135,11 @@ case ${host_os} in - AC_SUBST([WIN32_LIBS], [${WIN32_LIBS}]) - LDFLAGS="-Wl,-subsystem,windows ${LDFLAGS}" - ;; -- *openbsd*) -- AC_DEFINE([_XOPEN_SOURCE], 600, [Enable POSIX extensions if present]) -- # Make sure that backtrace_symbols_fd (GNU raw back trace extension) has some symbols to work with -- LDFLAGS="-Wl,-export-dynamic ${LDFLAGS}" -- ;; - *) - # Some platforms don't need _XOPEN_SOURCE - case ${host_os} in - *freebsd*) ;; -+ *openbsd*) ;; - *) - AC_DEFINE([_XOPEN_SOURCE], 600, [Enable POSIX extensions if present]) - ;; -@@ -292,7 +288,7 @@ fi +--- configure.ac.orig Sat Nov 23 20:25:10 2013 ++++ configure.ac Thu Dec 5 16:20:39 2013 +@@ -283,7 +283,7 @@ fi WZ_WARNINGS_GCC="-Wall -Wextra ${WZ_Wno_}unused-parameter ${WZ_Wno_}sign-compare -Wcast-align -Wwrite-strings -Wpointer-arith ${WZ_Wno_}format-security" WZ_WARNINGS_GCC_C="${WZ_WARNINGS_GCC} -Wstrict-prototypes -Wdeclaration-after-statement ${CFLAGS_IGNORE_WARNINGS}" Index: patches/patch-lib_exceptionhandler_exceptionhandler_cpp =================================================================== RCS file: patches/patch-lib_exceptionhandler_exceptionhandler_cpp diff -N patches/patch-lib_exceptionhandler_exceptionhandler_cpp --- patches/patch-lib_exceptionhandler_exceptionhandler_cpp 30 Jan 2013 01:40:49 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-lib_exceptionhandler_exceptionhandler_cpp,v 1.2 2013/01/30 01:40:49 brad Exp $ ---- lib/exceptionhandler/exceptionhandler.cpp.orig Mon Jan 14 18:54:07 2013 -+++ lib/exceptionhandler/exceptionhandler.cpp Tue Jan 22 22:10:44 2013 -@@ -121,7 +121,9 @@ static LONG WINAPI windowsExceptionHandler(PEXCEPTION_ - # include <sys/types.h> - # include <sys/stat.h> - # include <sys/wait.h> -+#ifdef HAVE_SYS_UCONTEXT_H - # include <sys/ucontext.h> -+#endif - # include <sys/utsname.h> - #ifdef WZ_OS_LINUX - # include <sys/prctl.h> -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.