Wed Mar 5 18:30:59 2008 UTC ()
Just use extern declarations of tgetent() and tgetnum() instead of
figuring out whether to include <termcap.h> or <curses.h> and <term.h>.


(jlam)
diff -r1.11 -r1.12 pkgsrc/time/devtodo/distinfo
diff -r1.3 -r1.4 pkgsrc/time/devtodo/patches/patch-ab
cvs diff -r1.11 -r1.12 pkgsrc/time/devtodo/distinfo (expand / switch to unified diff)

--- pkgsrc/time/devtodo/distinfo 2008/03/05 16:51:40 1.11
+++ pkgsrc/time/devtodo/distinfo 2008/03/05 18:30:59 1.12
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.11 2008/03/05 16:51:40 jlam Exp $ 1$NetBSD: distinfo,v 1.12 2008/03/05 18:30:59 jlam Exp $
2 2
3SHA1 (devtodo-0.1.20.tar.gz) = 003067a12139d712dbb3706069e0950a93ecaaf4 3SHA1 (devtodo-0.1.20.tar.gz) = 003067a12139d712dbb3706069e0950a93ecaaf4
4RMD160 (devtodo-0.1.20.tar.gz) = 389201318faa5ff6d302bd5f8c8f8b094664b45c 4RMD160 (devtodo-0.1.20.tar.gz) = 389201318faa5ff6d302bd5f8c8f8b094664b45c
5Size (devtodo-0.1.20.tar.gz) = 390935 bytes 5Size (devtodo-0.1.20.tar.gz) = 390935 bytes
6SHA1 (patch-ab) = 32844dec69a473020103c9fd3425c60042dadf35 6SHA1 (patch-ab) = 88507dd1f88d13e3882f9a3a2d815172c132d0b5
7SHA1 (patch-ae) = 5f5ffb9571e73656eecdd3cb6cf72e26c193847e 7SHA1 (patch-ae) = 5f5ffb9571e73656eecdd3cb6cf72e26c193847e
cvs diff -r1.3 -r1.4 pkgsrc/time/devtodo/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/time/devtodo/patches/patch-ab 2005/06/01 02:40:43 1.3
+++ pkgsrc/time/devtodo/patches/patch-ab 2008/03/05 18:30:59 1.4
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ab,v 1.3 2005/06/01 02:40:43 snj Exp $ 1$NetBSD: patch-ab,v 1.4 2008/03/05 18:30:59 jlam Exp $
2 2
3--- src/todoterm.cc.orig 2005-05-31 19:12:33.000000000 -0700 3--- src/todoterm.cc.orig 2007-06-28 09:04:36.000000000 -0400
4+++ src/todoterm.cc 2005-05-31 19:13:02.000000000 -0700 4+++ src/todoterm.cc
5@@ -6,7 +6,11 @@ 5@@ -5,8 +5,9 @@
 6 #include <iostream>
6 #include <string> 7 #include <string>
7 #include <stdexcept> 8 #include <stdexcept>
8 #include <curses.h> 9-#include <curses.h>
9+#ifdef __NetBSD__ 10-#include <term.h>
10+#include <termcap.h> 11+
11+#else 12+extern "C" int tgetent(char *, const char *);
12 #include <term.h> 13+extern "C" int tgetnum(const char *);
13+#endif 
14  14
15 static char info[2048]; 15 static char info[2048];
16 static bool term_initialized; 16 static bool term_initialized;