From 2d2799208a466ded4337499e7b9358683bcd6993 Mon Sep 17 00:00:00 2001
From: roy <roy@pkgsrc.org>
Date: Wed, 4 Jan 2017 13:19:56 +0000
Subject: Use the curses framework.

---
 textproc/hunspell/Makefile   |  4 ++--
 textproc/hunspell/options.mk | 18 +++++-------------
 textproc/urlview/Makefile    |  4 ++--
 3 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'textproc')

diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index 083551ae7c2..84b6aaed1aa 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2016/07/09 06:39:05 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/04 13:19:56 roy Exp $
 
 DISTNAME=	hunspell-1.3.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hunspell/}
 
diff --git a/textproc/hunspell/options.mk b/textproc/hunspell/options.mk
index 80533936c13..81eed677037 100644
--- a/textproc/hunspell/options.mk
+++ b/textproc/hunspell/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2013/08/27 22:11:20 richard Exp $
+# $NetBSD: options.mk,v 1.6 2017/01/04 13:19:56 roy Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.hunspell
 PKG_SUPPORTED_OPTIONS=		wide-curses
@@ -6,19 +6,11 @@ PKG_SUGGESTED_OPTIONS=		# empty
 
 .include "../../mk/bsd.options.mk"
 
-USE_NCURSES=	yes
-
 ###
 ### Wide curses support; otherwise, default to using narrow curses.
 ###
-.if !empty(MACHINE_PLATFORM:MNetBSD-[5-9].*-*)
-   CONFIGURE_ENV+=	ac_cv_lib_curses_tparm=yes
-.  include "../../mk/curses.buildlink3.mk"
-.else
-.  if !empty(PKG_OPTIONS:Mwide-curses)
-.    include "../../devel/ncursesw/buildlink3.mk"
-CPPFLAGS.SunOS+=	-D_XPG6
-.  else
-.    include "../../devel/ncurses/buildlink3.mk"
-.  endif
+INCOMPAT_CURSES=		NetBSD-[0-4].*-*
+.include "../../mk/curses.buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mwide-curses)
+CPPFLAGS.SunOS+=		-D_XPG6
 .endif
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index 3cbc073d2fe..6ea86b8315d 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2015/08/18 07:31:19 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2017/01/04 13:23:24 roy Exp $
 
 DISTNAME=	urlview-0.9
 PKGREVISION=	7
@@ -16,5 +16,5 @@ post-install:
 
 GNU_CONFIGURE=	yes
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3