From 972d1731b3b6e3bcfc8fa9d380031d9edc5b974e Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 4 Jun 2001 16:14:06 +0000 Subject: Update to 1.5.0. Major changes since 1.4.8: Dependency on glib, gtk-interface (not enabled), completely rewritten fighting code, i18n support, man page, display buy value for drugs, partially functional AI players, and lots of bugfixes. --- games/dopewars/Makefile | 9 +++++++-- games/dopewars/distinfo | 15 ++++++++------- games/dopewars/patches/patch-aa | 34 +++++++++++++++++----------------- games/dopewars/patches/patch-ab | 12 ++++++------ games/dopewars/patches/patch-ac | 30 ++++++++++++++---------------- games/dopewars/patches/patch-ad | 8 ++++---- games/dopewars/patches/patch-ae | 28 ++++++++++++++++++++++++++++ games/dopewars/pkg/PLIST | 8 ++++++-- 8 files changed, 90 insertions(+), 54 deletions(-) create mode 100644 games/dopewars/patches/patch-ae (limited to 'games/dopewars') diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile index 5d3c4425f85..9581af32786 100644 --- a/games/dopewars/Makefile +++ b/games/dopewars/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:47 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/06/04 16:14:06 wiz Exp $ -DISTNAME= dopewars-1.4.8 +DISTNAME= dopewars-1.5.0 CATEGORIES= games MASTER_SITES= http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/ \ ${MASTER_SITE_SOURCEFORGE:=dopewars/} \ @@ -11,12 +11,17 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/ COMMENT= Make a fortune dealing drugs on the streets of New York +DEPENDS+= glib>=1.2.0:../../devel/glib + USE_CURSES= YES +USE_LIBINTL= YES USE_GMAKE= YES REPLACE_NCURSES= ${WRKSRC}/configure 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 diff --git a/games/dopewars/distinfo b/games/dopewars/distinfo index 9f96ec268ec..60d4b33761e 100644 --- a/games/dopewars/distinfo +++ b/games/dopewars/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:22 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/06/04 16:14:06 wiz Exp $ -SHA1 (dopewars-1.4.8.tar.gz) = fc4bc928e2e1c77fc0523343bd8068f0685aa52e -Size (dopewars-1.4.8.tar.gz) = 130436 bytes -SHA1 (patch-aa) = 3fb8e0edd082971aaeed3735bfd43ffbcd54ef15 -SHA1 (patch-ab) = 8bd4345bf81e938c92fc96013d12bfc223e948b8 -SHA1 (patch-ac) = 9dfbe911b0133d60750b0caf457dae62f6c02849 -SHA1 (patch-ad) = bee98655f222ddebaedbb841f943fbd715ff239d +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) = 348b123a310946ad01a6f49b8d00dd5e5c62d7ab diff --git a/games/dopewars/patches/patch-aa b/games/dopewars/patches/patch-aa index a6078b9a354..674897a8b88 100644 --- a/games/dopewars/patches/patch-aa +++ b/games/dopewars/patches/patch-aa @@ -1,24 +1,24 @@ -$NetBSD: patch-aa,v 1.2 2001/01/04 21:50:13 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2001/06/04 16:14:06 wiz Exp $ ---- Makefile.in.orig Sun Jul 9 21:59:38 2000 -+++ Makefile.in -@@ -66,7 +66,7 @@ - dopewars_SOURCES = AIPlayer.c serverside.c clientside.c dopewars.c message.c dopeos.c +--- doc/Makefile.in.orig Mon May 14 00:17:46 2001 ++++ doc/Makefile.in +@@ -92,7 +92,7 @@ + l = @l@ + localedir = @localedir@ - --DOCPATH = /usr/doc/${PACKAGE}-${VERSION}/ +-DOCPATH = ${datadir}/doc/${PACKAGE}-${VERSION}/ +DOCPATH = ${prefix}/share/doc/html/dopewars/ - DOCS = aiplayer.html configfile.html index.html server.html clientplay.html credits.html installation.html servercommands.html commandline.html developer.html metaserver.html windows.html README + 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 @@ + - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -400,8 +400,8 @@ - touch ${datadir}/dopewars.sco - chown root.games ${datadir}/dopewars.sco - chmod 0660 ${datadir}/dopewars.sco -- ${INSTALL} -d -o root -g root -m 0755 $(DOCPATH) -- ${INSTALL} -o root -g root -m 0644 $(DOCS) $(DOCPATH) -+ ${INSTALL} -d $(DOCPATH) -+ ${INSTALL} -m 0644 $(DOCS) $(DOCPATH) + 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. diff --git a/games/dopewars/patches/patch-ab b/games/dopewars/patches/patch-ab index ef882674aaa..cddc8e85c5b 100644 --- a/games/dopewars/patches/patch-ab +++ b/games/dopewars/patches/patch-ab @@ -1,11 +1,11 @@ -$NetBSD: patch-ab,v 1.2 2001/01/04 21:50:14 wiz Exp $ +$NetBSD: patch-ab,v 1.3 2001/06/04 16:14:06 wiz Exp $ ---- dopeos.h.orig Sun Jul 9 22:07:11 2000 -+++ dopeos.h -@@ -126,6 +126,7 @@ - #else /* Definitions for Unix build */ +--- src/dopeos.h.orig Wed Apr 25 02:27:54 2001 ++++ src/dopeos.h +@@ -131,6 +131,7 @@ + #include - #if NETWORKING + #ifdef NETWORKING +#include #include #include diff --git a/games/dopewars/patches/patch-ac b/games/dopewars/patches/patch-ac index 90770c069d4..e5999d30518 100644 --- a/games/dopewars/patches/patch-ac +++ b/games/dopewars/patches/patch-ac @@ -1,23 +1,21 @@ -$NetBSD: patch-ac,v 1.1 2001/01/04 21:50:14 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2001/06/04 16:14:06 wiz Exp $ ---- dopewars.c.orig Sun Jul 9 22:12:31 2000 -+++ dopewars.c -@@ -35,8 +35,6 @@ - #include "clientside.h" - #include "AIPlayer.h" +--- src/curses_client.c.orig Wed Apr 25 02:27:54 2001 ++++ src/curses_client.c +@@ -43,7 +43,6 @@ + static void PrintHighScore(char *Data); --SCREEN *cur_screen; -- - #define CM_SERVER 0 - #define CM_PROMPT 1 - #define CM_META 2 -@@ -670,8 +668,7 @@ - } + 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 @@ - void start_curses() { --/* Initialises the curses library for accessing the screen */ + static void start_curses() { + /* Initialises the curses library for accessing the screen */ - cur_screen=newterm(NULL,stdout,stdin); + initscr(); - /* 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 5ba6ba0ef39..d1394f97510 100644 --- a/games/dopewars/patches/patch-ad +++ b/games/dopewars/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1 2001/01/04 21:50:14 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2001/06/04 16:14:06 wiz Exp $ ---- serverside.c.orig Sun Jul 9 22:12:53 2000 -+++ serverside.c -@@ -22,6 +22,7 @@ +--- src/serverside.c.orig Sun May 13 05:24:02 2001 ++++ src/serverside.c +@@ -26,6 +26,7 @@ #include #include #include diff --git a/games/dopewars/patches/patch-ae b/games/dopewars/patches/patch-ae new file mode 100644 index 00000000000..71f690e8942 --- /dev/null +++ b/games/dopewars/patches/patch-ae @@ -0,0 +1,28 @@ +$NetBSD: patch-ae,v 1.1 2001/06/04 16:14:06 wiz Exp $ + +--- configure.orig Mon May 14 00:16:50 2001 ++++ configure +@@ -3506,8 +3506,8 @@ + + + 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. */ + /* 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(); + + 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 diff --git a/games/dopewars/pkg/PLIST b/games/dopewars/pkg/PLIST index d59fbbbf90a..fd954f3666d 100644 --- a/games/dopewars/pkg/PLIST +++ b/games/dopewars/pkg/PLIST @@ -1,16 +1,20 @@ -@comment $NetBSD: PLIST,v 1.2 2001/01/04 21:50:14 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2001/06/04 16:14:06 wiz 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/html/dopewars/README +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dopewars.mo +${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/dopewars.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/dopewars.mo @dirrm share/doc/html/dopewars -- cgit v1.2.3