+ Don't build our own, very old version of hacked BSD curses -- just

  use other, better ones from pkgsrc through ncursesw/buildlink3.mk.

+ Add a configure script that lightly probes the system and write out
  some system-specific definitions for the Makefile.

This should fix PR pkg/29425.

+ Add necessary includes (<string.h> and <unistd.h>) to global.h to do
  silly C things like prototype functions before you use them.  Remove
  the unnecessary patches to lots of *.c files that added these same
  headers.

+ Include <string.h> in ss.c because it doesn't include global.h.

+ Move HTML documentation into ${PREFIX}/share/doc.

Bump the PKGREVISION to 2.

14 files changed, 219 insertions, 265 deletions

diff --git a/games/netmaj/Makefile b/games/netmaj/Makefile
index 3542da93b27..37393d7117e 100644
--- a/games/netmaj/Makefile
+++ b/games/netmaj/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2008/02/02 21:04:00 heinz Exp $
+# $NetBSD: Makefile,v 1.14 2008/02/29 20:53:02 jlam Exp $
 #
 
 DISTNAME=		netmaj-2.0.7
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games
 MASTER_SITES=		http://www.sfc.wide.ad.jp/~kusune/netmaj/files/
 
@@ -14,16 +14,20 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/netmaj
 USE_TOOLS+=		perl:run
+HAS_CONFIGURE=		yes
+CONFIGURE_ENV+=		OPSYS=${OPSYS:Q}
+CONFIGURE_ENV+=		CURSES_LIBS=${BUILDLINK_LDADD.ncursesw:Q}
 
 INSTALL_TARGET=		install install-pf
-HTMLDIR=		${PREFIX}/share/doc/html/netmaj
+DOCDIR=			${PREFIX}/share/doc/netmaj
 
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} libs
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+pre-configure:
+	cp ${FILESDIR}/configure.sh ${WRKSRC}/configure
+	chmod +x ${WRKSRC}/configure
 
 post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/html/* ${DESTDIR}${HTMLDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/html/* ${DESTDIR}${DOCDIR}
 
+.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/netmaj/PLIST b/games/netmaj/PLIST
index 66fbffab683..0fce86f671f 100644
--- a/games/netmaj/PLIST
+++ b/games/netmaj/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/28 14:33:09 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/02/29 20:53:02 jlam Exp $
 bin/netmaj
 bin/netmaj1
 bin/plview
@@ -17,103 +17,103 @@ lib/netmaj/proxyserver
 lib/netmaj/server
 lib/netmaj/server.pf
 lib/netmaj/server_kill
-share/doc/html/netmaj/bluechip.gif
-share/doc/html/netmaj/bluechip5.gif
-share/doc/html/netmaj/bluemark.gif
-share/doc/html/netmaj/board1.gif
-share/doc/html/netmaj/board2.gif
-share/doc/html/netmaj/cyun.gif
-share/doc/html/netmaj/cyunh.gif
-share/doc/html/netmaj/gstate.gif
-share/doc/html/netmaj/haku.gif
-share/doc/html/netmaj/hakuh.gif
-share/doc/html/netmaj/hatu.gif
-share/doc/html/netmaj/hatuh.gif
-share/doc/html/netmaj/howtoplay.html
-share/doc/html/netmaj/index.html
-share/doc/html/netmaj/kabe2.gif
-share/doc/html/netmaj/man1.gif
-share/doc/html/netmaj/man1h.gif
-share/doc/html/netmaj/man2.gif
-share/doc/html/netmaj/man2h.gif
-share/doc/html/netmaj/man3.gif
-share/doc/html/netmaj/man3h.gif
-share/doc/html/netmaj/man4.gif
-share/doc/html/netmaj/man4h.gif
-share/doc/html/netmaj/man5.gif
-share/doc/html/netmaj/man5h.gif
-share/doc/html/netmaj/man5r.gif
-share/doc/html/netmaj/man5rh.gif
-share/doc/html/netmaj/man6.gif
-share/doc/html/netmaj/man6h.gif
-share/doc/html/netmaj/man7.gif
-share/doc/html/netmaj/man7h.gif
-share/doc/html/netmaj/man8.gif
-share/doc/html/netmaj/man8h.gif
-share/doc/html/netmaj/man9.gif
-share/doc/html/netmaj/man9h.gif
-share/doc/html/netmaj/menu.gif
-share/doc/html/netmaj/nan.gif
-share/doc/html/netmaj/nanh.gif
-share/doc/html/netmaj/netmajrule.html
-share/doc/html/netmaj/p1000.gif
-share/doc/html/netmaj/pei.gif
-share/doc/html/netmaj/peih.gif
-share/doc/html/netmaj/peihx2.gif
-share/doc/html/netmaj/pin1.gif
-share/doc/html/netmaj/pin1h.gif
-share/doc/html/netmaj/pin2.gif
-share/doc/html/netmaj/pin2h.gif
-share/doc/html/netmaj/pin3.gif
-share/doc/html/netmaj/pin3h.gif
-share/doc/html/netmaj/pin4.gif
-share/doc/html/netmaj/pin4h.gif
-share/doc/html/netmaj/pin5.gif
-share/doc/html/netmaj/pin5h.gif
-share/doc/html/netmaj/pin5r.gif
-share/doc/html/netmaj/pin5rh.gif
-share/doc/html/netmaj/pin6.gif
-share/doc/html/netmaj/pin6h.gif
-share/doc/html/netmaj/pin7.gif
-share/doc/html/netmaj/pin7h.gif
-share/doc/html/netmaj/pin8.gif
-share/doc/html/netmaj/pin8h.gif
-share/doc/html/netmaj/pin9.gif
-share/doc/html/netmaj/pin9h.gif
-share/doc/html/netmaj/pstate.gif
-share/doc/html/netmaj/redchip.gif
-share/doc/html/netmaj/redchip5.gif
-share/doc/html/netmaj/redmark.gif
-share/doc/html/netmaj/reference.html
-share/doc/html/netmaj/rev.gif
-share/doc/html/netmaj/revh.gif
-share/doc/html/netmaj/select.gif
-share/doc/html/netmaj/sou1.gif
-share/doc/html/netmaj/sou1h.gif
-share/doc/html/netmaj/sou2.gif
-share/doc/html/netmaj/sou2h.gif
-share/doc/html/netmaj/sou3.gif
-share/doc/html/netmaj/sou3h.gif
-share/doc/html/netmaj/sou4.gif
-share/doc/html/netmaj/sou4h.gif
-share/doc/html/netmaj/sou5.gif
-share/doc/html/netmaj/sou5h.gif
-share/doc/html/netmaj/sou5r.gif
-share/doc/html/netmaj/sou5rh.gif
-share/doc/html/netmaj/sou6.gif
-share/doc/html/netmaj/sou6h.gif
-share/doc/html/netmaj/sou7.gif
-share/doc/html/netmaj/sou7h.gif
-share/doc/html/netmaj/sou8.gif
-share/doc/html/netmaj/sou8h.gif
-share/doc/html/netmaj/sou9.gif
-share/doc/html/netmaj/sou9h.gif
-share/doc/html/netmaj/sya.gif
-share/doc/html/netmaj/syah.gif
-share/doc/html/netmaj/taku.gif
-share/doc/html/netmaj/tepai.gif
-share/doc/html/netmaj/title.gif
-share/doc/html/netmaj/ton.gif
-share/doc/html/netmaj/tonh.gif
-@dirrm share/doc/html/netmaj
+share/doc/netmaj/bluechip.gif
+share/doc/netmaj/bluechip5.gif
+share/doc/netmaj/bluemark.gif
+share/doc/netmaj/board1.gif
+share/doc/netmaj/board2.gif
+share/doc/netmaj/cyun.gif
+share/doc/netmaj/cyunh.gif
+share/doc/netmaj/gstate.gif
+share/doc/netmaj/haku.gif
+share/doc/netmaj/hakuh.gif
+share/doc/netmaj/hatu.gif
+share/doc/netmaj/hatuh.gif
+share/doc/netmaj/howtoplay.html
+share/doc/netmaj/index.html
+share/doc/netmaj/kabe2.gif
+share/doc/netmaj/man1.gif
+share/doc/netmaj/man1h.gif
+share/doc/netmaj/man2.gif
+share/doc/netmaj/man2h.gif
+share/doc/netmaj/man3.gif
+share/doc/netmaj/man3h.gif
+share/doc/netmaj/man4.gif
+share/doc/netmaj/man4h.gif
+share/doc/netmaj/man5.gif
+share/doc/netmaj/man5h.gif
+share/doc/netmaj/man5r.gif
+share/doc/netmaj/man5rh.gif
+share/doc/netmaj/man6.gif
+share/doc/netmaj/man6h.gif
+share/doc/netmaj/man7.gif
+share/doc/netmaj/man7h.gif
+share/doc/netmaj/man8.gif
+share/doc/netmaj/man8h.gif
+share/doc/netmaj/man9.gif
+share/doc/netmaj/man9h.gif
+share/doc/netmaj/menu.gif
+share/doc/netmaj/nan.gif
+share/doc/netmaj/nanh.gif
+share/doc/netmaj/netmajrule.html
+share/doc/netmaj/p1000.gif
+share/doc/netmaj/pei.gif
+share/doc/netmaj/peih.gif
+share/doc/netmaj/peihx2.gif
+share/doc/netmaj/pin1.gif
+share/doc/netmaj/pin1h.gif
+share/doc/netmaj/pin2.gif
+share/doc/netmaj/pin2h.gif
+share/doc/netmaj/pin3.gif
+share/doc/netmaj/pin3h.gif
+share/doc/netmaj/pin4.gif
+share/doc/netmaj/pin4h.gif
+share/doc/netmaj/pin5.gif
+share/doc/netmaj/pin5h.gif
+share/doc/netmaj/pin5r.gif
+share/doc/netmaj/pin5rh.gif
+share/doc/netmaj/pin6.gif
+share/doc/netmaj/pin6h.gif
+share/doc/netmaj/pin7.gif
+share/doc/netmaj/pin7h.gif
+share/doc/netmaj/pin8.gif
+share/doc/netmaj/pin8h.gif
+share/doc/netmaj/pin9.gif
+share/doc/netmaj/pin9h.gif
+share/doc/netmaj/pstate.gif
+share/doc/netmaj/redchip.gif
+share/doc/netmaj/redchip5.gif
+share/doc/netmaj/redmark.gif
+share/doc/netmaj/reference.html
+share/doc/netmaj/rev.gif
+share/doc/netmaj/revh.gif
+share/doc/netmaj/select.gif
+share/doc/netmaj/sou1.gif
+share/doc/netmaj/sou1h.gif
+share/doc/netmaj/sou2.gif
+share/doc/netmaj/sou2h.gif
+share/doc/netmaj/sou3.gif
+share/doc/netmaj/sou3h.gif
+share/doc/netmaj/sou4.gif
+share/doc/netmaj/sou4h.gif
+share/doc/netmaj/sou5.gif
+share/doc/netmaj/sou5h.gif
+share/doc/netmaj/sou5r.gif
+share/doc/netmaj/sou5rh.gif
+share/doc/netmaj/sou6.gif
+share/doc/netmaj/sou6h.gif
+share/doc/netmaj/sou7.gif
+share/doc/netmaj/sou7h.gif
+share/doc/netmaj/sou8.gif
+share/doc/netmaj/sou8h.gif
+share/doc/netmaj/sou9.gif
+share/doc/netmaj/sou9h.gif
+share/doc/netmaj/sya.gif
+share/doc/netmaj/syah.gif
+share/doc/netmaj/taku.gif
+share/doc/netmaj/tepai.gif
+share/doc/netmaj/title.gif
+share/doc/netmaj/ton.gif
+share/doc/netmaj/tonh.gif
+@dirrm share/doc/netmaj
 @dirrm lib/netmaj
diff --git a/games/netmaj/distinfo b/games/netmaj/distinfo
index 7e536bac254..ba32fc2f34f 100644
--- a/games/netmaj/distinfo
+++ b/games/netmaj/distinfo
@@ -1,16 +1,11 @@
-$NetBSD: distinfo,v 1.6 2008/02/02 21:04:00 heinz Exp $
+$NetBSD: distinfo,v 1.7 2008/02/29 20:53:02 jlam Exp $
 
 SHA1 (netmaj-2.0.7.tar.gz) = 1363ea8ca42079fb444b25c605d264b5f083e260
 RMD160 (netmaj-2.0.7.tar.gz) = 9d3fd68b7607b2c3064e9dd8310085818f32f93e
 Size (netmaj-2.0.7.tar.gz) = 213819 bytes
-SHA1 (patch-aa) = acc59856901a04b5236a29d482d0a2b5590b1308
-SHA1 (patch-ab) = 3b58d9456459334df45fda4d1eed5d360e1d3c49
-SHA1 (patch-ac) = 0d5a611ce922c4e3c837f70f1a895d7c72f5535f
-SHA1 (patch-ad) = 0b0c286ea94a52181305bbb1489bc842bb7586bf
-SHA1 (patch-ae) = 6bee67884b364ea874befd952f54d6141a41807f
-SHA1 (patch-af) = 1b10eaa70c262a215f84098b5c5600efe57f1071
-SHA1 (patch-ag) = 0aec049d77592be348b40d37cd53510f5b600561
+SHA1 (patch-aa) = 4be6d0148e4579661162315db968512ae570f122
+SHA1 (patch-af) = 4b0d060fc84deac11e119176233a24f4c8fe1f22
 SHA1 (patch-ah) = d2ad2b03dd7171418eba9617549081cd89982b96
-SHA1 (patch-ai) = 342bf9ac6bf030a83529fb321ea373d10cf2f591
+SHA1 (patch-ai) = cd63f77bc8af0b6d2e3dc51ce260fc639bf48bb9
 SHA1 (patch-aj) = a25f2e0f81c10121767dae99bd6c09be69467a13
-SHA1 (patch-ak) = 479f09a2d9a3a853b55304fa49a72f055e29cdea
+SHA1 (patch-al) = 881d23913beedf4b3167b1fafd08210555cccd55
diff --git a/games/netmaj/files/configure.sh b/games/netmaj/files/configure.sh
new file mode 100644
index 00000000000..b58a5917460
--- /dev/null
+++ b/games/netmaj/files/configure.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# $NetBSD: configure.sh,v 1.1 2008/02/29 20:53:02 jlam Exp $
+#
+# This script needs the following variables passed through the environment:
+#
+#	OPSYS		== ${OPSYS}
+#	CURSES_LIBS	== ${BUILDLINK_LDADD.curses}
+#
+
+# Assume we always have gettimeofday().
+cppflags="-DHAVE_GETTIMEOFDAY"
+
+# "Test" whether to use termios routines or use ioctls to fiddle with ttys.
+if test -d /usr/include/termios.h; then
+	cppflags="$cppflags -DUSE_TERMIOS"
+else
+	cppflags="$cppflags -DUSE_SGTTY"
+fi
+
+# OS-specific stuff
+case ${OPSYS} in
+*BSD)
+	;;
+Linux)
+	cppflags="$cppflags -DDEF_OPTARG"
+	;;
+SunOS)
+	cppflags="$cppflags -DSYSV -DUSE_RAND"
+	libs="-lsocket -lnsl"
+	;;
+AIX)
+	cppflags="$cppflags -DSYSV -DUSE_RAND -DOLD_SELECT -DUSE_WAIT3"
+	;;
+*)
+	cppflags="$cppflags -DSYSV -DUSE_RAND"
+	;;
+esac
+
+# Don't build the keypad support.
+cppflags="$cppflags -DNO_KEYPAD"
+
+cat > config.mk << EOF
+OS_CFLAGS=	$cppflags
+LIBS=		$libs
+CURSES=		${CURSES_LIBS}
+EOF
+
+echo "Using the following configuration:"
+cat config.mk
+
+exit 0
diff --git a/games/netmaj/patches/patch-aa b/games/netmaj/patches/patch-aa
index 24fc90c8d31..33baeffe4ca 100644
--- a/games/netmaj/patches/patch-aa
+++ b/games/netmaj/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2008/02/02 21:04:00 heinz Exp $
+$NetBSD: patch-aa,v 1.5 2008/02/29 20:53:02 jlam Exp $
 
---- Makefile.orig	1996-11-11 15:43:22.000000000 +0100
+--- Makefile.orig	1996-11-11 09:43:22.000000000 -0500
 +++ Makefile
-@@ -25,29 +25,33 @@ REVISION=0
+@@ -25,21 +25,26 @@ REVISION=0
  INTERNAL_REVISION=7
  ARCFILE=netmaj-$(VERSION).$(REVISION).$(INTERNAL_REVISION).tar.gz
  
@@ -18,70 +18,37 @@ $NetBSD: patch-aa,v 1.4 2008/02/02 21:04:00 heinz Exp $
  
  STD_CFLAGS=-I. -Ilib -DNETMAJ_LIB=\"$(LIBDIR)\" 
  
- # for 386BSD,FreeBSD,NetBSD...
-+.if (${OPSYS} == "NetBSD") || (${OPSYS} == "FreeBSD") || (${OPSYS} == "DragonFly")
- CC=gcc
- OS_CFLAGS= -O -g -DUSE_SGTTY -DUSE_FWOPEN -DUSE_TERMCAP -DHAVE_GETTIMEOFDAY
+-# for 386BSD,FreeBSD,NetBSD...
+-CC=gcc
+-OS_CFLAGS= -O -g -DUSE_SGTTY -DUSE_FWOPEN -DUSE_TERMCAP -DHAVE_GETTIMEOFDAY
++# for pkgsrc
++CC=cc
  RANLIB=ranlib
- LIBS= 
- CURSES= -lcurses -ltermcap
- LDFLAGS =  -Llib 
-+.endif
+-LIBS= 
+-CURSES= -lcurses -ltermcap
+-LDFLAGS =  -Llib 
++include config.mk
++
++# for 386BSD,FreeBSD,NetBSD...
++#CC=gcc
++#OS_CFLAGS= -O -g -DUSE_SGTTY -DUSE_FWOPEN -DUSE_TERMCAP -DHAVE_GETTIMEOFDAY
++#RANLIB=ranlib
++#LIBS= 
++#CURSES= -lcurses -ltermcap
++#LDFLAGS =  -Llib 
  
  # for linux
--#CC=cc
--#OS_CFLAGS= -O -DUSE_TERMIOS -DUSE_TERMCAP -DDEF_OPTARG -DHAVE_GETTIMEOFDAY
--#RANLIB=ranlib
--#LIBS = 
--#CURSES= lib/libcurses.a -ltermcap
--#LDFLAGS =  -Llib 
-+.if (${OPSYS} == "Linux")
-+CC=cc
-+OS_CFLAGS= -O -DUSE_TERMIOS -DUSE_TERMCAP -DDEF_OPTARG -DHAVE_GETTIMEOFDAY
-+RANLIB=ranlib
-+LIBS = 
-+CURSES= -lncurses
-+LDFLAGS =  -Llib 
-+.endif
- 
- # for nec ews
- ##CC=/usr/abiccs/bin/cc -ZXNd=5000
-@@ -60,13 +64,15 @@ LDFLAGS =  -Llib 
- #LDFLAGS =  -Llib 
- 
- # for Solaris
--#CC=cc
--#OS_CFLAGS = -O -DSYSV -DSVR4 -DUSE_TERMIOS -DUSE_TERMINFO -D_ENDWIN_INCURSES \
--#	-DUSE_RAND  -DHAVE_GETTIMEOFDAY
--#RANLIB=echo
--#LIBS = -lsocket -lnsl
--#CURSES= -lcurses -ltermcap
--#LDFLAGS =  -Llib 
-+.if (${OPSYS} == "SunOS")
-+CC=cc
-+OS_CFLAGS = -O -DSYSV -DSVR4 -DUSE_TERMIOS -DUSE_TERMINFO -D_ENDWIN_INCURSES \
-+	-DUSE_RAND  -DHAVE_GETTIMEOFDAY
-+RANLIB=echo
-+LIBS = -lsocket -lnsl
-+CURSES= -lcurses -ltermcap
-+LDFLAGS =  -Llib 
-+.endif
- 
- # for nec ews (SVR2)
  #CC=cc
-@@ -163,9 +169,9 @@ libs:
- x:
- 	-if test -d xui; then \
- 	(cd xui; make CC="$(CC)" OS_CFLAGS="$(OS_CFLAGS)" \
--	RANLIB="$(RANLIB)" LIBS="$(LIBS)" LIBDIR="$(LIBDIR) \
-+	RANLIB="$(RANLIB)" LIBS="$(LIBS)" LIBDIR="$(LIBDIR)" \
- 	BINDIR="$(BINDIR)" \
--	"); fi
-+	); fi
+@@ -118,7 +123,7 @@ OBJS_STAND  =stand.o 
+ OBJS_PLVIEW  = plview.o cui.o 
+ OBJS_NETMAJ1 =netmaj1.o cui.o 
+ 
+-all: libs server auto client server_kill netmaj1 plview z x
++all: server auto client server_kill netmaj1 plview z
+ z: proxyserver inputserver proxyclient
  
  
- netmaj: netmaj.in Makefile
-@@ -179,35 +185,35 @@ player_info: player_info.in Makefile
+@@ -179,35 +184,35 @@ player_info: player_info.in Makefile
  	chmod 755 player_info
  
  install: netmaj player_info
diff --git a/games/netmaj/patches/patch-ab b/games/netmaj/patches/patch-ab
deleted file mode 100644
index 60515f328f8..00000000000
--- a/games/netmaj/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/22 09:58:59 kei Exp $
-
---- auto.c.orig	Sat Aug 31 17:14:27 1996
-+++ auto.c
-@@ -26,6 +26,7 @@
- usage:\n\
-     auto [-h host-name] [-p port-number] [-n player-name]\n"
- 
-+#include <unistd.h>
- #include "pai.h"
- #include "global.h"
- 
diff --git a/games/netmaj/patches/patch-ac b/games/netmaj/patches/patch-ac
deleted file mode 100644
index 269beb283df..00000000000
--- a/games/netmaj/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/22 09:58:59 kei Exp $
-
---- client.c.orig	Mon Nov 11 23:43:23 1996
-+++ client.c
-@@ -27,6 +27,7 @@
- 
- #include <setjmp.h>
- #include <signal.h>
-+#include <unistd.h>
- #ifndef SIGCHLD
- #define SIGCHLD SIGCLD
- #endif
diff --git a/games/netmaj/patches/patch-ad b/games/netmaj/patches/patch-ad
deleted file mode 100644
index eb6d25767ca..00000000000
--- a/games/netmaj/patches/patch-ad
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/04/22 09:58:59 kei Exp $
-
---- netmaj1.c.orig	Wed Jul 31 17:06:08 1996
-+++ netmaj1.c
-@@ -23,2 +23,3 @@
- #include <signal.h>
-+#include <unistd.h>
- #include "pai.h"
diff --git a/games/netmaj/patches/patch-ae b/games/netmaj/patches/patch-ae
deleted file mode 100644
index cc5a6f6fab4..00000000000
--- a/games/netmaj/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/04/22 09:58:59 kei Exp $
-
---- plview.c.orig	Wed Jul 31 17:06:12 1996
-+++ plview.c
-@@ -29,6 +29,7 @@
- #include "global.h"
- #include <curses.h>
- #include <signal.h>
-+#include <unistd.h>
- 
- extern char *pai_strings[];
- river_t mrv[4][RIVER_MAX];
diff --git a/games/netmaj/patches/patch-af b/games/netmaj/patches/patch-af
index becbfd18d6a..32669f7ce22 100644
--- a/games/netmaj/patches/patch-af
+++ b/games/netmaj/patches/patch-af
@@ -1,16 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/04/22 09:58:59 kei Exp $
+$NetBSD: patch-af,v 1.2 2008/02/29 20:53:02 jlam Exp $
 
---- server.c.orig	Fri Sep  6 06:29:53 1996
+--- server.c.orig	1996-09-05 17:29:53.000000000 -0400
 +++ server.c
-@@ -23,6 +23,7 @@
- 
- #include <signal.h>
- #include <sys/wait.h>
-+#include <unistd.h>
- #ifndef SIGCHLD
- #define SIGCHLD SIGCLD
- #endif
-@@ -131,7 +132,7 @@
+@@ -131,7 +131,7 @@ char *argv[];
  	pack_rule(&rule);
  
  	if (debug == 0) {
diff --git a/games/netmaj/patches/patch-ag b/games/netmaj/patches/patch-ag
deleted file mode 100644
index 8672594d3c3..00000000000
--- a/games/netmaj/patches/patch-ag
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/04/22 09:58:59 kei Exp $
-
---- server_kill.c.orig	Sat Aug 31 17:14:38 1996
-+++ server_kill.c
-@@ -23,2 +23,3 @@
- 
-+#include <unistd.h>
- #include "pai.h"
diff --git a/games/netmaj/patches/patch-ai b/games/netmaj/patches/patch-ai
index 155ad5936a4..e01a7cdd25e 100644
--- a/games/netmaj/patches/patch-ai
+++ b/games/netmaj/patches/patch-ai
@@ -1,13 +1,14 @@
-$NetBSD: patch-ai,v 1.1 2004/01/23 19:05:45 agc Exp $
+$NetBSD: patch-ai,v 1.2 2008/02/29 20:53:02 jlam Exp $
 
---- global.h	2004/01/23 18:57:54	1.1
-+++ global.h	2004/01/23 18:58:17
-@@ -70,7 +70,7 @@
- typedef struct river {
- 	pai_t in;		/* get pai */
+--- global.h.orig	1996-08-31 04:14:40.000000000 -0400
++++ global.h
+@@ -20,2 +20,4 @@
+ #include <stdio.h>
++#include <string.h>
++#include <unistd.h>
+ #include "comm.h"
+@@ -72,3 +74,3 @@ typedef struct river {
  	pai_t out;		/* put pai */
 -	attr_t attr;		/* attr (how get, how put, how ...)*/
 +	pai_attr_t attr;		/* attr (how get, how put, how ...)*/
  	struct river *prev;
- 	struct river *next;
- } river_t;
diff --git a/games/netmaj/patches/patch-ak b/games/netmaj/patches/patch-ak
deleted file mode 100644
index f72853ef461..00000000000
--- a/games/netmaj/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/01/23 19:05:45 agc Exp $
-
---- lib/libcurses/printw.c	2004/01/23 19:01:18	1.1
-+++ lib/libcurses/printw.c	2004/01/23 19:01:45
-@@ -42,10 +42,6 @@
-  * is not in effect.
-  */
- 
--#ifdef __GNUC__
--#undef __STDC__
--#endif
--
- #if __STDC__
- #include <stdarg.h>
- #else
diff --git a/games/netmaj/patches/patch-al b/games/netmaj/patches/patch-al
new file mode 100644
index 00000000000..130b688acd1
--- /dev/null
+++ b/games/netmaj/patches/patch-al
@@ -0,0 +1,10 @@
+$NetBSD: patch-al,v 1.1 2008/02/29 20:53:02 jlam Exp $
+
+--- ss.c.orig	1996-09-05 06:11:24.000000000 -0400
++++ ss.c
+@@ -26,4 +26,5 @@
+  */
+ 
++#include <string.h>
+ #include "ss.h"
+