make this compile with gcc4

3 files changed, 22 insertions, 17 deletions

diff --git a/sysutils/pcvt-utils/distinfo b/sysutils/pcvt-utils/distinfo
index e22679f77f9..ee0ceffc483 100644
--- a/sysutils/pcvt-utils/distinfo
+++ b/sysutils/pcvt-utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 13:40:55 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/11/13 14:51:08 drochner Exp $
 
 SHA1 (netbsd-pcvt-20000611.tar.gz) = ea51ded62dc82635f1eda3cd198b29cf6f4941ea
 RMD160 (netbsd-pcvt-20000611.tar.gz) = 33364b8503d286047163e9f4256374faa3c6b455
@@ -8,6 +8,6 @@ SHA1 (patch-ab) = cc05a87826f9573611bb0e70092b9f4b825584a8
 SHA1 (patch-ac) = 634aaf8fe965ade5c972c852fbb1710bf1028b2e
 SHA1 (patch-ad) = c6158765ff8ecc26dd9c297089c90b03c98172cb
 SHA1 (patch-ae) = d81e7ee5f59bf5d4e23d8f19868e190e2a8b2a53
-SHA1 (patch-af) = d07766a5d93ae97905ff0e9083246c1ad874219a
+SHA1 (patch-af) = ea4c0a0fee930184532d7f6961ef951d1e882027
 SHA1 (patch-ag) = fe39a7224c9ea78d97750a90e110d805d353c0ad
-SHA1 (patch-ah) = fcd676c9c3e292de8dfedb37d2d10a020f5b839b
+SHA1 (patch-ah) = c7654e13adc69f365b9674b7aa369f8ffb2c757f
diff --git a/sysutils/pcvt-utils/patches/patch-af b/sysutils/pcvt-utils/patches/patch-af
index 62f4488a128..7577c2b5670 100644
--- a/sysutils/pcvt-utils/patches/patch-af
+++ b/sysutils/pcvt-utils/patches/patch-af
@@ -1,12 +1,14 @@
-$NetBSD: patch-af,v 1.1 2000/12/28 02:32:16 wiz Exp $
+$NetBSD: patch-af,v 1.2 2006/11/13 14:51:08 drochner Exp $
 
---- demo/playvt.c.orig	Sat Nov  1 07:49:36 1997
+--- demo/playvt.c.orig	1997-11-01 07:49:36.000000000 +0100
 +++ demo/playvt.c
-@@ -42,6 +42,7 @@
+@@ -42,7 +42,9 @@ static char *id =
   *---------------------------------------------------------------------------*/
  	
  #include <stdio.h>
 +#include <string.h>
  #include <unistd.h>
++#include <stdlib.h>
  
  main(argc,argv)
+ int argc;
diff --git a/sysutils/pcvt-utils/patches/patch-ah b/sysutils/pcvt-utils/patches/patch-ah
index 5ff2de5fa73..10c830bf51f 100644
--- a/sysutils/pcvt-utils/patches/patch-ah
+++ b/sysutils/pcvt-utils/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2004/05/23 22:47:54 kristerw Exp $
+$NetBSD: patch-ah,v 1.2 2006/11/13 14:51:08 drochner Exp $
 
---- fontedit/fontedit.c.orig	2004-05-24 00:36:58.000000000 +0200
-+++ fontedit/fontedit.c	2004-05-24 00:39:38.000000000 +0200
-@@ -26,10 +26,10 @@
+--- fontedit/fontedit.c.orig	1995-10-07 22:44:58.000000000 +0100
++++ fontedit/fontedit.c
+@@ -26,20 +26,21 @@ void clear_screen();
  #include <stdio.h>
  #ifdef SYSV
  #include <sys/termio.h>
@@ -15,7 +15,10 @@ $NetBSD: patch-ah,v 1.1 2004/05/23 22:47:54 kristerw Exp $
  #if defined (__NetBSD__) || defined (__FreeBSD__)
  #include <sys/termios.h>
  #include <sys/ioctl.h>
-@@ -39,7 +39,7 @@
+ #endif /* __NetBSD__ || __FreeBSD__ */
+ #include <signal.h>
++#include <stdlib.h>
+ 
  #ifdef CURFIX
  #define CURSORON  "\033[?25h"
  #define CURSOROFF "\033[?25l"
@@ -24,7 +27,7 @@ $NetBSD: patch-ah,v 1.1 2004/05/23 22:47:54 kristerw Exp $
  
  #define	MAX_ROWS	10
  #define	MAX_COLS	8
-@@ -103,10 +103,10 @@
+@@ -103,10 +104,10 @@ unsigned int	current_entry;
  
  #ifdef SYSV
  struct termio old_stty, new_stty;
@@ -37,7 +40,7 @@ $NetBSD: patch-ah,v 1.1 2004/05/23 22:47:54 kristerw Exp $
  #if defined (__NetBSD__) || defined (__FreeBSD__)
  struct termios old_stty, new_stty;
  #endif /* __NetBSD__ || __FreeBSD__ */
-@@ -123,13 +123,13 @@
+@@ -123,13 +124,13 @@ interrupt()
  	void clear_screen();
  #ifdef CURFIX
          printf("%s\n",CURSORON);   
@@ -54,7 +57,7 @@ $NetBSD: patch-ah,v 1.1 2004/05/23 22:47:54 kristerw Exp $
  #if defined (__NetBSD__) || defined (__FreeBSD__)
          ioctl( 0, TIOCSETA, &old_stty );
  #endif /* __NetBSD__ || __FreeBSD__ */
-@@ -180,13 +180,13 @@
+@@ -180,13 +181,13 @@ char *argv[];
  	}
  #ifdef CURFIX
          printf("%s\n",CURSOROFF);
@@ -71,7 +74,7 @@ $NetBSD: patch-ah,v 1.1 2004/05/23 22:47:54 kristerw Exp $
  #if defined (__NetBSD__) || defined (__FreeBSD__)
          ioctl( 0, TIOCGETA, &old_stty );
  #endif /* __NetBSD__ || __FreeBSD__ */
-@@ -196,7 +196,7 @@
+@@ -196,7 +197,7 @@ char *argv[];
  	new_stty.c_lflag &= ~ICANON;
  	new_stty.c_cc[VMIN] = 1;
  	ioctl( 0, TCSETA, &new_stty );
@@ -80,7 +83,7 @@ $NetBSD: patch-ah,v 1.1 2004/05/23 22:47:54 kristerw Exp $
  #if defined (__NetBSD__) || defined (__FreeBSD__)
  	new_stty.c_lflag &= ~ICANON;
          new_stty.c_lflag &= ~ECHO;
-@@ -207,17 +207,17 @@
+@@ -207,17 +208,17 @@ char *argv[];
  	new_stty.sg_flags |= CBREAK;               
          new_stty.sg_flags &= ~ECHO;
  	ioctl( 0, TIOCSETP, &new_stty );
@@ -101,7 +104,7 @@ $NetBSD: patch-ah,v 1.1 2004/05/23 22:47:54 kristerw Exp $
  #if defined (__NetBSD__) || defined (__FreeBSD__)
  	ioctl( 0, TIOCSETA, &old_stty );
  #endif /* __NetBSD__ || __FreeBSD__ */
-@@ -230,7 +230,7 @@
+@@ -230,7 +231,7 @@ char *argv[];
  	fclose( font_file );
  #ifdef CURFIX
          printf("%s\n",CURSORON);