Tue Feb 26 10:20:17 2013 UTC ()
Fix return types.


(joerg)
diff -r1.9 -r1.10 pkgsrc/x11/hanterm/distinfo
diff -r1.5 -r1.6 pkgsrc/x11/hanterm/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/x11/hanterm/patches/patch-ae
cvs diff -r1.9 -r1.10 pkgsrc/x11/hanterm/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/hanterm/distinfo 2005/12/04 01:10:33 1.9
+++ pkgsrc/x11/hanterm/distinfo 2013/02/26 10:20:17 1.10
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.9 2005/12/04 01:10:33 joerg Exp $ 1$NetBSD: distinfo,v 1.10 2013/02/26 10:20:17 joerg Exp $
2 2
3SHA1 (hanterm-3.1.6.tar.gz) = df2ff9ca8ddcee41baeaa8544a9983a1534e8b30 3SHA1 (hanterm-3.1.6.tar.gz) = df2ff9ca8ddcee41baeaa8544a9983a1534e8b30
4RMD160 (hanterm-3.1.6.tar.gz) = 9d9c6c1d2eca9ad338140f1d8c418ed5e0e9548b 4RMD160 (hanterm-3.1.6.tar.gz) = 9d9c6c1d2eca9ad338140f1d8c418ed5e0e9548b
5Size (hanterm-3.1.6.tar.gz) = 323736 bytes 5Size (hanterm-3.1.6.tar.gz) = 323736 bytes
6SHA1 (patch-aa) = fc4be22d26913c4235e132a0282f910c2e5d616f 6SHA1 (patch-aa) = 3f7f1797c5d8425ff146692e9127b2bfe2c21a5f
7SHA1 (patch-ab) = 8b861979eeffc3e9763f4a2162c0e007c61f1a6c 7SHA1 (patch-ab) = 8b861979eeffc3e9763f4a2162c0e007c61f1a6c
8SHA1 (patch-ac) = 4c6b6efc12f2e1fba6eb577c65c94d701574353b 8SHA1 (patch-ac) = 4c6b6efc12f2e1fba6eb577c65c94d701574353b
9SHA1 (patch-ad) = 50d6c38ab197e02a15b73bc7cfea476d22eaf961 9SHA1 (patch-ad) = 50d6c38ab197e02a15b73bc7cfea476d22eaf961
10SHA1 (patch-ae) = 677db306b1f0d340d130194155a25458c3fd69c5 10SHA1 (patch-ae) = 14596ad1ae796679a6fcc9184df95df57f0beba6
11SHA1 (patch-af) = 7306a141331bbbe1e4ee4e46549834be2ae2cfa1 11SHA1 (patch-af) = 7306a141331bbbe1e4ee4e46549834be2ae2cfa1
12SHA1 (patch-ag) = 50a7a71b7075ac57735189f43fd7e770ec9de81d 12SHA1 (patch-ag) = 50a7a71b7075ac57735189f43fd7e770ec9de81d
cvs diff -r1.5 -r1.6 pkgsrc/x11/hanterm/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/hanterm/patches/patch-aa 2005/12/04 01:10:33 1.5
+++ pkgsrc/x11/hanterm/patches/patch-aa 2013/02/26 10:20:17 1.6
@@ -1,21 +1,31 @@ @@ -1,21 +1,31 @@
1$NetBSD: patch-aa,v 1.5 2005/12/04 01:10:33 joerg Exp $ 1$NetBSD: patch-aa,v 1.6 2013/02/26 10:20:17 joerg Exp $
2 2
3--- misc.c.orig 2002-01-09 00:41:11.000000000 +0000 3--- misc.c.orig 2002-01-09 00:41:11.000000000 +0000
4+++ misc.c 4+++ misc.c
5@@ -35,7 +35,7 @@ 5@@ -35,7 +35,7 @@
6 #include <pwd.h> 6 #include <pwd.h>
7 #include <errno.h> 7 #include <errno.h>
8  8
9-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DARWIN__) 9-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DARWIN__)
10+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DARWIN__) || defined(__DragonFly__) 10+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DARWIN__) || defined(__DragonFly__)
11 #include <sys/param.h> 11 #include <sys/param.h>
12 #endif 12 #endif
13  13
14@@ -913,7 +913,6 @@ char *SysErrorMsg (n) 14@@ -584,8 +584,7 @@ register TScreen *screen;
 15 update_logging();
 16 }
 17
 18-CloseLog(screen)
 19-register TScreen *screen;
 20+void CloseLog(TScreen *screen)
 21 {
 22 if(!screen->logging || (screen->inhibit & I_LOG))
 23 return;
 24@@ -913,7 +912,6 @@ char *SysErrorMsg (n)
15 extern char *sys_errlist[]; 25 extern char *sys_errlist[];
16 #endif 26 #endif
17 #endif 27 #endif
18- extern int sys_nerr; 28- extern int sys_nerr;
19  29
20 return ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error"); 30 return ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
21 } 31 }
cvs diff -r1.2 -r1.3 pkgsrc/x11/hanterm/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/x11/hanterm/patches/patch-ae 2005/12/04 01:10:33 1.2
+++ pkgsrc/x11/hanterm/patches/patch-ae 2013/02/26 10:20:17 1.3
@@ -1,22 +1,60 @@ @@ -1,22 +1,60 @@
1$NetBSD: patch-ae,v 1.2 2005/12/04 01:10:33 joerg Exp $ 1$NetBSD: patch-ae,v 1.3 2013/02/26 10:20:17 joerg Exp $
2 2
3--- main.c.orig 2002-01-09 00:41:11.000000000 +0000 3--- main.c.orig 2002-01-09 00:41:11.000000000 +0000
4+++ main.c 4+++ main.c
5@@ -1527,7 +1527,8 @@ char **argv; 5@@ -583,6 +583,8 @@ static int tslot;
 6 #endif /* USE_SYSV_UTMP */
 7 static jmp_buf env;
 8
 9+static void spawn (void);
 10+
 11 char *ProgramName;
 12 Boolean sunFunctionKeys;
 13
 14@@ -806,7 +808,7 @@ static char *message[] = {
 15 NULL};
 16
 17 #ifndef USE_TERMIOS
 18-static remove_termcap_entry ();
 19+static void remove_termcap_entry (char *, const char *);
 20 #endif
 21
 22 static int abbrev (tst, cmp)
 23@@ -1527,7 +1529,8 @@ char **argv;
6 if (ioctl (pty, FIONBIO, (char *)&mode) == -1) SysError (ERROR_FIONBIO); 24 if (ioctl (pty, FIONBIO, (char *)&mode) == -1) SysError (ERROR_FIONBIO);
7 #endif /* USE_SYSV_TERMIO */ 25 #endif /* USE_SYSV_TERMIO */
8  26
9-#if defined(linux)||defined(SVR4)||(defined(hpux)&&OSMAJORVERSION>=10) 27-#if defined(linux)||defined(SVR4)||(defined(hpux)&&OSMAJORVERSION>=10)
10+ 28+
11+#ifndef VMS 29+#ifndef VMS
12 pty_mask = pty; 30 pty_mask = pty;
13 X_mask = Xsocket; 31 X_mask = Xsocket;
14 FD_ZERO(&Select_mask); 32 FD_ZERO(&Select_mask);
15@@ -3332,7 +3333,6 @@ static SIGNAL_T reapchild (n) 33@@ -1854,7 +1857,7 @@ void first_map_occurred ()
 34 #endif /* USE_HANDSHAKE else !USE_HANDSHAKE */
 35
 36
 37-spawn ()
 38+static void spawn (void)
 39 /*
 40 * Inits pty and tty and forks a login process.
 41 * Does not close fd Xsocket.
 42@@ -3332,7 +3335,6 @@ static SIGNAL_T reapchild (n)
16 consolepr(fmt,x0,x1,x2,x3,x4,x5,x6,x7,x8,x9) 43 consolepr(fmt,x0,x1,x2,x3,x4,x5,x6,x7,x8,x9)
17 char *fmt; 44 char *fmt;
18 { 45 {
19- extern int errno; 46- extern int errno;
20 extern char *SysErrorMsg(); 47 extern char *SysErrorMsg();
21 int oerrno; 48 int oerrno;
22 int f; 49 int f;
 50@@ -3357,9 +3359,7 @@ char *fmt;
 51
 52
 53 #ifndef USE_TERMIOS
 54-static remove_termcap_entry (buf, str)
 55- char *buf;
 56- char *str;
 57+static void remove_termcap_entry (char *buf, const char *str)
 58 {
 59 register char *strinbuf;
 60