Mon May 6 07:57:35 2024 UTC (20d)
ncurses: Remove USE_TERMINFO.

This is a long-obsolete variable, support was moved to
mk/terminfo.buildlink3.mk many years ago.


(jperkin)
diff -r1.48 -r1.49 pkgsrc/devel/ncurses/builtin.mk
cvs diff -r1.48 -r1.49 pkgsrc/devel/ncurses/builtin.mk (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/builtin.mk 2024/05/06 07:56:51 1.48
+++ pkgsrc/devel/ncurses/builtin.mk 2024/05/06 07:57:35 1.49
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.48 2024/05/06 07:56:51 jperkin Exp $ 1# $NetBSD: builtin.mk,v 1.49 2024/05/06 07:57:35 jperkin Exp $
2 2
3BUILTIN_PKG:= ncurses 3BUILTIN_PKG:= ncurses
4 4
5BUILTIN_FIND_LIBS:= ncurses curses terminfo 5BUILTIN_FIND_LIBS:= ncurses curses terminfo
6BUILTIN_FIND_HEADERS_VAR:= H_NCURSES H_CURSES H_CURSES1 6BUILTIN_FIND_HEADERS_VAR:= H_NCURSES H_CURSES H_CURSES1
7BUILTIN_FIND_HEADERS.H_NCURSES= ncurses.h curses.h 7BUILTIN_FIND_HEADERS.H_NCURSES= ncurses.h curses.h
8#BUILTIN_FIND_HEADERS.H_NCURSES+= ncurses/curses.h 8#BUILTIN_FIND_HEADERS.H_NCURSES+= ncurses/curses.h
9BUILTIN_FIND_GREP.H_NCURSES= \#define[ ]*NCURSES_VERSION 9BUILTIN_FIND_GREP.H_NCURSES= \#define[ ]*NCURSES_VERSION
10BUILTIN_FIND_HEADERS.H_CURSES= ncurses.h curses.h 10BUILTIN_FIND_HEADERS.H_CURSES= ncurses.h curses.h
11BUILTIN_FIND_GREP.H_CURSES= mvwchgat 11BUILTIN_FIND_GREP.H_CURSES= mvwchgat
12BUILTIN_FIND_HEADERS.H_CURSES1= ncurses.h curses.h 12BUILTIN_FIND_HEADERS.H_CURSES1= ncurses.h curses.h
13BUILTIN_FIND_GREP.H_CURSES1= wsyncup 13BUILTIN_FIND_GREP.H_CURSES1= wsyncup
14BUILTIN_FIND_FILES_VAR= NCURSES_PC 14BUILTIN_FIND_FILES_VAR= NCURSES_PC
@@ -85,33 +85,26 @@ USE_BUILTIN.ncurses= no @@ -85,33 +85,26 @@ USE_BUILTIN.ncurses= no
85.endif 85.endif
86# If it is set to chgat, a curses implementation with chgat(3) support 86# If it is set to chgat, a curses implementation with chgat(3) support
87# is considered good enough. 87# is considered good enough.
88.if defined(USE_NCURSES) && ${USE_NCURSES:U:tl} != yes 88.if defined(USE_NCURSES) && ${USE_NCURSES:U:tl} != yes
89. if ${USE_NCURSES:U} == chgat && ${H_CURSES:U} == __nonexistent__ 89. if ${USE_NCURSES:U} == chgat && ${H_CURSES:U} == __nonexistent__
90USE_BUILTIN.ncurses= no 90USE_BUILTIN.ncurses= no
91. endif 91. endif
92# same for wsyncup(3) 92# same for wsyncup(3)
93. if ${USE_NCURSES:U} == wsyncup && !empty(H_CURSES1:M__nonexistent__) 93. if ${USE_NCURSES:U} == wsyncup && !empty(H_CURSES1:M__nonexistent__)
94USE_BUILTIN.ncurses= no 94USE_BUILTIN.ncurses= no
95. endif 95. endif
96.endif 96.endif
97 97
98# if terminfo is needed and we don't have it, use pkgsrc ncurses 
99.if defined(USE_TERMINFO) 
100. if ${BUILTIN_LIB_FOUND.terminfo:U:tl} == no 
101USE_BUILTIN.ncurses= no 
102. endif 
103.endif 
104 
105# Define BUILTIN_LIBNAME.ncurses to be the base name of the built-in 98# Define BUILTIN_LIBNAME.ncurses to be the base name of the built-in
106# ncurses library. 99# ncurses library.
107# 100#
108.if ${BUILTIN_LIB_FOUND.ncurses:U:tl} == yes 101.if ${BUILTIN_LIB_FOUND.ncurses:U:tl} == yes
109BUILTIN_LIBNAME.ncurses= ncurses 102BUILTIN_LIBNAME.ncurses= ncurses
110.elif ${BUILTIN_LIB_FOUND.curses:U:tl} == yes 103.elif ${BUILTIN_LIB_FOUND.curses:U:tl} == yes
111BUILTIN_LIBNAME.ncurses= curses 104BUILTIN_LIBNAME.ncurses= curses
112.endif 105.endif
113# 106#
114# On Interix, there is a libncurses.a and a libcurses.so but strangely, 107# On Interix, there is a libncurses.a and a libcurses.so but strangely,
115# no libncurses.so. We want to link against the shared library, so 108# no libncurses.so. We want to link against the shared library, so
116# turn "-lncurses" into "-lcurses". 109# turn "-lncurses" into "-lcurses".
117# 110#