- update to 1.6.5

- fix LP64 problems; fixes amd64 crash reported by Marcos Latas

misc/splitvt/Makefile

@@ -1,25 +1,29 @@
-# $OpenBSD: Makefile,v 1.16 2004/12/22 11:50:29 alek Exp $
+# $OpenBSD: Makefile,v 1.17 2005/10/31 20:27:14 naddy Exp $
 
 COMMENT=	"run two shells in a split window/terminal"
 
-DISTNAME=	splitvt-1.6.3
+DISTNAME=	splitvt-1.6.5
 CATEGORIES=	misc
 
-MASTER_SITES=	${MASTER_SITE_SUNSITE:=utils/console/}
+HOMEPAGE=	http://www.devolution.com/~slouken/projects/splitvt/
+MASTER_SITES=	${HOMEPAGE}
 
-# License: GPL
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c termcap
 
-CONFIGURE_STYLE=	simple
-CONFIGURE_SCRIPT=	Configure
+WANTLIB=	c termcap
+
+CONFIGURE_STYLE=simple
 ALL_TARGET=
 
 NO_REGRESS=	Yes
 
+pre-configure:
+	@rm ${WRKSRC}/Makefile
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/splitvt ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/splitvt.1 ${PREFIX}/man/man1

misc/splitvt/distinfo

@@ -1,4 +1,4 @@
-MD5 (splitvt-1.6.3.tar.gz) = e95e166145ec51d2a9d80aa6472f9f98
-RMD160 (splitvt-1.6.3.tar.gz) = 57606675f2e482fc594b9548f0b3949c222dfd0a
-SHA1 (splitvt-1.6.3.tar.gz) = 0a2ca870a770b663b50b92881e31eb3492107cec
-SIZE (splitvt-1.6.3.tar.gz) = 57692
+MD5 (splitvt-1.6.5.tar.gz) = 9f8ea38241daef8161b8010bc2249f0b
+RMD160 (splitvt-1.6.5.tar.gz) = 63c2e3588212b5fbef7dadb114aa1d7beb4e2269
+SHA1 (splitvt-1.6.5.tar.gz) = ea6e5b72927934f341ac0c283076b90958f89b67
+SIZE (splitvt-1.6.5.tar.gz) = 66451

misc/splitvt/patches/patch-Configure

@@ -1,20 +0,0 @@
-$OpenBSD: patch-Configure,v 1.1 2001/03/12 16:21:17 wilfried Exp $
---- Configure.orig	Fri Jan 20 21:45:50 1995
-+++ Configure	Mon Mar 12 17:20:26 2001
-@@ -3,7 +3,6 @@
- #  Script to auto-configure splitvt.		-Sam Lantinga
- 
- QUIET="-v"
--CFLAGS=
- MAKE="echo \"Done.  Type 'make' to build\"" 
- 
- echo "Making configuration..."
-@@ -25,7 +24,7 @@ done
- 
- cc $CFLAGS -o config config.c
- if [ -f config ]; then
--	if ./config $QUIET
-+	if env CFLAGS="$CFLAGS" ./config $QUIET
- 	  then eval $MAKE
- 	fi
- else

misc/splitvt/patches/patch-config_c

@@ -1,6 +1,6 @@
-$OpenBSD: patch-config_c,v 1.1 2001/03/12 16:21:17 wilfried Exp $
---- config.c.orig	Fri Jan 20 21:45:51 1995
-+++ config.c	Mon Mar 12 17:21:35 2001
+$OpenBSD: patch-config_c,v 1.2 2005/10/31 20:27:14 naddy Exp $
+--- config.c.orig	Sat May  3 22:48:04 2003
++++ config.c	Mon Oct 31 20:53:56 2005
 @@ -2,6 +2,7 @@
  #include	<stdio.h>
  #include	<sys/stat.h>

misc/splitvt/patches/patch-configure

@@ -0,0 +1,11 @@
+$OpenBSD: patch-configure,v 1.1 2005/10/31 20:27:14 naddy Exp $
+--- configure.orig	Mon Oct 31 20:54:06 2005
++++ configure	Mon Oct 31 20:56:05 2005
+@@ -4,7 +4,6 @@
+ QUIET="-v"
+ # use $CC if set, else set it to cc
+ : ${CC:=cc}
+-CFLAGS=
+ MAKE="echo \"Done.  Type 'make' to build\"" 
+ 
+ echo "Making configuration..."

misc/splitvt/patches/patch-misc_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-misc_c,v 1.1 2005/10/31 20:27:14 naddy Exp $
+--- misc.c.orig	Mon Oct 31 21:07:07 2005
++++ misc.c	Mon Oct 31 21:07:22 2005
+@@ -4,6 +4,7 @@
+ #include	<sys/stat.h>
+ #include	<fcntl.h>
+ #include	<stdio.h>
++#include	<stdlib.h>
+ #include	<signal.h>
+ 
+ 

misc/splitvt/patches/patch-parserc_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-parserc_c,v 1.1 2005/10/31 20:27:14 naddy Exp $
+--- parserc.c.orig	Mon Oct 31 21:12:34 2005
++++ parserc.c	Mon Oct 31 21:12:56 2005
+@@ -8,6 +8,7 @@
+ #include <pwd.h>
+ #include <fcntl.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include "splitvt.h"
+ 

misc/splitvt/patches/patch-splitvt_c

@@ -1,23 +1,11 @@
-$OpenBSD: patch-splitvt_c,v 1.1 2002/02/20 22:34:10 pvalchev Exp $
---- splitvt.c.orig	Tue Dec 12 14:52:15 1995
-+++ splitvt.c	Wed Feb 20 15:29:23 2002
-@@ -105,7 +105,7 @@ char *argv[];
- 	extern int errno, optind;
- 	extern char *optarg;
- 
--	int i, len, maxfds, numready;
-+	int i, len, maxfds, numready, x;
- 	char buffer[BUFSIZ], *ptr;
- 	char *xterm_title=NULL;
- 	struct timeval tv, *tvptr;
-@@ -379,8 +379,9 @@ char *argv[];
- 		if ( FD_ISSET(ttyfd, &read_mask) )
- 		{
- 			do {
--				if ( (buffer[0]=event_getc(&X_event)) == EOF )
-+				if ( (x=event_getc(&X_event)) == EOF )
- 					finish(0);
-+				buffer[0] = x;
- 
- 				if ( X_event.happening ) {
- 					/* Work only on button press */
+$OpenBSD: patch-splitvt_c,v 1.2 2005/10/31 20:27:14 naddy Exp $
+--- splitvt.c.orig	Mon Oct 31 21:03:34 2005
++++ splitvt.c	Mon Oct 31 21:03:53 2005
+@@ -19,6 +19,7 @@ static char *version=
+ #include	<fcntl.h>
+ #include	<signal.h>
+ #include	<stdio.h>
++#include	<stdlib.h>
+ #include	<errno.h>
+ #include	<pwd.h>
+ #ifdef HAVE_UNISTD_H

misc/splitvt/patches/patch-utmp_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-utmp_c,v 1.1 2005/10/31 20:27:14 naddy Exp $
+--- utmp.c.orig	Mon Oct 31 21:10:02 2005
++++ utmp.c	Mon Oct 31 21:10:14 2005
+@@ -6,6 +6,9 @@
+ #include	<fcntl.h>
+ #include	<utmp.h>
+ #include	<stdio.h>
++#ifdef HAVE_UNISTD_H
++#include        <unistd.h>
++#endif
+ 
+ #ifdef DEBUG_UTMP
+ #undef  UTMP_FILE

misc/splitvt/patches/patch-videomem_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-videomem_c,v 1.1 2005/10/31 20:27:14 naddy Exp $
+--- videomem.c.orig	Mon Oct 31 21:11:17 2005
++++ videomem.c	Mon Oct 31 21:11:33 2005
+@@ -2,6 +2,7 @@
+ /* This file holds the functions for manipulating video memory */
+ 
+ #include	<stdio.h>
++#include	<stdlib.h>
+ #include	"video.h"
+ #include	"terminal.h"
+ 

misc/splitvt/patches/patch-vt100_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-vt100_c,v 1.1 2005/10/31 20:27:14 naddy Exp $
+--- vt100.c.orig	Mon Oct 31 21:08:40 2005
++++ vt100.c	Mon Oct 31 21:08:58 2005
+@@ -16,6 +16,7 @@
+ #endif
+ #include	<errno.h>
+ #include	<stdio.h>
++#include	<stdlib.h>
+ #include	<ctype.h>
+ #include	"vt100.h"
+ #include	"video.h"

misc/splitvt/patches/patch-vtmouse_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-vtmouse_c,v 1.1 2005/10/31 20:27:14 naddy Exp $
+--- vtmouse.c.orig	Mon Oct 31 21:11:57 2005
++++ vtmouse.c	Mon Oct 31 21:12:14 2005
+@@ -8,6 +8,7 @@
+ #define SPLITVT_SOURCE
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "vtmouse.h"
+ 
+ extern FILE *safe_popen();		/* From misc.c */