+ Include termcap.buildlink3.mk instead of curses.buildlink3.mk because

  gtexinfo only needs the t*() termcap functions (info/terminal.c).

+ Drop patch-ad.  The custom termcap code it added is now automatically
  handled by termcap.buildlink3.mk.  Also the modification to the
  function signature for output_character_function is wrong -- tputs
  does expect "int (*)(int)".

Bump the PKGREVISION to 1.

3 files changed, 4 insertions, 45 deletions

diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index 65c7f077b7b..3584a0a48b2 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2008/01/30 08:19:24 obache Exp $
+# $NetBSD: Makefile,v 1.70 2008/03/05 22:26:46 jlam Exp $
 
 DISTNAME=		texinfo-4.11
 PKGNAME=		g${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		devel sysutils
 MASTER_SITES=		${MASTER_SITE_GNU:=texinfo/}
 EXTRACT_SUFX=		.tar.bz2
@@ -35,7 +36,7 @@ PLIST_SRC+=		${PKGDIR}/PLIST.locale
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
-.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # This need to be defined here to override the setting in texinfo.mk
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo
index 73abf33b39b..f79d1b5c60b 100644
--- a/devel/gtexinfo/distinfo
+++ b/devel/gtexinfo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2008/01/30 08:19:25 obache Exp $
+$NetBSD: distinfo,v 1.30 2008/03/05 22:26:46 jlam Exp $
 
 SHA1 (texinfo-4.11.tar.bz2) = 915a42e1278860b0fa64e4ef9d5ad4488d3b23a0
 RMD160 (texinfo-4.11.tar.bz2) = d07dbc50f98dd8f9f4088b58781abdebfb7f5781
@@ -6,7 +6,6 @@ Size (texinfo-4.11.tar.bz2) = 1659601 bytes
 SHA1 (patch-aa) = eae1ca11ad9ce1df98d3df43893c80eb8809e56c
 SHA1 (patch-ab) = 464d9ca66dd0ba5c09e9cbd2dbc19d0a8156eb9b
 SHA1 (patch-ac) = 5550c4797cbaec7f133c8fc35fc15f96dc7bc77f
-SHA1 (patch-ad) = 39ef71c532f8d5dca1ef683a2a841fb79fe769b0
 SHA1 (patch-aj) = daab8068ee204ddcdca01d72879d099c38e931c3
 SHA1 (patch-ak) = 92daf86e90d6c3c4c5c1c83200371d19049ac65b
 SHA1 (patch-am) = 7d20c085b7d4219d323a690874f1a88796186c90
diff --git a/devel/gtexinfo/patches/patch-ad b/devel/gtexinfo/patches/patch-ad
deleted file mode 100644
index 98ae1eb6d2a..00000000000
--- a/devel/gtexinfo/patches/patch-ad
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2008/01/30 08:19:25 obache Exp $
-
---- info/terminal.c.orig	2007-07-01 23:20:31.000000000 +0200
-+++ info/terminal.c
-@@ -30,13 +30,17 @@
- #ifdef HAVE_NCURSES_TERMCAP_H
- #include <ncurses/termcap.h>
- #else
--#ifdef HAVE_TERMCAP_H
-+#if defined(HAVE_TERMCAP_H) && !defined(__NetBSD__)
- #include <termcap.h>
- #else
- /* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC.
-    Unfortunately, PC is a global variable used by the termcap library. */
- #undef PC
- 
-+#if defined(__NetBSD__)
-+#include <termcap.h>
-+#endif
-+
- /* Termcap requires these variables, whether we access them or not. */
- char *BC, *UP;
- char PC;      /* Pad character */
-@@ -111,11 +115,17 @@ static char *term_invend;
- /* Although I can't find any documentation that says this is supposed to
-    return its argument, all the code I've looked at (termutils, less)
-    does so, so fine.  */
-+#ifdef __NetBSD__
-+static void
-+#else
- static int
-+#endif
- output_character_function (int c)
- {
-   putc (c, stdout);
-+#ifndef __NetBSD__
-   return c;
-+#endif
- }
- 
- /* Macro to send STRING to the terminal. */