summaryrefslogtreecommitdiff
path: root/games/dopewars
diff options
context:
space:
mode:
Diffstat (limited to 'games/dopewars')
-rw-r--r--games/dopewars/Makefile10
-rw-r--r--games/dopewars/PLIST64
-rw-r--r--games/dopewars/distinfo19
-rw-r--r--games/dopewars/patches/patch-aa37
-rw-r--r--games/dopewars/patches/patch-ab37
-rw-r--r--games/dopewars/patches/patch-ac30
-rw-r--r--games/dopewars/patches/patch-ad12
-rw-r--r--games/dopewars/patches/patch-ae69
-rw-r--r--games/dopewars/patches/patch-af20
-rw-r--r--games/dopewars/patches/patch-ag17
10 files changed, 201 insertions, 114 deletions
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index fbb29132985..3f2d2061493 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2002/12/01 02:00:13 salo Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/06 16:50:02 jmmv Exp $
-DISTNAME= dopewars-1.5.0
+DISTNAME= dopewars-1.5.8
CATEGORIES= games
MASTER_SITES= http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/ \
${MASTER_SITE_SOURCEFORGE:=dopewars/} \
@@ -19,8 +19,10 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-ncurses
CONFIGURE_ARGS+= --enable-networking
CONFIGURE_ARGS+= --disable-gui-client
-# datadir is the place the score file is saved
-CONFIGURE_ARGS+= --datadir=/var/games
+CONFIGURE_ARGS+= --disable-glib2
+CONFIGURE_ARGS+= --without-esd
+CONFIGURE_ARGS+= --without-sdl
+CONFIGURE_ARGS+= --localstatedir=/var/games
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/glib/buildlink2.mk"
diff --git a/games/dopewars/PLIST b/games/dopewars/PLIST
index 2c559b207dc..03ed8fcd8ee 100644
--- a/games/dopewars/PLIST
+++ b/games/dopewars/PLIST
@@ -1,20 +1,54 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:51:57 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/06 16:50:02 jmmv Exp $
bin/dopewars
man/man6/dopewars.6
-share/doc/html/dopewars/aiplayer.html
-share/doc/html/dopewars/clientplay.html
-share/doc/html/dopewars/commandline.html
-share/doc/html/dopewars/configfile.html
-share/doc/html/dopewars/credits.html
-share/doc/html/dopewars/developer.html
-share/doc/html/dopewars/i18n.html
-share/doc/html/dopewars/index.html
-share/doc/html/dopewars/installation.html
-share/doc/html/dopewars/metaserver.html
-share/doc/html/dopewars/server.html
-share/doc/html/dopewars/servercommands.html
-share/doc/html/dopewars/windows.html
+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}/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/dopewars/bye.wav
+share/dopewars/colt.wav
+share/dopewars/die.wav
+share/dopewars/gun.wav
+share/dopewars/jet.wav
+share/dopewars/losebitch.wav
+share/dopewars/message.wav
+share/dopewars/murmur.wav
+share/dopewars/punch.wav
+share/dopewars/run.wav
+share/dopewars/shotdown.wav
+share/dopewars/train.wav
+share/gnome/apps/Games/dopewars.desktop
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dopewars.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/dopewars.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/dopewars.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/dopewars.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/dopewars.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/dopewars.mo
-@dirrm share/doc/html/dopewars
+share/pixmaps/dopewars-pill.png
+share/pixmaps/dopewars-shot.png
+share/pixmaps/dopewars-weed.png
+@dirrm share/dopewars
+@dirrm share/doc/${PKGNAME}/help
+@dirrm share/doc/${PKGNAME}
+@exec ${MKDIR} %D/lib/dopewars
+@dirrm lib/dopewars
diff --git a/games/dopewars/distinfo b/games/dopewars/distinfo
index 839893c4fab..31f0561eaec 100644
--- a/games/dopewars/distinfo
+++ b/games/dopewars/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.6 2002/10/13 11:35:15 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/12/06 16:50:03 jmmv Exp $
-SHA1 (dopewars-1.5.0.tar.gz) = 44a6263dc004f280af3c29d3aafa29f35fbc6ad2
-Size (dopewars-1.5.0.tar.gz) = 453999 bytes
-SHA1 (patch-aa) = 48798f210217b36b751d2aae263fa2718546551a
-SHA1 (patch-ab) = 1ddd2e66d26ed653da33e5cb85a233b2ed2831f5
-SHA1 (patch-ac) = 279be63a9c771dc6629b42558ead20db302a2e08
-SHA1 (patch-ad) = 88ca65d1a8e2a49eb88b170845467e1e75112997
-SHA1 (patch-ae) = d10c2590013ffb931c23a5e6eaf5cda16d7691c8
-SHA1 (patch-af) = 433cb9ae959a9078f1badada9932c6f0c4b36a2b
+SHA1 (dopewars-1.5.8.tar.gz) = 8528c03c8c5012cbdac4d124322e3cd1eb548107
+Size (dopewars-1.5.8.tar.gz) = 1168140 bytes
+SHA1 (patch-aa) = 3441d372757119a0cb8292638ec1e4a3ac22cb62
+SHA1 (patch-ab) = 99cbc701c0ce4c6d55f94f4bb84e89ee4ef611ae
+SHA1 (patch-ac) = 304ca6d21da3117a7da6b2dc9df56f34b10dd772
+SHA1 (patch-ad) = 471c30b8b8e75d687e7891037f2427cb8ee51c14
+SHA1 (patch-ae) = 935eaef23aef3285249d9aab2d3ffc687fafa3b4
+SHA1 (patch-af) = f39b804dfed2d1e4613aa68b60773540a58e595c
+SHA1 (patch-ah) = e21bf4cb3125a0e9d361a8e96a3ed61d59174554
diff --git a/games/dopewars/patches/patch-aa b/games/dopewars/patches/patch-aa
index 674897a8b88..a8b35b4dc87 100644
--- a/games/dopewars/patches/patch-aa
+++ b/games/dopewars/patches/patch-aa
@@ -1,24 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2001/06/04 16:14:06 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2002/12/06 16:50:03 jmmv Exp $
---- doc/Makefile.in.orig Mon May 14 00:17:46 2001
-+++ doc/Makefile.in
-@@ -92,7 +92,7 @@
- l = @l@
+--- Makefile.in.orig Mon Oct 21 13:09:21 2002
++++ Makefile.in
+@@ -132,10 +132,10 @@ am__quote = @am__quote@
+ install_sh = @install_sh@
localedir = @localedir@
-
--DOCPATH = ${datadir}/doc/${PACKAGE}-${VERSION}/
-+DOCPATH = ${prefix}/share/doc/html/dopewars/
- DOCS = aiplayer.html configfile.html index.html i18n.html server.html clientplay.html credits.html installation.html servercommands.html commandline.html developer.html metaserver.html windows.html
-
- man_MANS = dopewars.6
-@@ -247,8 +247,8 @@
-
-
- install-data-local:
-- ${INSTALL} -d -o root -g 0 -m 0755 ${DESTDIR}${DOCPATH}
-- ${INSTALL} -o root -g 0 -m 0644 ${DOCS} ${DESTDIR}${DOCPATH}
-+ ${INSTALL} -d ${DESTDIR}${DOCPATH}
-+ ${INSTALL} -m 0644 ${DOCS} ${DESTDIR}${DOCPATH}
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+ plugindir = @plugindir@
+-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 \
diff --git a/games/dopewars/patches/patch-ab b/games/dopewars/patches/patch-ab
index cddc8e85c5b..f4e0961d45d 100644
--- a/games/dopewars/patches/patch-ab
+++ b/games/dopewars/patches/patch-ab
@@ -1,12 +1,27 @@
-$NetBSD: patch-ab,v 1.3 2001/06/04 16:14:06 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2002/12/06 16:50:03 jmmv Exp $
---- src/dopeos.h.orig Wed Apr 25 02:27:54 2001
-+++ src/dopeos.h
-@@ -131,6 +131,7 @@
- #include <stdio.h>
-
- #ifdef NETWORKING
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
+--- src/dopewars.c.orig Sat Oct 19 22:44:27 2002
++++ src/dopewars.c
+@@ -2789,7 +2789,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();
+@@ -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 e5999d30518..1c5d9258fbe 100644
--- a/games/dopewars/patches/patch-ac
+++ b/games/dopewars/patches/patch-ac
@@ -1,21 +1,21 @@
-$NetBSD: patch-ac,v 1.2 2001/06/04 16:14:06 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2002/12/06 16:50:04 jmmv Exp $
---- src/curses_client.c.orig Wed Apr 25 02:27:54 2001
-+++ src/curses_client.c
-@@ -43,7 +43,6 @@
+--- src/curses_client/curses_client.c.orig Tue Oct 15 15:31:34 2002
++++ src/curses_client/curses_client.c
+@@ -48,7 +48,6 @@ static void PrepareHighScoreScreen(void)
static void PrintHighScore(char *Data);
static int ResizedFlag;
-static SCREEN *cur_screen;
- static char ConnectMethod=CM_SERVER;
- static gboolean CanFire=FALSE,RunHere=FALSE;
- static gchar FightPoint;
-@@ -76,7 +75,7 @@
- static void start_curses() {
- /* Initialises the curses library for accessing the screen */
-- cur_screen=newterm(NULL,stdout,stdin);
-+ initscr();
- if (WantColour) {
- start_color();
- init_pair(1,COLOR_MAGENTA,COLOR_WHITE);
+ #define PromptAttr (COLOR_PAIR(1))
+ #define TextAttr (COLOR_PAIR(2))
+@@ -107,7 +106,7 @@ static gboolean QuitRequest, WantColour
+ */
+ static void start_curses(void)
+ {
+- cur_screen = newterm(NULL, stdout, stdin);
++ initscr();
+ if (WantColour) {
+ start_color();
+ init_pair(1, COLOR_MAGENTA, COLOR_WHITE);
diff --git a/games/dopewars/patches/patch-ad b/games/dopewars/patches/patch-ad
index d1394f97510..b3b43b0a515 100644
--- a/games/dopewars/patches/patch-ad
+++ b/games/dopewars/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.2 2001/06/04 16:14:06 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2002/12/06 16:50:04 jmmv Exp $
---- src/serverside.c.orig Sun May 13 05:24:02 2001
+--- src/serverside.c.orig Mon Oct 21 13:08:52 2002
+++ src/serverside.c
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
#include <stdio.h>
#include <string.h>
- #include <sys/types.h>
+ #include <sys/types.h> /* For size_t etc. */
+#include <sys/socket.h>
#include <sys/stat.h>
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
+
+ #ifdef CYGWIN
diff --git a/games/dopewars/patches/patch-ae b/games/dopewars/patches/patch-ae
index e2476530ec4..5ac65077688 100644
--- a/games/dopewars/patches/patch-ae
+++ b/games/dopewars/patches/patch-ae
@@ -1,28 +1,53 @@
-$NetBSD: patch-ae,v 1.3 2002/10/13 11:35:16 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2002/12/06 16:50:04 jmmv Exp $
---- configure.orig Sun May 13 18:16:50 2001
+--- configure.orig Mon Oct 21 13:09:19 2002
+++ configure
-@@ -3506,8 +3506,8 @@
+@@ -8364,8 +8364,8 @@ echo "${ECHO_T}Configuring for Unix bina
+ if test "$CURSES_CLIENT" != "no" ; then
- if test "$CURSES_CLIENT" = "yes" ; then
-- echo $ac_n "checking for newterm in -lncurses""... $ac_c" 1>&6
--echo "configure:3511: checking for newterm in -lncurses" >&5
-+ echo $ac_n "checking for start_color in -lncurses""... $ac_c" 1>&6
-+echo "configure:3511: checking for start_color in -lncurses" >&5
- ac_lib_var=`echo ncurses'_'newterm | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3520,10 +3520,10 @@
- /* Override any gcc2 internal prototype to avoid an error. */
+-echo "$as_me:$LINENO: checking for newterm in -lncurses" >&5
+-echo $ECHO_N "checking for newterm in -lncurses... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for start_color in -lncurses" >&5
++echo $ECHO_N "checking for start_color in -lncurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_ncurses_newterm+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8381,7 +8381,7 @@ 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();
+ 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 ()
+ {
+-newterm ();
++start_color ();
+ ;
+ return 0;
+ }
+@@ -14496,7 +14496,10 @@ cat >>confdefs.h <<_ACEOF
+ #define DPDATADIR "$DPDATADIR"
+ _ACEOF
- int main() {
--newterm()
-+start_color()
- ; return 0; }
- EOF
- if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-
++DPLOCALSTATEDIR="${localstatedir}"
++cat >>confdefs.h <<_ACEOF
++#define DPLOCALSTATEDIR "$DPLOCALSTATEDIR"
++_ACEOF
+
+ localedir=${datadir}/locale
+
+@@ -15321,6 +15324,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
++s,@DPLOCALSTATEDIR@,$DPLOCALSTATEDIR,;t t
+ s,@localedir@,$localedir,;t t
+ s,@GUI_CLIENT_TRUE@,$GUI_CLIENT_TRUE,;t t
+ s,@GUI_CLIENT_FALSE@,$GUI_CLIENT_FALSE,;t t
diff --git a/games/dopewars/patches/patch-af b/games/dopewars/patches/patch-af
index 01db386150a..88eab4911ed 100644
--- a/games/dopewars/patches/patch-af
+++ b/games/dopewars/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 2002/06/28 09:07:14 agc Exp $
+$NetBSD: patch-af,v 1.2 2002/12/06 16:50:04 jmmv Exp $
---- src/Makefile.in 2002/06/28 09:04:58 1.1
-+++ src/Makefile.in 2002/06/28 09:05:03
-@@ -180,7 +180,7 @@
-
- maintainer-clean-compile:
-
--dopewars: $(dopewars_OBJECTS) $(dopewars_DEPENDENCIES)
-+dopewars: $(dopewars_OBJECTS)
- @rm -f dopewars
+--- src/Makefile.in.orig Mon Oct 21 13:09:21 2002
++++ src/Makefile.in
+@@ -245,7 +245,7 @@ clean-binPROGRAMS:
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
+-dopewars$(EXEEXT): $(dopewars_OBJECTS) $(dopewars_DEPENDENCIES)
++dopewars$(EXEEXT): $(dopewars_OBJECTS)
+ @rm -f dopewars$(EXEEXT)
$(LINK) $(dopewars_LDFLAGS) $(dopewars_OBJECTS) $(dopewars_LDADD) $(LIBS)
diff --git a/games/dopewars/patches/patch-ag b/games/dopewars/patches/patch-ag
new file mode 100644
index 00000000000..74b4527a475
--- /dev/null
+++ b/games/dopewars/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.1 2002/12/06 16:50:04 jmmv 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 independant 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. */
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-21 20:24:52 +0000