pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/games/warzone2100

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Dec 14 17:27:01 UTC 2018

Modified Files:
        pkgsrc/games/warzone2100: Makefile PLIST distinfo
Added Files:
        pkgsrc/games/warzone2100/patches:
            patch-lib_exceptionhandler_exceptionhandler.cpp
            patch-lib_qtgame_wzapp__qt.cpp
Removed Files:
        pkgsrc/games/warzone2100/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-af patch-ag
            patch-build__tools_autorevision_autorevision.cpp
            patch-lib_ivis__common_png__util.c

Log Message:
warzone2100: update to 3.2.3

ChangeLog:
A lot a things since 2.3.2!
See https://github.com/Warzone2100/warzone2100/blob/master/ChangeLog


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/games/warzone2100/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/warzone2100/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/warzone2100/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/games/warzone2100/patches/patch-aa \
    pkgsrc/games/warzone2100/patches/patch-ab
cvs rdiff -u -r1.2 -r0 pkgsrc/games/warzone2100/patches/patch-ac \
    pkgsrc/games/warzone2100/patches/patch-ad
cvs rdiff -u -r1.1 -r0 pkgsrc/games/warzone2100/patches/patch-ae \
    pkgsrc/games/warzone2100/patches/patch-af \
    pkgsrc/games/warzone2100/patches/patch-ag \
    pkgsrc/games/warzone2100/patches/patch-build__tools_autorevision_autorevision.cpp \
    pkgsrc/games/warzone2100/patches/patch-lib_ivis__common_png__util.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp \
    pkgsrc/games/warzone2100/patches/patch-lib_qtgame_wzapp__qt.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: pkgsrc/games/warzone2100/Makefile
diff -u pkgsrc/games/warzone2100/Makefile:1.23 pkgsrc/games/warzone2100/Makefile:1.24
--- pkgsrc/games/warzone2100/Makefile:1.23      Mon Mar 12 11:16:36 2018
+++ pkgsrc/games/warzone2100/Makefile   Fri Dec 14 17:27:01 2018
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.23 2018/03/12 11:16:36 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2018/12/14 17:27:01 triaxx Exp $
 #
 
-DISTNAME=      warzone2100-2.2.2
-PKGREVISION=   10
+DISTNAME=      warzone2100-3.2.3
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
+EXTRACT_SUFX=          .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://wz2100.net/
 COMMENT=       Real-time strategy and real-time tactics hybrid computer game
+LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
 
@@ -17,6 +18,8 @@ USE_LANGUAGES=        c c++
 USE_TOOLS+=    pkg-config bison msgfmt intltool gmake gawk flex unzip zip
 FLEX_REQD=     2.5.35
 
+.include "../../games/warzone2100/options.mk"
+
 CONFIGURE_ARGS+=       --with-distributor=pkgsrc
 
 LDFLAGS.DragonFly=     -lX11 -lintl
@@ -26,17 +29,20 @@ post-build:
 
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
+.include "../../converters/fribidi/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/physfs/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/quesoglc/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
-.include "../../net/SDL_net/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtscript/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/warzone2100/PLIST
diff -u pkgsrc/games/warzone2100/PLIST:1.3 pkgsrc/games/warzone2100/PLIST:1.4
--- pkgsrc/games/warzone2100/PLIST:1.3  Sun Aug 16 21:21:51 2009
+++ pkgsrc/games/warzone2100/PLIST      Fri Dec 14 17:27:01 2018
@@ -1,30 +1,79 @@
-@comment $NetBSD: PLIST,v 1.3 2009/08/16 21:21:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/12/14 17:27:01 triaxx Exp $
 bin/warzone2100
+man/man6/warzone2100.6
 share/applications/warzone2100.desktop
 share/doc/warzone2100/AUTHORS
 share/doc/warzone2100/COPYING
 share/doc/warzone2100/COPYING.NONGPL
 share/doc/warzone2100/COPYING.README
 share/doc/warzone2100/ChangeLog
-share/doc/warzone2100/Readme.de
-share/doc/warzone2100/Readme.de.xhtml
-share/doc/warzone2100/Readme.en
-share/doc/warzone2100/Readme.en.xhtml
+share/doc/warzone2100/README.md
 share/doc/warzone2100/ScriptingManual.htm
-share/doc/warzone2100/styles/readme.print.css
-share/doc/warzone2100/styles/readme.screen.css
-share/doc/warzone2100/styles/scriptingmanual.css
+share/doc/warzone2100/docbook-xsl.css
+share/doc/warzone2100/images/artillery-far-away.jpg
+share/doc/warzone2100/images/artillery-sensor.jpg
+share/doc/warzone2100/images/attackrange.jpg
+share/doc/warzone2100/images/awaymission.jpg
+share/doc/warzone2100/images/building-select.jpg
+share/doc/warzone2100/images/building.jpg
+share/doc/warzone2100/images/cb-sensor-vtol.png
+share/doc/warzone2100/images/cb-sensor.png
+share/doc/warzone2100/images/cheapweapon.png
+share/doc/warzone2100/images/commander-factory-assignment.jpg
+share/doc/warzone2100/images/commander-panel.jpg
+share/doc/warzone2100/images/commander.png
+share/doc/warzone2100/images/commandpanel.png
+share/doc/warzone2100/images/design-bars.jpg
+share/doc/warzone2100/images/design-more.png
+share/doc/warzone2100/images/design-screen.jpg
+share/doc/warzone2100/images/design-unit.jpg
+share/doc/warzone2100/images/design.jpg
+share/doc/warzone2100/images/expensiveweapon.png
+share/doc/warzone2100/images/firing.jpg
+share/doc/warzone2100/images/hq.png
+share/doc/warzone2100/images/indirect-fire-support.jpg
+share/doc/warzone2100/images/intelligencedisplay.jpg
+share/doc/warzone2100/images/interface.jpg
+share/doc/warzone2100/images/logo.png
+share/doc/warzone2100/images/manufacture-select.jpg
+share/doc/warzone2100/images/manufacture.jpg
+share/doc/warzone2100/images/minimap.jpg
+share/doc/warzone2100/images/movement.jpg
+share/doc/warzone2100/images/oilresource.jpg
+share/doc/warzone2100/images/powerbar.jpg
+share/doc/warzone2100/images/powerupgrade.png
+share/doc/warzone2100/images/rallypoints.jpg
+share/doc/warzone2100/images/recycling.jpg
+share/doc/warzone2100/images/research-select.jpg
+share/doc/warzone2100/images/research.jpg
+share/doc/warzone2100/images/retreatthreshold.jpg
+share/doc/warzone2100/images/return.jpg
+share/doc/warzone2100/images/satellite-uplink.png
+share/doc/warzone2100/images/sensor-tower.png
+share/doc/warzone2100/images/sensor.png
+share/doc/warzone2100/images/transport.jpg
+share/doc/warzone2100/images/unitordersmenu.jpg
+share/doc/warzone2100/images/wss.png
+share/doc/warzone2100/images/www.png
+share/doc/warzone2100/quickstartguide.html
 share/icons/warzone2100.png
+share/locale/ca_ES/LC_MESSAGES/warzone2100.mo
 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/LC_MESSAGES/warzone2100.mo
+share/locale/eo/LC_MESSAGES/warzone2100.mo
 share/locale/es/LC_MESSAGES/warzone2100.mo
+share/locale/et_EE/LC_MESSAGES/warzone2100.mo
 share/locale/fi/LC_MESSAGES/warzone2100.mo
 share/locale/fr/LC_MESSAGES/warzone2100.mo
 share/locale/fy/LC_MESSAGES/warzone2100.mo
 share/locale/ga/LC_MESSAGES/warzone2100.mo
+share/locale/hr/LC_MESSAGES/warzone2100.mo
+share/locale/hu/LC_MESSAGES/warzone2100.mo
 share/locale/it/LC_MESSAGES/warzone2100.mo
+share/locale/ko/LC_MESSAGES/warzone2100.mo
 share/locale/la/LC_MESSAGES/warzone2100.mo
 share/locale/lt/LC_MESSAGES/warzone2100.mo
 share/locale/nb/LC_MESSAGES/warzone2100.mo
@@ -34,14 +83,17 @@ share/locale/pt/LC_MESSAGES/warzone2100.
 share/locale/pt_BR/LC_MESSAGES/warzone2100.mo
 share/locale/ro/LC_MESSAGES/warzone2100.mo
 share/locale/ru/LC_MESSAGES/warzone2100.mo
+share/locale/sk/LC_MESSAGES/warzone2100.mo
 share/locale/sl/LC_MESSAGES/warzone2100.mo
+share/locale/tr/LC_MESSAGES/warzone2100.mo
+share/locale/uk_UA/LC_MESSAGES/warzone2100.mo
 share/locale/zh_CN/LC_MESSAGES/warzone2100.mo
 share/locale/zh_TW/LC_MESSAGES/warzone2100.mo
+share/metainfo/warzone2100.appdata.xml
 share/warzone2100/base.wz
-share/warzone2100/mods/multiplay/aivolution.wz
-share/warzone2100/mods/multiplay/ntw.wz
 share/warzone2100/mp.wz
 share/warzone2100/music/menu.ogg
 share/warzone2100/music/music.wpl
 share/warzone2100/music/track1.ogg
 share/warzone2100/music/track2.ogg
+share/warzone2100/music/track3.ogg

Index: pkgsrc/games/warzone2100/distinfo
diff -u pkgsrc/games/warzone2100/distinfo:1.7 pkgsrc/games/warzone2100/distinfo:1.8
--- pkgsrc/games/warzone2100/distinfo:1.7       Tue Nov  3 20:57:06 2015
+++ pkgsrc/games/warzone2100/distinfo   Fri Dec 14 17:27:01 2018
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 20:57:06 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/12/14 17:27:01 triaxx Exp $
 
-SHA1 (warzone2100-2.2.2.tar.gz) = d61bd1a87f0a6c1184c640987f759b1ac702b9e1
-RMD160 (warzone2100-2.2.2.tar.gz) = d7af614267acdb548fcbe5f78ed46e8c4d6f33de
-SHA512 (warzone2100-2.2.2.tar.gz) = 763eb464687323aadaab3d679629e36902fbd3e2bdd88b3cf426b0b282eb55c184cf9f56bae24245ae2ee7edaf208352a813cdf1f065cd792fc2c38bf1f47d08
-Size (warzone2100-2.2.2.tar.gz) = 50163580 bytes
-SHA1 (patch-aa) = 95c066ff4340ba6e4c021846541b53eb4cad0704
-SHA1 (patch-ab) = e82a085ddf27a5443e011ada57e78cca1ab66c79
-SHA1 (patch-ac) = c09fcad63f725f414667980efce48157a04169a9
-SHA1 (patch-ad) = af29beef3b2014bf1b3d1068b2b3caa7d948de80
-SHA1 (patch-ae) = 9a5f2fccd93100e87968d2dc9d783acc595ad5d3
-SHA1 (patch-af) = 46ea523fb72ed0f081d85dfea0813fde79087c82
-SHA1 (patch-ag) = 2604a894e8579377f4b3ac8eae7250ed2c73a21c
-SHA1 (patch-build__tools_autorevision_autorevision.cpp) = b68854d02ee6d0fe1b4293c6b1b5c0e1e36fb3a6
-SHA1 (patch-lib_ivis__common_png__util.c) = 6a0ac9f5a29d431041af01c1d5acbb6fdbb919fe
+SHA1 (warzone2100-3.2.3.tar.xz) = 33bf08ac130d54d36550ada4e3db99c3545ef153
+RMD160 (warzone2100-3.2.3.tar.xz) = 12b5615b6cea9ea13848dc1a130ca535c7539ad5
+SHA512 (warzone2100-3.2.3.tar.xz) = 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
+Size (warzone2100-3.2.3.tar.xz) = 81314060 bytes
+SHA1 (patch-lib_exceptionhandler_exceptionhandler.cpp) = 04345173f2fc98da9f26c30963507972786571c0
+SHA1 (patch-lib_qtgame_wzapp__qt.cpp) = 45564765d911a52534a14966c1f9418fd417956f

Added files:

Index: pkgsrc/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp
diff -u /dev/null pkgsrc/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp:1.1
--- /dev/null   Fri Dec 14 17:27:01 2018
+++ pkgsrc/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp    Fri Dec 14 17:27:01 2018
@@ -0,0 +1,78 @@
+$NetBSD: patch-lib_exceptionhandler_exceptionhandler.cpp,v 1.1 2018/12/14 17:27:01 triaxx Exp $
+
+Disable unsupported sigcodes for DragonFlyBSD.
+
+--- lib/exceptionhandler/exceptionhandler.cpp.orig     2017-04-23 13:12:16.000000000 +0000
++++ lib/exceptionhandler/exceptionhandler.cpp
+@@ -192,18 +192,21 @@ static const char *wz_strsignal(int sign
+       case SIGBUS:
+               switch (sigcode)
+               {
++#if !defined(__DragonFly__)
+               case BUS_ADRALN:
+                       return "SIGBUS: Access to an undefined portion of a memory object: Invalid address alignment";
+               case BUS_ADRERR:
+                       return "SIGBUS: Access to an undefined portion of a memory object: Nonexistent physical address";
+               case BUS_OBJERR:
+                       return "SIGBUS: Access to an undefined portion of a memory object: Object-specific hardware error";
++#endif
+               default:
+                       return "SIGBUS: Access to an undefined portion of a memory object";
+               }
+       case SIGFPE:
+               switch (sigcode)
+               {
++#if !defined(__DragonFly__)
+               case FPE_INTDIV:
+                       return "SIGFPE: Erroneous arithmetic operation: Integer divide by zero";
+               case FPE_INTOVF:
+@@ -220,6 +223,7 @@ static const char *wz_strsignal(int sign
+                       return "SIGFPE: Erroneous arithmetic operation: Invalid floating-point operation";
+               case FPE_FLTSUB:
+                       return "SIGFPE: Erroneous arithmetic operation: Subscript out of range";
++#endif
+               default:
+                       return "SIGFPE: Erroneous arithmetic operation";
+               };
+@@ -228,6 +232,7 @@ static const char *wz_strsignal(int sign
+       case SIGILL:
+               switch (sigcode)
+               {
++#if !defined(__DragonFly__)
+               case ILL_ILLOPC:
+                       return "SIGILL: Illegal instruction: Illegal opcode";
+               case ILL_ILLOPN:
+@@ -244,6 +249,7 @@ static const char *wz_strsignal(int sign
+                       return "SIGILL: Illegal instruction: Coprocessor error";
+               case ILL_BADSTK:
+                       return "SIGILL: Illegal instruction: Internal stack error";
++#endif
+               default:
+                       return "SIGILL: Illegal instruction";
+               }
+@@ -258,10 +264,12 @@ static const char *wz_strsignal(int sign
+       case SIGSEGV:
+               switch (sigcode)
+               {
++#if !defined(__DragonFly__)
+               case SEGV_MAPERR:
+                       return "SIGSEGV: Invalid memory reference: Address not mapped to object";
+               case SEGV_ACCERR:
+                       return "SIGSEGV: Invalid memory reference: Invalid permissions for mapped object";
++#endif
+               default:
+                       return "SIGSEGV: Invalid memory reference";
+               }
+@@ -279,10 +287,12 @@ static const char *wz_strsignal(int sign
+       case SIGTRAP:
+               switch (sigcode)
+               {
++#if !defined(__DragonFly__)
+               case TRAP_BRKPT:
+                       return "SIGTRAP: Trace/breakpoint trap: Process breakpoint";
+               case TRAP_TRACE:
+                       return "SIGTRAP: Trace/breakpoint trap: Process trace trap";
++#endif
+               default:
+                       return "SIGTRAP: Trace/breakpoint trap";
+               }
Index: pkgsrc/games/warzone2100/patches/patch-lib_qtgame_wzapp__qt.cpp
diff -u /dev/null pkgsrc/games/warzone2100/patches/patch-lib_qtgame_wzapp__qt.cpp:1.1
--- /dev/null   Fri Dec 14 17:27:01 2018
+++ pkgsrc/games/warzone2100/patches/patch-lib_qtgame_wzapp__qt.cpp     Fri Dec 14 17:27:01 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_qtgame_wzapp__qt.cpp,v 1.1 2018/12/14 17:27:01 triaxx Exp $
+
+The clip() function was not declared in the scope.
+
+--- lib/qtgame/wzapp_qt.cpp.orig       2017-04-23 13:12:16.000000000 +0000
++++ lib/qtgame/wzapp_qt.cpp
+@@ -42,6 +42,7 @@
+ 
+ #include "lib/exceptionhandler/dumpinfo.h"
+ #include "lib/framework/file.h"
++#include "lib/framework/math_ext.h"
+ #include "lib/ivis_opengl/piestate.h"
+ #include "lib/ivis_opengl/pieclip.h"
+ #include "lib/ivis_opengl/screen.h"
Home | Main Index | Thread Index | Old Index