Changes 1.2.5:

* Added append-mode to #capture: use #capture >file-name
* Cleaned #spawned commands interface: text they print on
  standard output *MUST* terminate with a newline ('\n')
  in order for powwow to execute it.
* Fixed missing #include <time.h> in main.h.
* Fixed broken matching of #mark patterns starting with $
* Added the following user-contributed patches:
  * Put also 1-char lines into history;
  * Do not capture/movie data coming from spawned commands;
  * Fixed a bug in command parser.

4 files changed, 24 insertions, 29 deletions

diff --git a/games/powwow/Makefile b/games/powwow/Makefile
index 7d62b03777e..850802d718f 100644
--- a/games/powwow/Makefile
+++ b/games/powwow/Makefile
@@ -1,20 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2004/01/24 13:30:56 grant Exp $
-#
+# $NetBSD: Makefile,v 1.5 2005/02/04 09:38:43 adam Exp $
 
-DISTNAME=	powwow-1.2.4
+DISTNAME=	powwow-1.2.5
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SUNSITE:=games/muds/}	\
-		ftp://Linuz.sns.it/pub/Linux/max/powwow/
+MASTER_SITES=	http://linuz.sns.it/~max/powwow/
 
 MAINTAINER=	jdolecek@NetBSD.org
-HOMEPAGE=	http://Linuz.sns.it/~max/powwow.html
+HOMEPAGE=	http://linuz.sns.it/~max/powwow.html
 COMMENT=	Client to play MUDs
 
 USE_GNU_TOOLS+=	make
 POWWOW_DIR=	${PREFIX}/share/powwow
 
 do-build:
-	cd ${WRKSRC} && POWWOW_DIR="${POWWOW_DIR}" ./make_it
+	cd ${WRKSRC} && POWWOW_DIR="${POWWOW_DIR}" CFLAGS="${CFLAGS}" ./make_it
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/powwow ${PREFIX}/bin
diff --git a/games/powwow/distinfo b/games/powwow/distinfo
index 2bb423417b0..1d173478690 100644
--- a/games/powwow/distinfo
+++ b/games/powwow/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2004/05/23 23:28:29 danw Exp $
+$NetBSD: distinfo,v 1.4 2005/02/04 09:38:43 adam Exp $
 
-SHA1 (powwow-1.2.4.tar.gz) = cf0477ca95144711ad351e9e1b9aa64df28727c8
-Size (powwow-1.2.4.tar.gz) = 169825 bytes
+SHA1 (powwow-1.2.5.tar.gz) = 505bf2f269011970e450b2877646e6ff037ba992
+Size (powwow-1.2.5.tar.gz) = 169159 bytes
 SHA1 (patch-aa) = c8359ddb3770aa6520dd50638f4dc6b183943566
-SHA1 (patch-ab) = 053dda5bb9ae22a85ea37fad9b43ffe90114cbec
-SHA1 (patch-ac) = ded89b8da6b31d7c3fb0c5b477b45d4a3d0ba53b
+SHA1 (patch-ab) = f5d14bf4a45a0dc0b9e6caa25338dc3329b5aeea
+SHA1 (patch-ac) = 706a8bb8a9e58a26542248facf2859ba311c5b25
 SHA1 (patch-ad) = b6457008ca461255d2d3e60ed401b10bb0c4fdd5
diff --git a/games/powwow/patches/patch-ab b/games/powwow/patches/patch-ab
index c88c8810caf..8a5790210d1 100644
--- a/games/powwow/patches/patch-ab
+++ b/games/powwow/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2004/05/23 23:28:29 danw Exp $
+$NetBSD: patch-ab,v 1.4 2005/02/04 09:38:43 adam Exp $
 
---- make_it.orig	Thu Jan 13 22:50:01 2000
-+++ make_it	Wed Feb 13 16:21:44 2002
-@@ -50,7 +50,14 @@
+--- make_it.orig	2002-06-01 10:33:35.000000000 +0000
++++ make_it
+@@ -52,11 +52,18 @@ case $OS in
                  CC='gcc'
                  CF='-O2 -fomit-frame-pointer -DUSE_RANDOM -DUSE_VT100 -DLINES=25'
                  LF='';;
@@ -18,3 +18,9 @@ $NetBSD: patch-ab,v 1.3 2004/05/23 23:28:29 danw Exp $
  	*)
  		echo 'UNSUPPORTED OS!!! Trying with defaults.';;
  esac
+-echo "make" $* "CC='$CC' CDEFS='$CF' LDFLAGS='$LF' "
++echo "make" $* "CC='$CC' CDEFS='$CF $CFLAGS' LDFLAGS='$LF' "
+ 
+-make $* CC="${CC}" CDEFS="${CF}" LDFLAGS="${LF}"
++make $* CC="${CC}" CDEFS="${CF} ${CFLAGS}" LDFLAGS="${LF}"
+ 
diff --git a/games/powwow/patches/patch-ac b/games/powwow/patches/patch-ac
index 72919e47072..ecda936529b 100644
--- a/games/powwow/patches/patch-ac
+++ b/games/powwow/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2002/02/13 18:43:39 jdolecek Exp $
+$NetBSD: patch-ac,v 1.2 2005/02/04 09:38:43 adam Exp $
 
---- follow.c.orig	Wed Feb 13 15:59:06 2002
-+++ follow.c	Wed Feb 13 15:59:46 2002
-@@ -96,7 +96,7 @@
+--- follow.c.orig	2002-02-19 19:42:34.000000000 +0000
++++ follow.c
+@@ -96,7 +96,7 @@ void set_terminal()
      ioctl(0, TIOCGLTC, &ltcsave);
      ttyb = ttybsave;
      ttyb.sg_flags = (ttyb.sg_flags|O_CBREAK) & ~O_ECHO;
@@ -11,12 +11,3 @@ $NetBSD: patch-ac,v 1.1 2002/02/13 18:43:39 jdolecek Exp $
      ltc = ltcsave;
      ltc.t_suspc = -1;
      ioctl(0, TIOCSLTC, &ltc);
-@@ -127,7 +127,7 @@
- #endif /* USE_SGTTY */
- }
- 
--void main(int argc, char *argv[]) {
-+int main(int argc, char *argv[]) {
-    FILE *f;
-    char c = 0, buf[512];
-    int d;