[pkgsrc/trunk]: pkgsrc/games/netmaj + Don't build our own, very old version o...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d2caa54b123
branches:  trunk
changeset: 539177:3d2caa54b123
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Feb 29 20:53:02 2008 +0000

description:
+ 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.

diffstat:

 games/netmaj/Makefile           |   20 ++-
 games/netmaj/PLIST              |  200 ++++++++++++++++++++--------------------
 games/netmaj/distinfo           |   15 +--
 games/netmaj/files/configure.sh |   52 ++++++++++
 games/netmaj/patches/patch-aa   |   89 +++++------------
 games/netmaj/patches/patch-ab   |   12 --
 games/netmaj/patches/patch-ac   |   12 --
 games/netmaj/patches/patch-ad   |    8 -
 games/netmaj/patches/patch-ae   |   12 --
 games/netmaj/patches/patch-af   |   14 +--
 games/netmaj/patches/patch-ag   |    8 -
 games/netmaj/patches/patch-ai   |   17 +-
 games/netmaj/patches/patch-ak   |   15 ---
 games/netmaj/patches/patch-al   |   10 ++
 14 files changed, 219 insertions(+), 265 deletions(-)

diffs (truncated from 599 to 300 lines):

diff -r 1b330b1ee5e8 -r 3d2caa54b123 games/netmaj/Makefile
--- a/games/netmaj/Makefile     Fri Feb 29 19:34:44 2008 +0000
+++ b/games/netmaj/Makefile     Fri Feb 29 20:53:02 2008 +0000
@@ -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 @@
 
 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 -r 1b330b1ee5e8 -r 3d2caa54b123 games/netmaj/PLIST
--- a/games/netmaj/PLIST        Fri Feb 29 19:34:44 2008 +0000
+++ b/games/netmaj/PLIST        Fri Feb 29 20:53:02 2008 +0000
@@ -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/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 -r 1b330b1ee5e8 -r 3d2caa54b123 games/netmaj/distinfo
--- a/games/netmaj/distinfo     Fri Feb 29 19:34:44 2008 +0000
+++ b/games/netmaj/distinfo     Fri Feb 29 20:53:02 2008 +0000
@@ -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 -r 1b330b1ee5e8 -r 3d2caa54b123 games/netmaj/files/configure.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/netmaj/files/configure.sh   Fri Feb 29 20:53:02 2008 +0000
@@ -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"