CVS commit: pkgsrc/devel/ncurses

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Feb 12 20:11:22 UTC 2019

Modified Files:
        pkgsrc/devel/ncurses: Makefile Makefile.common

Log Message:
ncurses: disable build of manpage-tbl to avoid circular dependency

groff has been removed on FreeBSD 12 and its build leads to a circular
dependency.
Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 pkgsrc/devel/ncurses/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/ncurses/Makefile.common

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

Modified files:

Index: pkgsrc/devel/ncurses/Makefile
diff -u pkgsrc/devel/ncurses/Makefile:1.100 pkgsrc/devel/ncurses/Makefile:1.101
--- pkgsrc/devel/ncurses/Makefile:1.100 Thu Oct 18 19:42:49 2018
+++ pkgsrc/devel/ncurses/Makefile       Tue Feb 12 20:11:22 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2018/10/18 19:42:49 leot Exp $
+# $NetBSD: Makefile,v 1.101 2019/02/12 20:11:22 triaxx Exp $
 
 .include "Makefile.common"
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       CRT screen handling and optimization package
 
 INSTALLATION_DIRS+=    share/examples

Index: pkgsrc/devel/ncurses/Makefile.common
diff -u pkgsrc/devel/ncurses/Makefile.common:1.37 pkgsrc/devel/ncurses/Makefile.common:1.38
--- pkgsrc/devel/ncurses/Makefile.common:1.37   Sat Sep 15 22:47:41 2018
+++ pkgsrc/devel/ncurses/Makefile.common        Tue Feb 12 20:11:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2018/09/15 22:47:41 wiz Exp $
+# $NetBSD: Makefile.common,v 1.38 2019/02/12 20:11:22 triaxx Exp $
 #
 # used by devel/ncurses/Makefile
 # used by devel/ncursesw/Makefile
@@ -54,7 +54,8 @@ CONFIGURE_ENV+=               ac_cv_path_TIC_PATH=${L
 # otherwise we get a circular dependency problem.
 # Additionally, Interix is special, see ../../mk/curses.buildlink3.mk
 .  if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h)) || \
-       ${OPSYS} == "Interix"
+       ${OPSYS} == "Interix" || \
+       (${OPSYS} == "FreeBSD" && ${OS_VERSION} >= 12)
 # None was available, so disable use of tbl(1)
 USE_TOOLS:=            ${USE_TOOLS:Ntbl}
 CONFIGURE_ARGS+=       --without-manpage-tbl