On Mon, Jan 21, 2013 at 01:44:47AM +0100, Pascal Stumpf wrote:
> On Mon, 21 Jan 2013 01:13:03 +0100, Pascal Stumpf wrote:
> > Update to 3.1.0, tested on amd64.
>
> Forgot two patches.
Newer diff. Just kept the depends in sorted order.
ok brad@
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 7 Nov 2011 13:55:44 -0000 1.18
+++ Makefile 21 Jan 2013 01:44:48 -0000
@@ -4,9 +4,10 @@ ONLY_FOR_ARCHS= amd64 i386
COMMENT= 3D realtime strategy on a future earth
-DISTNAME= warzone2100-2.3.9
+DISTNAME= warzone2100-3.1.0
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
+EXTRACT_SUFX= .tar.xz
HOMEPAGE= http://wz2100.net/
@@ -16,18 +17,20 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= GL GLC GLU SDL X11 c m physfs ogg openal png popt \
- pthread sndio stdc++ theora vorbis vorbisfile z
+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
-MODULES= devel/gettext
+MODULES= devel/gettext \
+ x11/qt4
LIB_DEPENDS= audio/libogg \
audio/libvorbis \
audio/openal>=20110627 \
+ devel/fribidi \
devel/physfs \
- devel/popt \
devel/sdl \
+ graphics/glew \
graphics/png \
- graphics/quesoglc \
multimedia/libtheora
BUILD_DEPENDS= archivers/unzip \
archivers/zip \
@@ -37,18 +40,21 @@ RUN_DEPENDS= devel/desktop-file-utils
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.65
-CONFIGURE_ARGS+=--disable-motif \
- --with-distributor="OpenBSD"
+AUTOCONF_VERSION= 2.69
+CONFIGURE_ARGS+= --with-distributor="OpenBSD"
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include
-I${LOCALBASE}/include/libpng \
-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="gflex"
+ ac_cv_prog_LEX="flex" \
+ ac_cv_path_MOC4="${LOCALBASE}/bin/moc4" \
+ ac_cv_path_UIC4="${LOCALBASE}/bin/uic4"
-pre-build:
+pre-configure:
.for _prog in git svn svnversion
@cd ${WRKDIR}/bin && ln -sf /usr/bin/true ${_prog}
.endfor
+ @cd ${WRKDIR}/bin && ln -sf ${LOCALBASE}/bin/gflex flex
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 6 Nov 2011 21:12:37 -0000 1.5
+++ distinfo 21 Jan 2013 01:38:52 -0000
@@ -1,5 +1,2 @@
-MD5 (warzone2100-2.3.9.tar.gz) = cYUJCgicnA4OynU1qPJdyg==
-RMD160 (warzone2100-2.3.9.tar.gz) = tvtV6hyGN3AYwD+hlPdUf1MY4t8=
-SHA1 (warzone2100-2.3.9.tar.gz) = kZuiVCkanOM2/5FShaPobNZEyB4=
-SHA256 (warzone2100-2.3.9.tar.gz) =
noQ7t1LJxHmLjm6g7ftiX5qi8rqMv+QuMascaqkmets=
-SIZE (warzone2100-2.3.9.tar.gz) = 62509972
+SHA256 (warzone2100-3.1.0.tar.xz) =
w+JLCicD/+WxcUAeDrney+mxMNZHjmQwDM+3OmD2HAM=
+SIZE (warzone2100-3.1.0.tar.xz) = 67316000
Index: patches/patch-build_tools_autorevision
===================================================================
RCS file: patches/patch-build_tools_autorevision
diff -N patches/patch-build_tools_autorevision
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-build_tools_autorevision 21 Jan 2013 01:38:52 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+--- 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.5
diff -u -p -r1.5 patch-configure_ac
--- patches/patch-configure_ac 6 Nov 2011 21:12:37 -0000 1.5
+++ patches/patch-configure_ac 21 Jan 2013 01:38:52 -0000
@@ -1,12 +1,29 @@
-$OpenBSD: patch-configure_ac,v 1.5 2011/11/06 21:12:37 dcoppa Exp $
---- configure.ac.orig Sun Oct 23 16:28:21 2011
-+++ configure.ac Sun Nov 6 10:06:45 2011
-@@ -422,7 +422,7 @@ AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS
+$OpenBSD$
+--- configure.ac.orig Tue Jan 15 00:54:06 2013
++++ configure.ac Mon Jan 21 00:16:22 2013
+@@ -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
- # Look for PhysicsFS
- AC_CHECK_HEADER(physfs.h, , AC_MSG_ERROR([PhysicsFS header not found.]))
--AC_CHECK_LIB(physfs, PHYSFS_init, AC_SUBST([PHYSFS_LIBS], [-lphysfs]),
AC_MSG_ERROR([PhysicsFS not found.]), [${WIN32_LIBS}])
-+AC_CHECK_LIB(physfs, PHYSFS_init, AC_SUBST([PHYSFS_LIBS], [-lphysfs]),
AC_MSG_ERROR([PhysicsFS not found.]), [-pthread])
-
- # Look for OpenGL
- CPPFLAGS_SAVE="$CPPFLAGS"
+ 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}"
+-WZ_WARNINGS_GCC_CXX="${WZ_Wno_}enum-compare ${WZ_WARNINGS_GCC}"
++WZ_WARNINGS_GCC_CXX="${WZ_WARNINGS_GCC}"
+ if test "x$enable_debug" = "xyes" ; then
+ if test "x$cc_icc" = "xyes" ; then
+ WZ_CFLAGS="${WZ_CFLAGS} -O0 -g -Wcheck -Werror"
Index: patches/patch-lib_exceptionhandler_exceptionhandler_cpp
===================================================================
RCS file: patches/patch-lib_exceptionhandler_exceptionhandler_cpp
diff -N patches/patch-lib_exceptionhandler_exceptionhandler_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_exceptionhandler_exceptionhandler_cpp 21 Jan 2013
01:38:52 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+--- lib/exceptionhandler/exceptionhandler.cpp.orig Mon Jan 21 00:19:31 2013
++++ lib/exceptionhandler/exceptionhandler.cpp Mon Jan 21 00:24:14 2013
+@@ -121,7 +121,6 @@ static LONG WINAPI windowsExceptionHandler(PEXCEPTION_
+ # include <sys/types.h>
+ # include <sys/stat.h>
+ # include <sys/wait.h>
+-# include <sys/ucontext.h>
+ # include <sys/utsname.h>
+ #ifdef WZ_OS_LINUX
+ # include <sys/prctl.h>
+@@ -539,14 +538,14 @@ static bool gdbExtendedBacktrace(int const dumpFile)
+ // Disassemble the faulting instruction (if we know it)
+ if (instruction)
+ {
+- dprintf(gdbPipe, "x/i %p\n", (void*)instruction);
++ //dprintf(gdbPipe, "x/i %p\n", (void*)instruction);
+ }
+
+ // We have an intelligent guess for the *correct* frame, disassemble
*that* one.
+ if (frame)
+ {
+- dprintf(gdbPipe, "frame %p\n"
+- "disassemble /m\n", frame);
++ //dprintf(gdbPipe, "frame %p\n"
++ // "disassemble /m\n", frame);
+ }
+
+ write(gdbPipe, gdbCommands, strlen(gdbCommands));
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 6 Nov 2011 21:12:37 -0000 1.5
+++ pkg/PLIST 21 Jan 2013 01:38:52 -0000
@@ -64,6 +64,7 @@ share/locale/ca_ES/LC_MESSAGES/warzone21
share/locale/cs/LC_MESSAGES/warzone2100.mo
share/locale/da/LC_MESSAGES/warzone2100.mo
share/locale/de/LC_MESSAGES/warzone2100.mo
+share/locale/el/LC_MESSAGES/warzone2100.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/warzone2100.mo
@@ -104,11 +105,6 @@ share/locale/zh_CN/LC_MESSAGES/warzone21
share/locale/zh_TW/LC_MESSAGES/warzone2100.mo
share/warzone2100/
share/warzone2100/base.wz
-share/warzone2100/mods/
-share/warzone2100/mods/multiplay/
-share/warzone2100/mods/multiplay/dydo-ai.wz
-share/warzone2100/mods/multiplay/ntw.wz
-share/warzone2100/mods/multiplay/old-1.10-balance.wz
share/warzone2100/mp.wz
share/warzone2100/music/
share/warzone2100/music/menu.ogg
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
