From edd3142d1f35d92347e432094f853235337de140 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Tue, 14 Jul 2009 06:47:12 +0000
Subject: [PATCH] Don't need ncurses, use curses.

---
 GNUmakefile |  4 ++--
 Makefile    |  4 ++--
 configure   |  3 +--
 tty-term.c  | 10 +++++-----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index c2e91603..aaa57f55 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.108 2009-07-06 18:21:17 nicm Exp $
+# $Id: GNUmakefile,v 1.109 2009-07-14 06:47:12 nicm Exp $
 
 .PHONY: clean
 
@@ -9,7 +9,7 @@ FDEBUG= 1
 CC?= gcc
 CFLAGS+= -DBUILD="\"$(VERSION)\""
 LDFLAGS+= -L/usr/local/lib
-LIBS+= -lncurses
+LIBS+= -lcurses
 
 # This sort of sucks but gets rid of the stupid warning and should work on
 # most platforms...
diff --git a/Makefile b/Makefile
index 07d3be62..ba249dbf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.143 2009-07-06 18:21:17 nicm Exp $
+# $Id: Makefile,v 1.144 2009-07-14 06:47:12 nicm Exp $
 
 .SUFFIXES: .c .o
 .PHONY: clean
@@ -10,7 +10,7 @@ FDEBUG= 1
 CC?= cc
 CFLAGS+= -DBUILD="\"$(VERSION)\""
 LDFLAGS+= -L/usr/local/lib
-LIBS+= -lncurses
+LIBS+= -lcurses
 
 # This sort of sucks but gets rid of the stupid warning and should work on
 # most platforms...
diff --git a/configure b/configure
index dbc4e5d3..e5fab36f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.17 2009-07-02 07:31:01 nicm Exp $
+# $Id: configure,v 1.18 2009-07-14 06:47:12 nicm Exp $
 
 TMUX_PLATFORM=${TMUX_PLATFORM:-`uname -s`}
 
@@ -92,7 +92,6 @@ EOF
 #define HAVE_DAEMON
 EOF
 	cat <<EOF >>$CONFIG_MK
-CPPFLAGS+= -I/usr/local/include/ncurses
 SRCS+= osdep-unknown.c \
 	compat/asprintf.c \
 	compat/bsd-poll.c \
diff --git a/tty-term.c b/tty-term.c
index 4a3961c0..f86680b9 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -1,4 +1,4 @@
-/* $Id: tty-term.c,v 1.21 2009-06-25 16:47:00 nicm Exp $ */
+/* $OpenBSD: tty-term.c,v 1.3 2009/07/14 06:30:45 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -18,7 +18,7 @@
 
 #include <sys/types.h>
 
-#include <ncurses.h>
+#include <curses.h>
 #include <string.h>
 #include <term.h>
 
@@ -183,7 +183,7 @@ tty_term_find(char *name, int fd, char **cause)
 	term->flags = 0;
 	SLIST_INSERT_HEAD(&tty_terms, term, entry);
 
-	/* Set up ncurses terminal. */
+	/* Set up curses terminal. */
 	if (setupterm(name, fd, &error) != OK) {
 		switch (error) {
 		case 0:
@@ -237,7 +237,7 @@ tty_term_find(char *name, int fd, char **cause)
 	}
 	tty_term_quirks(term);
 
-	/* Delete ncurses data. */
+	/* Delete curses data. */
 	del_curterm(cur_term);
 
 	/* These are always required. */
@@ -358,7 +358,7 @@ tty_term_string(struct tty_term *term, enum tty_code_code code)
 	return (term->codes[code].value.string);
 }
 
-/* No vtparm. Fucking ncurses. */
+/* No vtparm. Fucking curses. */
 const char *
 tty_term_string1(struct tty_term *term, enum tty_code_code code, int a)
 {