Mon May 6 07:56:23 2024 UTC (21d)
ncurses: Remove NetBSD builtin hack.

If this file is being included, then the package has specifically
requested ncurses.  This code was committed in 2005 and since then the
pkgsrc curses handling has been revamped significantly.


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

--- pkgsrc/devel/ncurses/builtin.mk 2024/05/06 07:51:21 1.46
+++ pkgsrc/devel/ncurses/builtin.mk 2024/05/06 07:56:23 1.47
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.46 2024/05/06 07:51:21 jperkin Exp $ 1# $NetBSD: builtin.mk,v 1.47 2024/05/06 07:56:23 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
@@ -62,37 +62,26 @@ USE_BUILTIN.ncurses= ${IS_BUILTIN.ncurse @@ -62,37 +62,26 @@ USE_BUILTIN.ncurses= ${IS_BUILTIN.ncurse
62 ${IS_BUILTIN.ncurses:tl} == yes 62 ${IS_BUILTIN.ncurses:tl} == yes
63USE_BUILTIN.ncurses= yes 63USE_BUILTIN.ncurses= yes
64. for _dep_ in ${BUILDLINK_API_DEPENDS.ncurses} 64. for _dep_ in ${BUILDLINK_API_DEPENDS.ncurses}
65. if ${USE_BUILTIN.ncurses:tl} == yes 65. if ${USE_BUILTIN.ncurses:tl} == yes
66USE_BUILTIN.ncurses!= \ 66USE_BUILTIN.ncurses!= \
67 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.ncurses:Q}; then \ 67 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.ncurses:Q}; then \
68 ${ECHO} yes; \ 68 ${ECHO} yes; \
69 else \ 69 else \
70 ${ECHO} no; \ 70 ${ECHO} no; \
71 fi 71 fi
72. endif 72. endif
73. endfor 73. endfor
74. endif 74. endif
75# XXX 
76# XXX By default, assume that the native curses on NetBSD systems is 
77# XXX good enough to replace ncurses. In reality, no version of NetBSD 
78# XXX has a curses library that can completely replace ncurses; however, 
79# XXX some versions implement enough of ncurses that some packages are 
80# XXX happy. 
81# XXX 
82. if ${OPSYS} == "NetBSD" 
83USE_BUILTIN.ncurses= yes 
84H_NCURSES= /usr/include/curses.h 
85. endif 
86# 75#
87# Some platforms don't have a curses implementation that can replace 76# Some platforms don't have a curses implementation that can replace
88# ncurses. 77# ncurses.
89# 78#
90_INCOMPAT_CURSES?= 79_INCOMPAT_CURSES?=
91. for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES} 80. for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES}
92. if !empty(MACHINE_PLATFORM:M${_pattern_}) 81. if !empty(MACHINE_PLATFORM:M${_pattern_})
93USE_BUILTIN.ncurses= no 82USE_BUILTIN.ncurses= no
94. endif 83. endif
95. endfor 84. endfor
96. endif # PREFER.ncurses 85. endif # PREFER.ncurses
97.endif 86.endif
98MAKEVARS+= USE_BUILTIN.ncurses 87MAKEVARS+= USE_BUILTIN.ncurses