Update to 1.5.9. Depend on ncurses again because it's now using KEY_RESIZE

(see PR lib/20032).
Changes:
This is largely a bugfix release, fixing a crash on pressing the
"drop drugs" button, and adding minor improvements to the text-mode
client.
Fix PLIST while here.

6 files changed, 29 insertions, 44 deletions

diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index cbf3c0ea489..dcccef20552 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2003/05/05 16:27:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2003/07/12 10:07:35 wiz Exp $
 
-DISTNAME=		dopewars-1.5.8
-PKGREVISION=		2
+DISTNAME=		dopewars-1.5.9
 CATEGORIES=		games
 MASTER_SITES=		http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/ \
 			${MASTER_SITE_SOURCEFORGE:=dopewars/} \
@@ -14,6 +13,8 @@ COMMENT=		Make a fortune dealing drugs on the streets of New York
 DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		YES
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_PKGLOCALEDIR=	YES
 USE_GMAKE=		YES
 
@@ -26,6 +27,8 @@ CONFIGURE_ARGS+=	--without-esd
 CONFIGURE_ARGS+=	--without-sdl
 CONFIGURE_ARGS+=	--localstatedir=/var/games
 
+USE_NCURSES=		# KEY_RESIZE
+
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib/buildlink2.mk"
 .include "../../devel/ncurses/buildlink2.mk"
diff --git a/games/dopewars/PLIST b/games/dopewars/PLIST
index 52af953eb4c..7e92801d911 100644
--- a/games/dopewars/PLIST
+++ b/games/dopewars/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/27 23:45:48 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/07/12 10:07:35 wiz Exp $
 bin/dopewars
 man/man6/dopewars.6
 share/doc/${PKGNAME}/help/cops.html
@@ -47,8 +47,8 @@ ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/dopewars.mo
 share/pixmaps/dopewars-pill.png
 share/pixmaps/dopewars-shot.png
 share/pixmaps/dopewars-weed.png
-@dirrm in gnome-dirs: @dirrm share/gnome/apps/Games
-@dirrm in gnome-dirs: @dirrm share/gnome/apps
+@comment in gnome-dirs: @dirrm share/gnome/apps/Games
+@comment in gnome-dirs: @dirrm share/gnome/apps
 @dirrm share/dopewars
 @dirrm share/doc/${PKGNAME}/help
 @dirrm share/doc/${PKGNAME}
diff --git a/games/dopewars/distinfo b/games/dopewars/distinfo
index 2cfd308b532..789cd467b87 100644
--- a/games/dopewars/distinfo
+++ b/games/dopewars/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2002/12/06 17:36:13 wiz Exp $
+$NetBSD: distinfo,v 1.9 2003/07/12 10:07:35 wiz Exp $
 
-SHA1 (dopewars-1.5.8.tar.gz) = 8528c03c8c5012cbdac4d124322e3cd1eb548107
-Size (dopewars-1.5.8.tar.gz) = 1168140 bytes
+SHA1 (dopewars-1.5.9.tar.gz) = e62b03d8341e75fd332169df34a8b1200a775c7e
+Size (dopewars-1.5.9.tar.gz) = 1181836 bytes
 SHA1 (patch-aa) = 3441d372757119a0cb8292638ec1e4a3ac22cb62
-SHA1 (patch-ab) = 99cbc701c0ce4c6d55f94f4bb84e89ee4ef611ae
-SHA1 (patch-ac) = 304ca6d21da3117a7da6b2dc9df56f34b10dd772
+SHA1 (patch-ab) = eae9e2a5d448206a687c7d7691f83dc81cb03b93
+SHA1 (patch-ac) = 529cf6e5b9f28a7fa547f81841c5199a1f8f84ae
 SHA1 (patch-ad) = 471c30b8b8e75d687e7891037f2427cb8ee51c14
-SHA1 (patch-ae) = 935eaef23aef3285249d9aab2d3ffc687fafa3b4
+SHA1 (patch-ae) = 2f1283a8af9ad8389b65328ced008c404ab2f9ef
 SHA1 (patch-af) = f39b804dfed2d1e4613aa68b60773540a58e595c
 SHA1 (patch-ag) = e21bf4cb3125a0e9d361a8e96a3ed61d59174554
diff --git a/games/dopewars/patches/patch-ab b/games/dopewars/patches/patch-ab
index f4e0961d45d..055ce55b80f 100644
--- a/games/dopewars/patches/patch-ab
+++ b/games/dopewars/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2002/12/06 16:50:03 jmmv Exp $
+$NetBSD: patch-ab,v 1.5 2003/07/12 10:07:35 wiz Exp $
 
---- src/dopewars.c.orig	Sat Oct 19 22:44:27 2002
+--- src/dopewars.c.orig	Mon Jun  2 20:39:01 2003
 +++ src/dopewars.c
-@@ -2789,7 +2789,7 @@ struct CMDLINE *GeneralStartup(int argc,
+@@ -2797,7 +2797,7 @@ struct CMDLINE *GeneralStartup(int argc,
  {
    /* First, open the hard-coded high score file with possibly
     * elevated privileges */
@@ -11,17 +11,3 @@ $NetBSD: patch-ab,v 1.4 2002/12/06 16:50:03 jmmv Exp $
    HiScoreFile = g_strdup(priv_hiscore);
    OpenHighScoreFile();
    DropPrivileges();
-@@ -2976,11 +2976,11 @@ int main(int argc, char *argv[])
-     } else
-       switch (cmdline->client) {
-       case CLIENT_AUTO:
--        if (!GtkLoop(&argc, &argv, cmdline, TRUE))
-+        if (!GtkLoop(&argc, &argv, TRUE))
-           CursesLoop(cmdline);
-         break;
-       case CLIENT_WINDOW:
--        GtkLoop(&argc, &argv, cmdline, FALSE);
-+        GtkLoop(&argc, &argv, FALSE);
-         break;
-       case CLIENT_CURSES:
-         CursesLoop(cmdline);
diff --git a/games/dopewars/patches/patch-ac b/games/dopewars/patches/patch-ac
index 1c5d9258fbe..7f259ae1038 100644
--- a/games/dopewars/patches/patch-ac
+++ b/games/dopewars/patches/patch-ac
@@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.3 2002/12/06 16:50:04 jmmv Exp $
+$NetBSD: patch-ac,v 1.4 2003/07/12 10:07:35 wiz Exp $
 
---- src/curses_client/curses_client.c.orig	Tue Oct 15 15:31:34 2002
+--- src/curses_client/curses_client.c.orig	Fri Jun  6 21:13:04 2003
 +++ src/curses_client/curses_client.c
-@@ -48,7 +48,6 @@ static void PrepareHighScoreScreen(void)
- static void PrintHighScore(char *Data);
+@@ -45,7 +45,6 @@
+ #include "tstring.h"
  
  static int ResizedFlag;
 -static SCREEN *cur_screen;
  
  #define PromptAttr   (COLOR_PAIR(1))
  #define TextAttr     (COLOR_PAIR(2))
-@@ -107,7 +106,7 @@ static gboolean QuitRequest, WantColour 
+@@ -112,7 +111,7 @@ static gboolean QuitRequest, WantColour 
   */
  static void start_curses(void)
  {
diff --git a/games/dopewars/patches/patch-ae b/games/dopewars/patches/patch-ae
index 5ac65077688..592fbaa1968 100644
--- a/games/dopewars/patches/patch-ae
+++ b/games/dopewars/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2002/12/06 16:50:04 jmmv Exp $
+$NetBSD: patch-ae,v 1.5 2003/07/12 10:07:35 wiz Exp $
 
---- configure.orig	Mon Oct 21 13:09:19 2002
+--- configure.orig	Fri Jun  6 21:19:19 2003
 +++ configure
-@@ -8364,8 +8364,8 @@ echo "${ECHO_T}Configuring for Unix bina
+@@ -8755,8 +8755,8 @@ echo "${ECHO_T}Configuring for Unix bina
  
        if test "$CURSES_CLIENT" != "no" ; then
  
@@ -13,16 +13,12 @@ $NetBSD: patch-ae,v 1.4 2002/12/06 16:50:04 jmmv Exp $
  if test "${ac_cv_lib_ncurses_newterm+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8381,7 +8381,7 @@ extern "C"
+@@ -8776,11 +8776,11 @@ extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 -char newterm ();
 +char start_color ();
- #ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
-@@ -8391,7 +8391,7 @@ char newterm ();
  int
  main ()
  {
@@ -31,7 +27,7 @@ $NetBSD: patch-ae,v 1.4 2002/12/06 16:50:04 jmmv Exp $
    ;
    return 0;
  }
-@@ -14496,7 +14496,10 @@ cat >>confdefs.h <<_ACEOF
+@@ -15091,7 +15091,10 @@ cat >>confdefs.h <<_ACEOF
  #define DPDATADIR "$DPDATADIR"
  _ACEOF
  
@@ -43,7 +39,7 @@ $NetBSD: patch-ae,v 1.4 2002/12/06 16:50:04 jmmv Exp $
  
  localedir=${datadir}/locale
  
-@@ -15321,6 +15324,7 @@ s,@PLUGOBJS@,$PLUGOBJS,;t t
+@@ -15973,6 +15976,7 @@ s,@PLUGOBJS@,$PLUGOBJS,;t t
  s,@PLUGINS_TRUE@,$PLUGINS_TRUE,;t t
  s,@PLUGINS_FALSE@,$PLUGINS_FALSE,;t t
  s,@DPDATADIR@,$DPDATADIR,;t t