Rename termlib.* to termcap.* to better document exactly what packages

are trying to use (the termcap t*() API).

3 files changed, 74 insertions, 72 deletions

diff --git a/mk/termcap.buildlink3.mk b/mk/termcap.buildlink3.mk
new file mode 100644
index 00000000000..29f531c8525
--- /dev/null
+++ b/mk/termcap.buildlink3.mk
@@ -0,0 +1,52 @@
+# $NetBSD: termcap.buildlink3.mk,v 1.1 2008/02/29 22:41:13 jlam Exp $
+#
+# This Makefile fragment is meant to be included by packages that require
+# a termcap implementation that supports the basic termcap functions:
+#
+#	tgetent, tgetstr, tgetflag, tgetnum, tgoto, tputs
+#
+# === Variables set by this file ===
+#
+# TERMCAP_TYPE
+#	The name of the selected termcap implementation.
+
+TERMCAP_BUILDLINK3_MK:=	${TERMCAP_BUILDLINK3_MK}+
+
+.include "bsd.fast.prefs.mk"
+
+.if !empty(TERMCAP_BUILDLINK3_MK:M+)
+
+CHECK_BUILTIN.termcap:=	yes
+.  include "termcap.builtin.mk"
+CHECK_BUILTIN.termcap:=	no
+
+.  if !empty(USE_BUILTIN.termcap:M[yY][eE][sS])
+.    if defined(BUILTIN_LIBNAME.termcap)
+TERMCAP_TYPE=	${BUILTIN_LIBNAME.termcap}
+.    else
+TERMCAP_TYPE=	none
+.    endif
+.  else
+TERMCAP_TYPE=	curses
+.  endif
+
+BUILD_DEFS+=	TERMCAP_TYPE
+
+.endif	# TERMCAP_BUILDLINK3_MK
+
+.if ${TERMCAP_TYPE} == "none"
+PKG_FAIL_REASON=	"No usable termcap library found on the system."
+.elif (${TERMCAP_TYPE} == "termcap") || \
+      (${TERMCAP_TYPE} == "tinfo")
+BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ntermcap}
+BUILDLINK_PACKAGES+=		termcap
+BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}termcap
+BUILDLINK_LIBNAME.termcap?=	${BUILTIN_LIBNAME.termcap}
+BUILDLINK_LDADD.termcap?=	${BUILDLINK_LIBNAME.termcap:S/^/-l/:S/^-l$//}
+BUILDLINK_BUILTIN_MK.termcap=	../../mk/termcap.builtin.mk
+.elif ${TERMCAP_TYPE} == "curses"
+.  include "../../mk/curses.buildlink3.mk"
+BUILDLINK_PREFIX.termcap?=	${BUILDLINK_PREFIX.curses}
+BUILDLINK_LIBNAME.termcap?=	${BUILDLINK_LIBNAME.curses}
+BUILDLINK_LDADD.termcap?=	${BUILDLINK_LDADD.curses}
+.endif
diff --git a/mk/termlib.builtin.mk b/mk/termcap.builtin.mk
index 79bb7ed90a3..3f8ad0eb407 100644
--- a/mk/termlib.builtin.mk
+++ b/mk/termcap.builtin.mk
@@ -1,6 +1,6 @@
-# $NetBSD: termlib.builtin.mk,v 1.3 2008/02/27 17:36:34 jlam Exp $
+# $NetBSD: termcap.builtin.mk,v 1.1 2008/02/29 22:41:13 jlam Exp $
 
-BUILTIN_PKG:=	termlib
+BUILTIN_PKG:=	termcap
 
 BUILTIN_FIND_LIBS:=	termcap tinfo curses
 
@@ -10,49 +10,49 @@ BUILTIN_FIND_LIBS:=	termcap tinfo curses
 ### Determine if there is a built-in implementation of the package and
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
-.if !defined(IS_BUILTIN.termlib)
-IS_BUILTIN.termlib=	no
+.if !defined(IS_BUILTIN.termcap)
+IS_BUILTIN.termcap=	no
 .  if !empty(BUILTIN_LIB_FOUND.termcap:M[yY][eE][sS]) || \
       !empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS]) || \
       !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
-IS_BUILTIN.termlib=	yes
+IS_BUILTIN.termcap=	yes
 .  endif
 .endif
-MAKEVARS+=	IS_BUILTIN.termlib
+MAKEVARS+=	IS_BUILTIN.termcap
 
 ###
 ### Determine whether we should use the built-in implementation if it
 ### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
 ###
-.if !defined(USE_BUILTIN.termlib)
-.  if ${PREFER.termlib} == "pkgsrc"
-USE_BUILTIN.termlib=	no
+.if !defined(USE_BUILTIN.termcap)
+.  if ${PREFER.termcap} == "pkgsrc"
+USE_BUILTIN.termcap=	no
 .  else
-USE_BUILTIN.termlib=	${IS_BUILTIN.termlib}
-.  endif  # PREFER.termlib
+USE_BUILTIN.termcap=	${IS_BUILTIN.termcap}
+.  endif  # PREFER.termcap
 .endif
-MAKEVARS+=	USE_BUILTIN.termlib
+MAKEVARS+=	USE_BUILTIN.termcap
 
-# Define BUILTIN_LIBNAME.termlib to be the base name of the built-in
-# terminal library.
+# Define BUILTIN_LIBNAME.termcap to be the base name of the built-in
+# termcap library.
 #
 .if !empty(BUILTIN_LIB_FOUND.termcap:M[yY][eE][sS])
-BUILTIN_LIBNAME.termlib=	termcap
+BUILTIN_LIBNAME.termcap=	termcap
 .elif !empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS])
-BUILTIN_LIBNAME.termlib=	tinfo
+BUILTIN_LIBNAME.termcap=	tinfo
 .elif !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
-BUILTIN_LIBNAME.termlib=	curses
+BUILTIN_LIBNAME.termcap=	curses
 .endif
 
 ###
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
 ###
-CHECK_BUILTIN.termlib?=	no
-.if !empty(CHECK_BUILTIN.termlib:M[nN][oO])
+CHECK_BUILTIN.termcap?=	no
+.if !empty(CHECK_BUILTIN.termcap:M[nN][oO])
 
-.  if !empty(USE_BUILTIN.termlib:M[yY][eE][sS])
-BUILDLINK_LIBNAME.termlib=	${BUILTIN_LIBNAME.termlib}
+.  if !empty(USE_BUILTIN.termcap:M[yY][eE][sS])
+BUILDLINK_LIBNAME.termcap=	${BUILTIN_LIBNAME.termcap}
 .  endif
 
-.endif	# CHECK_BUILTIN.termlib
+.endif	# CHECK_BUILTIN.termcap
diff --git a/mk/termlib.buildlink3.mk b/mk/termlib.buildlink3.mk
deleted file mode 100644
index 885b978ba7c..00000000000
--- a/mk/termlib.buildlink3.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: termlib.buildlink3.mk,v 1.5 2008/02/29 16:28:51 jlam Exp $
-#
-# This Makefile fragment is meant to be included by packages that require
-# a basic termlib implementation.
-#
-# === Variables set by this file ===
-#
-# TERMLIB_TYPE
-#	The name of the selected termlib implementation.
-
-TERMLIB_BUILDLINK3_MK:=	${TERMLIB_BUILDLINK3_MK}+
-
-.include "bsd.fast.prefs.mk"
-
-.if !empty(TERMLIB_BUILDLINK3_MK:M+)
-
-CHECK_BUILTIN.termlib:=	yes
-.  include "termlib.builtin.mk"
-CHECK_BUILTIN.termlib:=	no
-
-.  if !empty(USE_BUILTIN.termlib:M[yY][eE][sS])
-.    if defined(BUILTIN_LIBNAME.termlib)
-TERMLIB_TYPE=	${BUILTIN_LIBNAME.termlib}
-.    else
-TERMLIB_TYPE=	none
-.    endif
-.  else
-TERMLIB_TYPE=	curses
-.  endif
-
-BUILD_DEFS+=	TERMLIB_TYPE
-
-.endif	# TERMLIB_BUILDLINK3_MK
-
-.if ${TERMLIB_TYPE} == "none"
-PKG_FAIL_REASON=	"No usable terminal library found on the system."
-.elif (${TERMLIB_TYPE} == "termcap") || \
-      (${TERMLIB_TYPE} == "tinfo")
-BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ntermlib}
-BUILDLINK_PACKAGES+=		termlib
-BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}termlib
-BUILDLINK_LIBNAME.termlib?=	${BUILTIN_LIBNAME.termlib}
-BUILDLINK_LDADD.termlib?=	${BUILDLINK_LIBNAME.termlib:S/^/-l/:S/^-l$//}
-BUILDLINK_BUILTIN_MK.termlib=	../../mk/termlib.builtin.mk
-.elif ${TERMLIB_TYPE} == "curses"
-.  include "../../mk/curses.buildlink3.mk"
-BUILDLINK_PREFIX.termlib?=	${BUILDLINK_PREFIX.curses}
-BUILDLINK_LIBNAME.termlib?=	${BUILDLINK_LIBNAME.curses}
-BUILDLINK_LDADD.termlib?=	${BUILDLINK_LDADD.curses}
-.endif