[pkgsrc/trunk]: pkgsrc Rename termlib.* to termcap.* to better document exact...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Rename termlib.* to termcap.* to better document exact...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:50:33 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/df625d6a4835
branches:  trunk
changeset: 539183:df625d6a4835
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Feb 29 22:41:13 2008 +0000

description:
Rename termlib.* to termcap.* to better document exactly what packages
are trying to use (the termcap t*() API).

diffstat:

 devel/libslang/Makefile      |  10 +++---
 devel/libslang/buildlink3.mk |   4 +-
 devel/readline/Makefile      |   6 ++--
 devel/readline/buildlink3.mk |  10 +++---
 devel/readline/builtin.mk    |   8 +++---
 mk/termcap.buildlink3.mk     |  52 +++++++++++++++++++++++++++++++++++++++
 mk/termcap.builtin.mk        |  58 ++++++++++++++++++++++++++++++++++++++++++++
 mk/termlib.buildlink3.mk     |  50 -------------------------------------
 mk/termlib.builtin.mk        |  58 --------------------------------------------
 security/heimdal/Makefile    |   4 +-
 10 files changed, 131 insertions(+), 129 deletions(-)

diffs (truncated from 379 to 300 lines):

diff -r b70f450362e8 -r df625d6a4835 devel/libslang/Makefile
--- a/devel/libslang/Makefile   Fri Feb 29 22:23:50 2008 +0000
+++ b/devel/libslang/Makefile   Fri Feb 29 22:41:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2008/02/29 16:44:55 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2008/02/29 22:41:13 jlam Exp $
 #
 
 DISTNAME=      slang-1.4.9
@@ -24,14 +24,14 @@
 GNU_CONFIGURE=         yes
 DLOPEN_REQUIRE_PTHREADS=no
 
-.include "../../mk/termlib.buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 
-.if ${TERMLIB_TYPE} == "termcap"
-CONFIGURE_ENV+=                TERMCAP=${BUILDLINK_LDADD.termlib:Q}
+.if ${TERMCAP_TYPE} == "termcap"
+CONFIGURE_ENV+=                TERMCAP=${BUILDLINK_LDADD.termcap:Q}
 CONFIGURE_ENV+=                MISC_TERMINFO_DIRS=${PREFIX:Q}/share/terminfo
 .else
 CONFIGURE_ENV+=                TERMCAP=
-CONFIGURE_ENV+=                MISC_TERMINFO_DIRS=${BUILDLINK_PREFIX.termlib:Q}/share/terminfo
+CONFIGURE_ENV+=                MISC_TERMINFO_DIRS=${BUILDLINK_PREFIX.termcap:Q}/share/terminfo
 .endif
 
 .include "../../mk/dlopen.buildlink3.mk"
diff -r b70f450362e8 -r df625d6a4835 devel/libslang/buildlink3.mk
--- a/devel/libslang/buildlink3.mk      Fri Feb 29 22:23:50 2008 +0000
+++ b/devel/libslang/buildlink3.mk      Fri Feb 29 22:41:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/02/29 16:44:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2008/02/29 22:41:13 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 LIBSLANG_BUILDLINK3_MK:=       ${LIBSLANG_BUILDLINK3_MK}+
@@ -19,6 +19,6 @@
 BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
 .endif # LIBSLANG_BUILDLINK3_MK
 
-.include "../../mk/termlib.buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
diff -r b70f450362e8 -r df625d6a4835 devel/readline/Makefile
--- a/devel/readline/Makefile   Fri Feb 29 22:23:50 2008 +0000
+++ b/devel/readline/Makefile   Fri Feb 29 22:41:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2008/02/27 18:16:37 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2008/02/29 22:41:13 jlam Exp $
 #
 
 DISTNAME=      readline-5.2
@@ -24,9 +24,9 @@
 BUILD_TARGET=          all-libtool
 INSTALL_TARGET=                install-libtool
 
-.include "../../mk/termlib.buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 
-.if ${TERMLIB_TYPE} == "curses"
+.if ${TERMCAP_TYPE} == "curses"
 CONFIGURE_ARGS+=       --with-curses
 .endif
 
diff -r b70f450362e8 -r df625d6a4835 devel/readline/buildlink3.mk
--- a/devel/readline/buildlink3.mk      Fri Feb 29 22:23:50 2008 +0000
+++ b/devel/readline/buildlink3.mk      Fri Feb 29 22:41:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2008/02/27 18:16:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2008/02/29 22:41:13 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 READLINE_BUILDLINK3_MK:=       ${READLINE_BUILDLINK3_MK}+
@@ -30,7 +30,7 @@
 .  include "../../mk/bsd.fast.prefs.mk"
 BROKEN_READLINE_DETECTION?=    no
 .  if !empty(BROKEN_READLINE_DETECTION:M[yY][eE][sS])
-BUILDLINK_TRANSFORM+=          l:readline:readline:${BUILDLINK_LIBNAME.termlib}
+BUILDLINK_TRANSFORM+=          l:readline:readline:${BUILDLINK_LIBNAME.termcap}
 .  endif
 .endif # READLINE_BUILDLINK3_MK
 
@@ -38,11 +38,11 @@
 .include "../../devel/readline/builtin.mk"
 CHECK_BUILTIN.readline:=       no
 
-# A built-in readline is always going to use a built-in termlib.
+# A built-in readline is always going to use a built-in termcap.
 .if !empty(USE_BUILTIN.readline:M[yY][eE][sS])
-USE_BUILTIN.termlib=   yes
+USE_BUILTIN.termcap=   yes
 .endif
 
-.include "../../mk/termlib.buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
diff -r b70f450362e8 -r df625d6a4835 devel/readline/builtin.mk
--- a/devel/readline/builtin.mk Fri Feb 29 22:23:50 2008 +0000
+++ b/devel/readline/builtin.mk Fri Feb 29 22:41:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2008/02/27 18:16:37 jlam Exp $
+# $NetBSD: builtin.mk,v 1.17 2008/02/29 22:41:13 jlam Exp $
 
 BUILTIN_PKG:=  readline
 
@@ -109,15 +109,15 @@
 .  if !empty(USE_BUILTIN.readline:M[yY][eE][sS])
 .    if !empty(BUILTIN_LIB_FOUND.history:M[Nn][Oo]) && \
        !empty(BUILTIN_LIB_FOUND.readline:M[Yy][Ee][Ss])
-BUILDLINK_TRANSFORM+=  l:history:readline:${BUILTIN_LIBNAME.termlib}
+BUILDLINK_TRANSFORM+=  l:history:readline:${BUILTIN_LIBNAME.termcap}
 .    endif
 .    if !empty(BUILTIN_LIB_FOUND.history:M[nN][oO]) && \
        !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS])
-BUILDLINK_TRANSFORM+=  l:history:edit:${BUILTIN_LIBNAME.termlib}
+BUILDLINK_TRANSFORM+=  l:history:edit:${BUILTIN_LIBNAME.termcap}
 .    endif
 .    if !empty(BUILTIN_LIB_FOUND.readline:M[nN][oO]) && \
        !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS])
-BUILDLINK_TRANSFORM+=  l:readline:edit:${BUILTIN_LIBNAME.termlib}
+BUILDLINK_TRANSFORM+=  l:readline:edit:${BUILTIN_LIBNAME.termcap}
 .    endif
 .  endif
 
diff -r b70f450362e8 -r df625d6a4835 mk/termcap.buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/termcap.buildlink3.mk  Fri Feb 29 22:41:13 2008 +0000
@@ -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 -r b70f450362e8 -r df625d6a4835 mk/termcap.builtin.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/termcap.builtin.mk     Fri Feb 29 22:41:13 2008 +0000
@@ -0,0 +1,58 @@
+# $NetBSD: termcap.builtin.mk,v 1.1 2008/02/29 22:41:13 jlam Exp $
+
+BUILTIN_PKG:=  termcap
+
+BUILTIN_FIND_LIBS:=    termcap tinfo curses
+
+.include "buildlink3/bsd.builtin.mk"
+
+###
+### Determine if there is a built-in implementation of the package and
+### set IS_BUILTIN.<pkg> appropriately ("yes" or "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.termcap=    yes
+.  endif
+.endif
+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.termcap)
+.  if ${PREFER.termcap} == "pkgsrc"
+USE_BUILTIN.termcap=   no
+.  else
+USE_BUILTIN.termcap=   ${IS_BUILTIN.termcap}
+.  endif  # PREFER.termcap
+.endif
+MAKEVARS+=     USE_BUILTIN.termcap
+
+# 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.termcap=       termcap
+.elif !empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS])
+BUILTIN_LIBNAME.termcap=       tinfo
+.elif !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
+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.termcap?=        no
+.if !empty(CHECK_BUILTIN.termcap:M[nN][oO])
+
+.  if !empty(USE_BUILTIN.termcap:M[yY][eE][sS])
+BUILDLINK_LIBNAME.termcap=     ${BUILTIN_LIBNAME.termcap}
+.  endif
+
+.endif # CHECK_BUILTIN.termcap
diff -r b70f450362e8 -r df625d6a4835 mk/termlib.buildlink3.mk
--- a/mk/termlib.buildlink3.mk  Fri Feb 29 22:23:50 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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
diff -r b70f450362e8 -r df625d6a4835 mk/termlib.builtin.mk
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note clisp update
Next by Date: [pkgsrc/trunk]: pkgsrc Added www/firefox3-bin.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note clisp update
Next by Thread: [pkgsrc/trunk]: pkgsrc Added www/firefox3-bin.
Indexes:
Home | Main Index | Thread Index | Old Index