dopewars: update to 1.6.1.

ChangeLog:

# 1.6.1 - 2020-12-11
- Improved display in non-English text-mode clients; previously
  columns were not aligned properly in some cases and occasionally
  not all available drugs at a location were shown on screen (#54).
- Minimal British English translation added (#57). Configuration file
  entries can now use either British English or American English spelling
  (i.e. Armor/Armour).
- On Windows the "browse" button in the graphical client options dialog
  now opens at the folder containing the selected sound file (#55).

# 1.6.0 - 2020-12-06
- Fixes to build with OpenWRT (thanks to Theodor-Iulian Ciobanu).
- Write server pidfile after fork (thanks to Theodor-Iulian Ciobanu).
- Updated German and French Canadian translations from Benjamin Karaca
  and Francois Marier.
- Support for old GTK1 and GLIB1 libraries removed - we now need version 2
  of these libraries to build dopewars. GTK+3 is also supported.
- Update metaserver to work with new SourceForge; older versions can no
  longer successfully register with the metaserver.
- Switch to using libcurl to talk to the metaserver (this supports https,
  unlike the old internal code). The metaserver configuration has changed
  accordingly; `MetaServer.Name`, `MetaServer.Port` and `MetaServer.Path` are
  replaced with `MetaServer.URL`, while `MetaServer.Auth`, `MetaServer.Proxy*`,
  and `MetaServer.UseSocks` are removed (set the `https_proxy` environment
  variable instead, as per
  https://curl.haxx.se/libcurl/c/libcurl-tutorial.html#Environment)
- The default web browser on Linux has changed from 'mozilla' to
  'firefox'; on Mac the system-configured default browser is used.
- On Windows the high score file, log file, and config file are now
  stored in the user application data directory (e.g.
  `C:\Users\foo\AppData\Local\dopewars`) rather than the same directory as
  the dopewars binary.
- Add sound support with SDL2, and on Mac.
- Add 64-bit Windows binaries.
- Fix for a DOS against the server using the REQUESTJET message type
  (thanks to Doug Prostko for reporting the problem).

games/dopewars/Makefile

@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.77 2020/08/17 20:18:43 leot Exp $
+# $NetBSD: Makefile,v 1.78 2021/01/26 22:12:08 fcambus Exp $
 
-DISTNAME=	dopewars-1.5.12
-PKGREVISION=	34
+DISTNAME=	dopewars-1.6.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dopewars/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://dopewars.sourceforge.io/
 COMMENT=	Make a fortune dealing drugs on the streets of New York
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	destdir
 
@@ -24,4 +24,6 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/games
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

games/dopewars/PLIST

@@ -1,31 +1,32 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 19:10:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2021/01/26 22:12:08 fcambus Exp $
 bin/dopewars
 man/man6/dopewars.6
-share/doc/${PKGNAME}/help/cops.html
-share/doc/${PKGNAME}/help/drugs.html
-share/doc/${PKGNAME}/help/general.html
-share/doc/${PKGNAME}/help/guns.html
-share/doc/${PKGNAME}/help/locations.html
-share/doc/${PKGNAME}/help/server.html
-share/doc/${PKGNAME}/help/sounds.html
-share/doc/${PKGNAME}/LICENCE
-share/doc/${PKGNAME}/aiplayer.html
-share/doc/${PKGNAME}/clientplay.html
-share/doc/${PKGNAME}/commandline.html
-share/doc/${PKGNAME}/configfile.html
-share/doc/${PKGNAME}/contribute.html
-share/doc/${PKGNAME}/credits.html
-share/doc/${PKGNAME}/developer.html
-share/doc/${PKGNAME}/example-cfg
-share/doc/${PKGNAME}/example-igneous
-share/doc/${PKGNAME}/i18n.html
-share/doc/${PKGNAME}/index.html
-share/doc/${PKGNAME}/installation.html
-share/doc/${PKGNAME}/metaserver.html
-share/doc/${PKGNAME}/protocol.html
-share/doc/${PKGNAME}/server.html
-share/doc/${PKGNAME}/servercommands.html
-share/doc/${PKGNAME}/windows.html
+share/applications/dopewars.desktop
+share/doc/dopewars/LICENCE
+share/doc/dopewars/aiplayer.html
+share/doc/dopewars/clientplay.html
+share/doc/dopewars/commandline.html
+share/doc/dopewars/configfile.html
+share/doc/dopewars/contribute.html
+share/doc/dopewars/credits.html
+share/doc/dopewars/developer.html
+share/doc/dopewars/example-cfg
+share/doc/dopewars/example-igneous
+share/doc/dopewars/help/cops.html
+share/doc/dopewars/help/drugs.html
+share/doc/dopewars/help/general.html
+share/doc/dopewars/help/guns.html
+share/doc/dopewars/help/locations.html
+share/doc/dopewars/help/server.html
+share/doc/dopewars/help/sounds.html
+share/doc/dopewars/i18n.html
+share/doc/dopewars/index.html
+share/doc/dopewars/installation.html
+share/doc/dopewars/metaserver.html
+share/doc/dopewars/protocol.html
+share/doc/dopewars/server.html
+share/doc/dopewars/servercommands.html
+share/doc/dopewars/windows.html
 share/dopewars/bye.wav
 share/dopewars/colt.wav
 share/dopewars/die.wav
@@ -39,6 +40,7 @@ share/dopewars/run.wav
 share/dopewars/shotdown.wav
 share/dopewars/train.wav
 share/locale/de/LC_MESSAGES/dopewars.mo
+share/locale/en_GB/LC_MESSAGES/dopewars.mo
 share/locale/es/LC_MESSAGES/dopewars.mo
 share/locale/es_ES/LC_MESSAGES/dopewars.mo
 share/locale/fr/LC_MESSAGES/dopewars.mo

games/dopewars/distinfo

@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.15 2015/11/03 20:56:47 agc Exp $
+$NetBSD: distinfo,v 1.16 2021/01/26 22:12:08 fcambus Exp $
 
-SHA1 (dopewars-1.5.12.tar.gz) = ad46a38e225680e591b078eeec563d47b96684bc
-RMD160 (dopewars-1.5.12.tar.gz) = 66c86bceb67657a9fb2ef7944b1a069dafab8ae0
-SHA512 (dopewars-1.5.12.tar.gz) = cfabaf9326c847aed6210a852ace64c697df5845a66b3179b8dc8dea7b99a11e1f91358d4ee54929a56c70d5f3a76f9f7bb4079fdef765601f165b4cd06cba5a
-Size (dopewars-1.5.12.tar.gz) = 1419725 bytes
-SHA1 (patch-aa) = df0e51ad4da9ce3963682ba246de9c4f1496a6ec
-SHA1 (patch-ac) = 529cf6e5b9f28a7fa547f81841c5199a1f8f84ae
+SHA1 (dopewars-1.6.1.tar.gz) = 4598bfb838ece6d3e87d5c0014cc0f85204ce023
+RMD160 (dopewars-1.6.1.tar.gz) = 77c8f598dc240d93950dd13720b5536be925796c
+SHA512 (dopewars-1.6.1.tar.gz) = c4b33879be499a732e42a7a8829ff56a1807c5943eae4d39bc14ef16e06cf22b6c5792e7cefa8ad76846498be8bbf3f9c00f8f6664f14b5ce4d45604e42e8175
+Size (dopewars-1.6.1.tar.gz) = 1459612 bytes
+SHA1 (patch-Makefile.in) = e0ccd415a7154a08f0bddcf10949439fe4719c9e
 SHA1 (patch-ad) = 471c30b8b8e75d687e7891037f2427cb8ee51c14
-SHA1 (patch-ae) = 2e4f715e02f4d9ff3827e22a98b87bf593742845
-SHA1 (patch-af) = a25c54a74aacf58b85af879df70fe4ba78c3a49c
+SHA1 (patch-src_curses__client_curses__client.c) = 95c871ec0faebe0de65e81504e9d71021c3478ec

games/dopewars/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2013/10/17 09:44:57 roy Exp $
+# $NetBSD: options.mk,v 1.3 2021/01/26 22:12:08 fcambus Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dopewars
 PKG_SUPPORTED_OPTIONS=	curses gtk
@@ -18,6 +18,5 @@ CONFIGURE_ARGS+=	--enable-gui-server
 .  include "../../x11/gtk2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-gui-client
-CONFIGURE_ARGS+=	--disable-glib2
-.  include "../../devel/glib/buildlink3.mk"
+.  include "../../devel/glib2/buildlink3.mk"
 .endif

games/dopewars/patches/patch-Makefile.in

@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2021/01/26 22:12:08 fcambus Exp $
+
+Fix target for Pkgsrc.
+
+--- Makefile.in.orig	2021-01-26 20:49:46.188727756 +0000
++++ Makefile.in
+@@ -400,7 +400,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = src doc po sounds
+-DESKTOPDIR = ${DESTDIR}${datadir}/gnome/apps/Games
++DESKTOPDIR = ${DESTDIR}${datadir}/applications
+ DESKTOP = dopewars.desktop
+ SCOREDIR = ${DESTDIR}${localstatedir}
+ SCORE = ${SCOREDIR}/dopewars.sco

games/dopewars/patches/patch-ac → games/dopewars/patches/patch-src_curses__client_curses__client.c

@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2003/07/12 10:07:35 wiz Exp $
+$NetBSD: patch-src_curses__client_curses__client.c,v 1.1 2021/01/26 22:12:08 fcambus Exp $
 
---- src/curses_client/curses_client.c.orig	Fri Jun  6 21:13:04 2003
+--- src/curses_client/curses_client.c.orig	2021-01-03 12:38:52.113243136 +0000
 +++ src/curses_client/curses_client.c
 @@ -45,7 +45,6 @@
  #include "tstring.h"
@@ -10,12 +10,12 @@
 
  #define PromptAttr   (COLOR_PAIR(1))
  #define TextAttr     (COLOR_PAIR(2))
-@@ -112,7 +111,7 @@ static gboolean QuitRequest, WantColour 
+@@ -113,7 +112,7 @@ static gboolean QuitRequest, WantColor =
   */
  static void start_curses(void)
  {
 -  cur_screen = newterm(NULL, stdout, stdin);
 +  initscr();
-   if (WantColour) {
+   if (WantColor) {
      start_color();
      init_pair(1, COLOR_MAGENTA, COLOR_WHITE);