diff options
author | jlam <jlam> | 2008-02-29 22:41:13 +0000 |
---|---|---|
committer | jlam <jlam> | 2008-02-29 22:41:13 +0000 |
commit | 64c4dceba46edec76ba7eaa28500305912e96ecf (patch) | |
tree | 4c09730700480e5537329192a8145629c5512c5e /devel | |
parent | 9577fa546884d73b75523e60976c13e00b774fde (diff) | |
download | pkgsrc-64c4dceba46edec76ba7eaa28500305912e96ecf.tar.gz |
Rename termlib.* to termcap.* to better document exactly what packages
are trying to use (the termcap t*() API).
Diffstat (limited to 'devel')
-rw-r--r-- | devel/libslang/Makefile | 10 | ||||
-rw-r--r-- | devel/libslang/buildlink3.mk | 4 | ||||
-rw-r--r-- | devel/readline/Makefile | 6 | ||||
-rw-r--r-- | devel/readline/buildlink3.mk | 10 | ||||
-rw-r--r-- | devel/readline/builtin.mk | 8 |
5 files changed, 19 insertions, 19 deletions
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index 94f508745af..5ff8e64a152 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -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 @@ USE_LIBTOOL= yes 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 --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk index f81af2a2081..0bfe4d014c5 100644 --- a/devel/libslang/buildlink3.mk +++ b/devel/libslang/buildlink3.mk @@ -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_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4 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 --git a/devel/readline/Makefile b/devel/readline/Makefile index fe4edb6c790..182783f4f8b 100644 --- a/devel/readline/Makefile +++ b/devel/readline/Makefile @@ -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 @@ INFO_FILES= # PLIST 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 --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk index 4ae7ab7e4a7..5397366befd 100644 --- a/devel/readline/buildlink3.mk +++ b/devel/readline/buildlink3.mk @@ -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 @@ BUILDLINK_FNAME_TRANSFORM.readline+= \ . 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 @@ CHECK_BUILTIN.readline:= yes .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 --git a/devel/readline/builtin.mk b/devel/readline/builtin.mk index b421537d4f2..81935844662 100644 --- a/devel/readline/builtin.mk +++ b/devel/readline/builtin.mk @@ -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 @@ CHECK_BUILTIN.readline?= no . 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 |