CVS commit: pkgsrc/games/warzone2100

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Feb  8 22:59:32 UTC 2020

Modified Files:
        pkgsrc/games/warzone2100: Makefile

Log Message:
warzone2100: Resolve build issues and remove leftover GNU build system goo.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/games/warzone2100/Makefile

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.32 pkgsrc/games/warzone2100/Makefile:1.33
--- pkgsrc/games/warzone2100/Makefile:1.32      Mon Jan 27 19:35:54 2020
+++ pkgsrc/games/warzone2100/Makefile   Sat Feb  8 22:59:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2020/01/27 19:35:54 triaxx Exp $
+# $NetBSD: Makefile,v 1.33 2020/02/08 22:59:32 nia Exp $
 
 DISTNAME=      warzone2100-3.3.0_src
 PKGNAME=       ${DISTNAME:S/_src//}
@@ -16,8 +16,14 @@ DEPENDS+=    dejavu-ttf-[0-9]*:../../fonts/
 
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
-USE_TOOLS+=    pkg-config bison msgfmt intltool gmake gawk flex unzip zip
-FLEX_REQD=     2.5.35
+USE_TOOLS+=    pkg-config zip
+USE_TOOLS+=    msgfmt msgmerge xgettext
+
+# Could NOT find Gettext: Found unsuitable version "0.16.1", but
+# required is at least "0.18"
+_TOOLS_USE_PKGSRC.msgfmt=      yes
+_TOOLS_USE_PKGSRC.msgmerge=    yes
+_TOOLS_USE_PKGSRC.xgettext=    yes
 
 .include "../../games/warzone2100/options.mk"
 
@@ -28,10 +34,11 @@ CMAKE_ARG_PATH=     ${WRKSRC}
 
 CMAKE_ARGS+=           -DCMAKE_MAKE_PROGRAM=${MAKE_PROGRAM} -DWZ_DISTRIBUTOR=pkgsrc
 
-CFLAGS+=               -Wno-error=unused-variable
 CFLAGS.NetBSD+=                -D_NETBSD_SOURCE
 LDFLAGS.DragonFly=     -lX11 -lintl
 
+BUILDLINK_TRANSFORM+=  rm:-Werror
+
 pre-configure:
        ${RUN} mkdir -p ${WRKSRC}/build
 
@@ -50,6 +57,7 @@ pre-configure:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/quesoglc/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../net/miniupnpc/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtscript/buildlink3.mk"