CVS commit: pkgsrc/textproc/aspell

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Wed Jul 24 19:04:29 UTC 2019

Modified Files:
        pkgsrc/textproc/aspell: Makefile

Log Message:
NetBSD curses has been fixed since 8.1.
So, ncurses is no longer required.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/textproc/aspell/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/aspell/Makefile
diff -u pkgsrc/textproc/aspell/Makefile:1.70 pkgsrc/textproc/aspell/Makefile:1.71
--- pkgsrc/textproc/aspell/Makefile:1.70        Wed Aug 22 09:46:44 2018
+++ pkgsrc/textproc/aspell/Makefile     Wed Jul 24 19:04:29 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2018/08/22 09:46:44 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2019/07/24 19:04:29 rin Exp $
 #
 
 DISTNAME=              aspell-0.60.6.1
-PKGREVISION=           8
+PKGREVISION=           9
 CATEGORIES=            textproc
 MASTER_SITES=          ${MASTER_SITE_GNU:=aspell/}
 
@@ -25,13 +25,19 @@ USE_PKGLOCALEDIR=   yes
 INFO_FILES=            yes
 
 CONFIGURE_ARGS+=       --enable-doc-dir=${PREFIX}/share/doc/aspell
-CONFIGURE_ARGS+=       --enable-curses=ncurses
+CONFIGURE_ARGS+=       --enable-curses=${CURSES_TYPE}
 CONFIGURE_ARGS+=       --enable-pkgdatadir=${PREFIX}/share/aspell
 CONFIGURE_ARGS+=       --enable-dict-dir=${PREFIX}/lib/aspell
 CONFIGURE_ENV+=                gt_cv_func_gnugettext1_libintl=yes
 
 .include "../../mk/bsd.prefs.mk"
 
+# aspell does not work with curses in NetBSD <= 8.0.
+.if !empty(MACHINE_PLATFORM:MNetBSD-8.0*) || \
+    !empty(MACHINE_PLATFORM:MNetBSD-[0-7].*)
+USE_CURSES=    ncurses
+.endif
+
 .if !empty(MACHINE_PLATFORM:MIRIX-5*)
 CPPFLAGS+=     -DDECLARE_VSNPRINTF -DDECLARE_SNPRINTF
 # IRIX 5 has an older implementation of signal()
@@ -47,5 +53,5 @@ NOT_FOR_COMPILER=     xlc
 LIBS.SunOS+=           -lm
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"