Update to 1.4.8. USE_CURSES. More MASTER_SITES.

Changes: HTML documentation, better selection of servers, more configuration
options, uses autoconf.

8 files changed, 102 insertions, 49 deletions

diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 6c3e0bebf20..59eae62aa5c 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,15 +1,22 @@
-# $NetBSD: Makefile,v 1.3 2000/01/15 18:46:27 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/01/04 21:50:10 wiz Exp $
 
-DISTNAME=		dopewars-1.4.3
+DISTNAME=		dopewars-1.4.8
 CATEGORIES=		games
-MASTER_SITES=		http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/
+MASTER_SITES=		http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/ \
+			${MASTER_SITE_SOURCEFORGE:=dopewars/} \
+			http://berlin.sfai.edu/~tobi/dopewars/files/ \
+			http://www.ideenpark.de/dopewars/files/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/
 
-DEPENDS+=		ncurses>=4.2:../../devel/ncurses
+USE_CURSES=		YES
+USE_GMAKE=		YES
+REPLACE_NCURSES=	${WRKSRC}/configure
 
-ALL_TARGET=		dopewars
-LDFLAGS+=		-L${LOCALBASE}/lib
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--enable-networking
+# datadir is the place the score file is saved
+CONFIGURE_ARGS+=	--datadir=/var/games
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/dopewars/files/md5 b/games/dopewars/files/md5
index 1b2bc7de061..25559cc3e42 100644
--- a/games/dopewars/files/md5
+++ b/games/dopewars/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/07/01 08:27:30 garbled Exp $
+$NetBSD: md5,v 1.2 2001/01/04 21:50:10 wiz Exp $
 
-MD5 (dopewars-1.4.3.tar.gz) = 50cff775b6dd7a3831cfefda51f4c8f7
+MD5 (dopewars-1.4.8.tar.gz) = c88fa5475e05d2162661b5f3200b21e9
diff --git a/games/dopewars/files/patch-sum b/games/dopewars/files/patch-sum
index a6d7f56a238..f7cc506b634 100644
--- a/games/dopewars/files/patch-sum
+++ b/games/dopewars/files/patch-sum
@@ -1,4 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:52 agc Exp $
+$NetBSD: patch-sum,v 1.2 2001/01/04 21:50:11 wiz Exp $
 
-MD5 (patch-aa) = e865c54c2fa571fd7c879d70b530896b
-MD5 (patch-ab) = 5ee43981079e1659bfabe1d5a75fb118
+MD5 (patch-aa) = e5fd373ac6cec9a789711b8968a173f3
+MD5 (patch-ab) = a16cc286927622e4b37157f7a0224795
+MD5 (patch-ac) = b3f463d46a1e342130e6298c945056be
+MD5 (patch-ad) = 0f0f78e1b2cf14f44b0466fae9e2dfcb
diff --git a/games/dopewars/patches/patch-aa b/games/dopewars/patches/patch-aa
index f78dd0da646..a6078b9a354 100644
--- a/games/dopewars/patches/patch-aa
+++ b/games/dopewars/patches/patch-aa
@@ -1,29 +1,24 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/07/01 08:27:31 garbled Exp $
---- Makefile.orig	Thu Jul  1 00:07:30 1999
-+++ Makefile	Thu Jul  1 01:07:42 1999
-@@ -1,8 +1,8 @@
--CFLAGS = -Wall
-+CFLAGS = -Wall -I${LOCALBASE}/include
- CC = gcc
- HEADERS = message.h dopewars.h serverside.h clientside.h AIPlayer.h
- OBJS = message.o dopewars.o serverside.o clientside.o AIPlayer.o
--LIBS = -lncurses
-+LIBS = $(LDFLAGS) -lncurses
+$NetBSD: patch-aa,v 1.2 2001/01/04 21:50:13 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
  
- dopewars : $(OBJS)
- 	$(CC) $(CFLAGS) -o dopewars $(OBJS) $(LIBS)
-@@ -23,10 +23,10 @@
- 	$(CC) $(CFLAGS) -c AIPlayer.c
  
- install :
--	install -o root -g games -m 2755 dopewars /usr/bin/dopewars
--	touch /var/lib/games/dopewars.sco
--	chown root.games /var/lib/games/dopewars.sco
--	chmod 0660 /var/lib/games/dopewars.sco
-+	install -o root -g games -m 2755 dopewars ${PREFIX}/bin/dopewars
-+	touch /var/games/dopewars.sco
-+	chown root.games /var/games/dopewars.sco
-+	chmod 0660 /var/games/dopewars.sco
+-DOCPATH = /usr/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
  
- clean :
- 	rm -f $(OBJS)
+ 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)
+ 
+ # 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 235e130defe..ef882674aaa 100644
--- a/games/dopewars/patches/patch-ab
+++ b/games/dopewars/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/07/01 08:27:31 garbled Exp $
---- dopewars.c.orig	Thu Jul  1 01:08:42 1999
-+++ dopewars.c	Thu Jul  1 01:09:01 1999
-@@ -1866,7 +1866,7 @@
-    char ConfigFile[800],*pt;
+$NetBSD: patch-ab,v 1.2 2001/01/04 21:50:14 wiz Exp $
+
+--- dopeos.h.orig	Sun Jul  9 22:07:11 2000
++++ dopeos.h
+@@ -126,6 +126,7 @@
+ #else /* Definitions for Unix build */
  
- /* First, set hard-coded default values */
--   strcpy(HiScoreFile,"/var/lib/games/dopewars.sco");
-+   strcpy(HiScoreFile,"/var/games/dopewars.sco");
-    strcpy(ServerName,"localhost");
-    strcpy(Pager,"more");
-    Location=ResizeStruct(Location,&NumLocation,
+ #if NETWORKING
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
diff --git a/games/dopewars/patches/patch-ac b/games/dopewars/patches/patch-ac
new file mode 100644
index 00000000000..90770c069d4
--- /dev/null
+++ b/games/dopewars/patches/patch-ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1 2001/01/04 21:50:14 wiz Exp $
+
+--- dopewars.c.orig	Sun Jul  9 22:12:31 2000
++++ dopewars.c
+@@ -35,8 +35,6 @@
+ #include "clientside.h"
+ #include "AIPlayer.h"
+ 
+-SCREEN *cur_screen;
+-
+ #define CM_SERVER 0
+ #define CM_PROMPT 1
+ #define CM_META   2
+@@ -670,8 +668,7 @@
+ }
+ 
+ void start_curses() {
+-/* Initialises the curses library for accessing the screen */
+-   cur_screen=newterm(NULL,stdout,stdin);
++   initscr();
+ /*   initscr();*/
+    if (WantColour) {
+       start_color();
diff --git a/games/dopewars/patches/patch-ad b/games/dopewars/patches/patch-ad
new file mode 100644
index 00000000000..5ba6ba0ef39
--- /dev/null
+++ b/games/dopewars/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2001/01/04 21:50:14 wiz Exp $
+
+--- serverside.c.orig	Sun Jul  9 22:12:53 2000
++++ serverside.c
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <sys/stat.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
diff --git a/games/dopewars/pkg/PLIST b/games/dopewars/pkg/PLIST
index b72bd4aac99..d59fbbbf90a 100644
--- a/games/dopewars/pkg/PLIST
+++ b/games/dopewars/pkg/PLIST
@@ -1,2 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/07/01 08:27:30 garbled Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 21:50:14 wiz Exp $
 bin/dopewars
+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/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
+@dirrm share/doc/html/dopewars