3 files changed, 85 insertions, 23 deletions

diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index 01d4d6b6c94c..d0e1872c96eb 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -6,23 +6,27 @@
 #
 
 PORTNAME=	warzone2100
-PORTVERSION=	2.0.10
-PORTREVISION=	4
+PORTVERSION=	2.2.0
 CATEGORIES=	games
-MASTER_SITES=	http://download.gna.org/warzone/releases/2.0/
+MASTER_SITES=	SF \
+		http://download.gna.org/warzone/releases/${PORTVERSION:C/^([0-9]+\.[0-9]+)\..*$/\1/}/
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Innovative 3D real-time strategy game
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip
+		unzip:${PORTSDIR}/archivers/unzip \
+		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 LIB_DEPENDS=	jpeg.10:${PORTSDIR}/graphics/jpeg \
 		mad.2:${PORTSDIR}/audio/libmad \
 		ogg.6:${PORTSDIR}/audio/libogg \
 		openal.0:${PORTSDIR}/audio/openal \
 		physfs.1:${PORTSDIR}/devel/physfs \
 		png.5:${PORTSDIR}/graphics/png \
-		vorbis.4:${PORTSDIR}/audio/libvorbis
+		vorbis.4:${PORTSDIR}/audio/libvorbis \
+		GLC.0:${PORTSDIR}/graphics/quesoglc \
+		theora.0:${PORTSDIR}/multimedia/libtheora \
+		popt.0:${PORTSDIR}/devel/popt
 
 USE_BISON=	build
 GNU_CONFIGURE=	yes
@@ -33,13 +37,45 @@ USE_SDL=	net sdl
 CONFIGURE_ARGS=	--program-transform-name="" --with-distributor="FreeBSD ports"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="${PTHREAD_LIBS}"
+		LIBS="${PTHREAD_LIBS}" \
+		PATH="${LOCALBASE}/bin:$$PATH"
 REINPLACE_ARGS=	-i ''
+MAKE_JOBS_SAFE=	yes
+PORTDOCS=	*
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 700004
+BROKEN=		Does not build
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-m32||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/_XOPEN_SOURCE/ d' ${WRKSRC}/config.h.in
+	@${REINPLACE_CMD} -e 's|NSIG|32|g; s|SIGPOLL|SIGIO|g' \
+		${WRKSRC}/lib/exceptionhandler/exceptionhandler.c
+	@${REINPLACE_CMD} -e '/include.*alloca/ d' \
+		${WRKSRC}/lib/framework/config-macosx.h \
+		${WRKSRC}/lib/framework/resource_parser.tab.c \
+		${WRKSRC}/lib/framework/strres_parser.tab.c \
+		${WRKSRC}/lib/framework/wzglobal.h \
+		${WRKSRC}/lib/gamelib/audp_parser.tab.c \
+		${WRKSRC}/lib/script/chat_parser.tab.c \
+		${WRKSRC}/lib/script/script_parser.tab.c \
+		${WRKSRC}/src/message_parser.tab.c \
+		${WRKSRC}/src/scriptvals_parser.tab.c
+	@${REINPLACE_CMD} -e 's|-m32||; s|-Werror||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|AUTHORS||; s|COPYING COPYING\.README||' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/typedef void (\*__GLXextFuncPtr)(void);/d' \
+		${WRKSRC}/lib/ivis_opengl/GLee.h
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -Ee 's|install-dist_docDATA$$||' \
 		${WRKSRC}/Makefile.in
@@ -48,4 +84,4 @@ post-patch:
 .else
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo
index bc369b8514d4..43d9b0d3b2ff 100644
--- a/games/warzone2100/distinfo
+++ b/games/warzone2100/distinfo
@@ -1,3 +1,3 @@
-MD5 (warzone2100-2.0.10.tar.bz2) = d27b89fde2c8017020756441bdd2a67b
-SHA256 (warzone2100-2.0.10.tar.bz2) = a70d53173b49d31ab8b730a82d2b0127a9fb23eb6da1cdc6e38c8dbfecaa207a
-SIZE (warzone2100-2.0.10.tar.bz2) = 13304863
+MD5 (warzone2100-2.2.0.tar.bz2) = 18ce8b1778903cb4bbf153b19b575944
+SHA256 (warzone2100-2.2.0.tar.bz2) = c176329bf6a148915dca69e399bf50e63cb26319885e395cb0bc2c1597c48c2a
+SIZE (warzone2100-2.2.0.tar.bz2) = 48641710
diff --git a/games/warzone2100/pkg-plist b/games/warzone2100/pkg-plist
index 5b6b2924964e..1b0da0126319 100644
--- a/games/warzone2100/pkg-plist
+++ b/games/warzone2100/pkg-plist
@@ -1,17 +1,43 @@
 bin/warzone2100
-%%DATADIR%%/mp.wz
-%%DATADIR%%/warzone.wz
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/Readme.de
-%%PORTDOCS%%%%DOCSDIR%%/Readme.de.xhtml
-%%PORTDOCS%%%%DOCSDIR%%/Readme.en
-%%PORTDOCS%%%%DOCSDIR%%/Readme.en.xhtml
-%%PORTDOCS%%%%DOCSDIR%%/styles/readme.print.css
-%%PORTDOCS%%%%DOCSDIR%%/styles/readme.screen.css
-share/icons/warzone2100.png
 share/applications/warzone2100.desktop
+share/icons/warzone2100.png
+%%NLS%%share/locale/cs/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/da/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/de/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/es/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/fy/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/it/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/la/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/warzone2100.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/warzone2100.mo
+%%DATADIR%%/base.wz
+%%DATADIR%%/mods/multiplay/aivolution.wz
+%%DATADIR%%/mods/multiplay/ntw.wz
+%%DATADIR%%/mp.wz
+%%DATADIR%%/music/menu.ogg
+%%DATADIR%%/music/music.wpl
+%%DATADIR%%/music/track1.ogg
+%%DATADIR%%/music/track2.ogg
+@dirrm %%DATADIR%%/music
+@dirrm %%DATADIR%%/mods/multiplay
+@dirrm %%DATADIR%%/mods
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/styles
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%NLS%%@dirrmtry share/locale/la/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/la
+%%NLS%%@dirrmtry share/locale/fy/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fy
 @dirrmtry share/applications
 @dirrmtry share/icons