5 files changed, 18 insertions, 52 deletions
diff --git a/games/dopewars/patches/patch-aa b/games/dopewars/patches/patch-aa
index d72d2110db6..9455c3cfb65 100644
--- a/games/dopewars/patches/patch-aa
+++ b/games/dopewars/patches/patch-aa
@@ -1,21 +1,17 @@
-$NetBSD: patch-aa,v 1.5 2004/03/30 16:12:38 jmmv Exp $
+$NetBSD: patch-aa,v 1.6 2004/11/05 09:44:33 adam Exp $
 
---- Makefile.in.orig	2003-06-06 21:19:21.000000000 +0200
+--- Makefile.in.orig	2004-10-25 07:05:33.000000000 +0000
 +++ Makefile.in
-@@ -132,10 +132,10 @@ am__quote = @am__quote@
- install_sh = @install_sh@
- localedir = @localedir@
- plugindir = @plugindir@
+@@ -224,7 +224,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
 -SUBDIRS = intl src doc po sounds
 +SUBDIRS = src doc po sounds
  DESKTOPDIR = ${DESTDIR}${datadir}/gnome/apps/Games
  DESKTOP = dopewars.desktop
--SCOREDIR = ${DESTDIR}${datadir}
-+SCOREDIR = ${DESTDIR}${localstatedir}
- SCORE = ${SCOREDIR}/dopewars.sco
- EXTRA_DIST = ABOUT-NLS LICENCE dopewars.desktop dopewars.spec.in depcomp \
-                  runindent.sh win32/Makefile win32/README win32/contid.h \
-@@ -512,8 +512,6 @@ install-data-local:
+ SCOREDIR = ${DESTDIR}${localstatedir}
+@@ -673,8 +673,6 @@ install-data-local:
  	@chgrp games ${SCORE} || chgrp wheel ${SCORE} || \
  	  echo "Unable to change group ownership of the high score file"
  	chmod 0660 ${SCORE}
diff --git a/games/dopewars/patches/patch-ab b/games/dopewars/patches/patch-ab
deleted file mode 100644
index 055ce55b80f..00000000000
--- a/games/dopewars/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/07/12 10:07:35 wiz Exp $
-
---- src/dopewars.c.orig	Mon Jun  2 20:39:01 2003
-+++ src/dopewars.c
-@@ -2797,7 +2797,7 @@ struct CMDLINE *GeneralStartup(int argc,
- {
-   /* First, open the hard-coded high score file with possibly
-    * elevated privileges */
--  priv_hiscore = g_strdup_printf("%s/dopewars.sco", DPDATADIR);
-+  priv_hiscore = g_strdup_printf("%s/dopewars.sco", DPLOCALSTATEDIR);
-   HiScoreFile = g_strdup(priv_hiscore);
-   OpenHighScoreFile();
-   DropPrivileges();
diff --git a/games/dopewars/patches/patch-ae b/games/dopewars/patches/patch-ae
index 592fbaa1968..f0325a2528f 100644
--- a/games/dopewars/patches/patch-ae
+++ b/games/dopewars/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2003/07/12 10:07:35 wiz Exp $
+$NetBSD: patch-ae,v 1.6 2004/11/05 09:44:33 adam Exp $
 
---- configure.orig	Fri Jun  6 21:19:19 2003
+--- configure.orig	2004-10-25 07:05:30.000000000 +0000
 +++ configure
-@@ -8755,8 +8755,8 @@ echo "${ECHO_T}Configuring for Unix bina
+@@ -9249,8 +9249,8 @@ echo "${ECHO_T}Configuring for Unix bina
  
        if test "$CURSES_CLIENT" != "no" ; then
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ae,v 1.5 2003/07/12 10:07:35 wiz Exp $
  if test "${ac_cv_lib_ncurses_newterm+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8776,11 +8776,11 @@ extern "C"
+@@ -9269,11 +9269,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.  */
@@ -27,7 +27,7 @@ $NetBSD: patch-ae,v 1.5 2003/07/12 10:07:35 wiz Exp $
    ;
    return 0;
  }
-@@ -15091,7 +15091,10 @@ cat >>confdefs.h <<_ACEOF
+@@ -16157,7 +16157,10 @@ cat >>confdefs.h <<_ACEOF
  #define DPDATADIR "$DPDATADIR"
  _ACEOF
  
@@ -39,9 +39,9 @@ $NetBSD: patch-ae,v 1.5 2003/07/12 10:07:35 wiz Exp $
  
  localedir=${datadir}/locale
  
-@@ -15973,6 +15976,7 @@ s,@PLUGOBJS@,$PLUGOBJS,;t t
- s,@PLUGINS_TRUE@,$PLUGINS_TRUE,;t t
+@@ -17053,6 +17056,7 @@ s,@PLUGINS_TRUE@,$PLUGINS_TRUE,;t t
  s,@PLUGINS_FALSE@,$PLUGINS_FALSE,;t t
+ s,@DPSCOREDIR@,$DPSCOREDIR,;t t
  s,@DPDATADIR@,$DPDATADIR,;t t
 +s,@DPLOCALSTATEDIR@,$DPLOCALSTATEDIR,;t t
  s,@localedir@,$localedir,;t t
diff --git a/games/dopewars/patches/patch-af b/games/dopewars/patches/patch-af
index 88eab4911ed..637bb85482b 100644
--- a/games/dopewars/patches/patch-af
+++ b/games/dopewars/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2002/12/06 16:50:04 jmmv Exp $
+$NetBSD: patch-af,v 1.3 2004/11/05 09:44:33 adam Exp $
 
---- src/Makefile.in.orig	Mon Oct 21 13:09:21 2002
+--- src/Makefile.in.orig	2004-10-25 07:05:36.000000000 +0000
 +++ src/Makefile.in
-@@ -245,7 +245,7 @@ clean-binPROGRAMS:
+@@ -324,7 +324,7 @@ clean-binPROGRAMS:
  	  echo " rm -f $$p $$f"; \
  	  rm -f $$p $$f ; \
  	done
diff --git a/games/dopewars/patches/patch-ag b/games/dopewars/patches/patch-ag
deleted file mode 100644
index f4044ca3919..00000000000
--- a/games/dopewars/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/02/13 23:44:12 snj Exp $
-
---- config.h.in.orig	Mon Oct 21 13:09:38 2002
-+++ config.h.in
-@@ -14,8 +14,11 @@
- /* Define to 1 if using `alloca.c'. */
- #undef C_ALLOCA
- 
--/* The directory containing the high score file and docs */
-+/* The directory containing machine independent data */
- #undef DPDATADIR
-+
-+/* The directory containing the high score file and docs */
-+#undef DPLOCALSTATEDIR
- 
- /* Define to 1 if translation of program messages to the user's native
-    language is requested. */