Fri Feb 29 22:41:13 2008 UTC ()
Rename termlib.* to termcap.* to better document exactly what packages
are trying to use (the termcap t*() API).


(jlam)
diff -r1.62 -r1.63 pkgsrc/devel/libslang/Makefile
diff -r1.14 -r1.15 pkgsrc/devel/libslang/buildlink3.mk
diff -r1.43 -r1.44 pkgsrc/devel/readline/Makefile
diff -r1.29 -r1.30 pkgsrc/devel/readline/buildlink3.mk
diff -r1.16 -r1.17 pkgsrc/devel/readline/builtin.mk
diff -r0 -r1.1 pkgsrc/mk/termcap.buildlink3.mk
diff -r0 -r1.1 pkgsrc/mk/termcap.builtin.mk
diff -r1.5 -r0 pkgsrc/mk/termlib.buildlink3.mk
diff -r1.3 -r0 pkgsrc/mk/termlib.builtin.mk
diff -r1.65 -r1.66 pkgsrc/security/heimdal/Makefile

cvs diff -r1.62 -r1.63 pkgsrc/devel/libslang/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libslang/Makefile 2008/02/29 16:44:55 1.62
+++ pkgsrc/devel/libslang/Makefile 2008/02/29 22:41:13 1.63
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.62 2008/02/29 16:44:55 jlam Exp $ 1# $NetBSD: Makefile,v 1.63 2008/02/29 22:41:13 jlam Exp $
2# 2#
3 3
4DISTNAME= slang-1.4.9 4DISTNAME= slang-1.4.9
5PKGNAME= lib${DISTNAME} 5PKGNAME= lib${DISTNAME}
6SVR4_PKGNAME= lslan 6SVR4_PKGNAME= lslan
7PKGREVISION= 6 7PKGREVISION= 6
8CATEGORIES= devel 8CATEGORIES= devel
9MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \ 9MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \
10 http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ \ 10 http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ \
11 ftp://ftp.ntua.gr/pub/lang/slang/slang/v1.4/ \ 11 ftp://ftp.ntua.gr/pub/lang/slang/slang/v1.4/ \
12 ftp://ftp.plig.org/pub/slang/v1.4/ 12 ftp://ftp.plig.org/pub/slang/v1.4/
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://www.s-lang.org/ 16HOMEPAGE= http://www.s-lang.org/
17COMMENT= Routines for rapid alpha-numeric terminal applications development 17COMMENT= Routines for rapid alpha-numeric terminal applications development
18 18
19PKG_INSTALLATION_TYPES= overwrite pkgviews 19PKG_INSTALLATION_TYPES= overwrite pkgviews
20PKG_DESTDIR_SUPPORT= user-destdir 20PKG_DESTDIR_SUPPORT= user-destdir
21 21
22USE_TOOLS+= gmake 22USE_TOOLS+= gmake
23USE_LIBTOOL= yes 23USE_LIBTOOL= yes
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
25DLOPEN_REQUIRE_PTHREADS=no 25DLOPEN_REQUIRE_PTHREADS=no
26 26
27.include "../../mk/termlib.buildlink3.mk" 27.include "../../mk/termcap.buildlink3.mk"
28 28
29.if ${TERMLIB_TYPE} == "termcap" 29.if ${TERMCAP_TYPE} == "termcap"
30CONFIGURE_ENV+= TERMCAP=${BUILDLINK_LDADD.termlib:Q} 30CONFIGURE_ENV+= TERMCAP=${BUILDLINK_LDADD.termcap:Q}
31CONFIGURE_ENV+= MISC_TERMINFO_DIRS=${PREFIX:Q}/share/terminfo 31CONFIGURE_ENV+= MISC_TERMINFO_DIRS=${PREFIX:Q}/share/terminfo
32.else 32.else
33CONFIGURE_ENV+= TERMCAP= 33CONFIGURE_ENV+= TERMCAP=
34CONFIGURE_ENV+= MISC_TERMINFO_DIRS=${BUILDLINK_PREFIX.termlib:Q}/share/terminfo 34CONFIGURE_ENV+= MISC_TERMINFO_DIRS=${BUILDLINK_PREFIX.termcap:Q}/share/terminfo
35.endif 35.endif
36 36
37.include "../../mk/dlopen.buildlink3.mk" 37.include "../../mk/dlopen.buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"

cvs diff -r1.14 -r1.15 pkgsrc/devel/libslang/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/libslang/buildlink3.mk 2008/02/29 16:44:55 1.14
+++ pkgsrc/devel/libslang/buildlink3.mk 2008/02/29 22:41:13 1.15
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.14 2008/02/29 16:44:55 jlam Exp $ 1# $NetBSD: buildlink3.mk,v 1.15 2008/02/29 22:41:13 jlam Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+ 4LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+
5 5
6.include "../../mk/bsd.fast.prefs.mk" 6.include "../../mk/bsd.fast.prefs.mk"
7 7
8.if !empty(BUILDLINK_DEPTH:M+) 8.if !empty(BUILDLINK_DEPTH:M+)
9BUILDLINK_DEPENDS+= libslang 9BUILDLINK_DEPENDS+= libslang
10.endif 10.endif
11 11
12BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibslang} 12BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibslang}
13BUILDLINK_PACKAGES+= libslang 13BUILDLINK_PACKAGES+= libslang
14BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libslang 14BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libslang
15 15
16.if !empty(LIBSLANG_BUILDLINK3_MK:M+) 16.if !empty(LIBSLANG_BUILDLINK3_MK:M+)
17BUILDLINK_API_DEPENDS.libslang+= libslang>=1.4.9nb1 17BUILDLINK_API_DEPENDS.libslang+= libslang>=1.4.9nb1
18BUILDLINK_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4 18BUILDLINK_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4
19BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang 19BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
20.endif # LIBSLANG_BUILDLINK3_MK 20.endif # LIBSLANG_BUILDLINK3_MK
21 21
22.include "../../mk/termlib.buildlink3.mk" 22.include "../../mk/termcap.buildlink3.mk"
23 23
24BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 24BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}

cvs diff -r1.43 -r1.44 pkgsrc/devel/readline/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/readline/Makefile 2008/02/27 18:16:37 1.43
+++ pkgsrc/devel/readline/Makefile 2008/02/29 22:41:13 1.44
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: Makefile,v 1.43 2008/02/27 18:16:37 jlam Exp $ 1# $NetBSD: Makefile,v 1.44 2008/02/29 22:41:13 jlam Exp $
2# 2#
3 3
4DISTNAME= readline-5.2 4DISTNAME= readline-5.2
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GNU:=readline/} 7MASTER_SITES= ${MASTER_SITE_GNU:=readline/}
8 8
9#PATCH_SITES= ${MASTER_SITE_GNU:=readline/readline-5.1-patches/} 9#PATCH_SITES= ${MASTER_SITE_GNU:=readline/readline-5.1-patches/}
10#PATCHFILES= readline51-001 10#PATCHFILES= readline51-001
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html 13HOMEPAGE= http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
14COMMENT= GNU library that can recall and edit previous input 14COMMENT= GNU library that can recall and edit previous input
15#LICENSE= gnu-gpl-v2 15#LICENSE= gnu-gpl-v2
16 16
17PKG_INSTALLATION_TYPES= overwrite pkgviews 17PKG_INSTALLATION_TYPES= overwrite pkgviews
18PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
19 19
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21USE_LIBTOOL= yes 21USE_LIBTOOL= yes
22INFO_FILES= # PLIST 22INFO_FILES= # PLIST
23 23
24BUILD_TARGET= all-libtool 24BUILD_TARGET= all-libtool
25INSTALL_TARGET= install-libtool 25INSTALL_TARGET= install-libtool
26 26
27.include "../../mk/termlib.buildlink3.mk" 27.include "../../mk/termcap.buildlink3.mk"
28 28
29.if ${TERMLIB_TYPE} == "curses" 29.if ${TERMCAP_TYPE} == "curses"
30CONFIGURE_ARGS+= --with-curses 30CONFIGURE_ARGS+= --with-curses
31.endif 31.endif
32 32
33.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"

cvs diff -r1.29 -r1.30 pkgsrc/devel/readline/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/readline/buildlink3.mk 2008/02/27 18:16:37 1.29
+++ pkgsrc/devel/readline/buildlink3.mk 2008/02/29 22:41:13 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.29 2008/02/27 18:16:37 jlam Exp $ 1# $NetBSD: buildlink3.mk,v 1.30 2008/02/29 22:41:13 jlam Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4READLINE_BUILDLINK3_MK:= ${READLINE_BUILDLINK3_MK}+ 4READLINE_BUILDLINK3_MK:= ${READLINE_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= readline 7BUILDLINK_DEPENDS+= readline
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nreadline} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nreadline}
11BUILDLINK_PACKAGES+= readline 11BUILDLINK_PACKAGES+= readline
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}readline 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}readline
13 13
14.if !empty(READLINE_BUILDLINK3_MK:M+) 14.if !empty(READLINE_BUILDLINK3_MK:M+)
@@ -20,29 +20,29 @@ BUILDLINK_FILES.readline+= include/histo @@ -20,29 +20,29 @@ BUILDLINK_FILES.readline+= include/histo
20BUILDLINK_FILES.readline+= include/readline.h 20BUILDLINK_FILES.readline+= include/readline.h
21 21
22BUILDLINK_FNAME_TRANSFORM.readline+= \ 22BUILDLINK_FNAME_TRANSFORM.readline+= \
23 -e "s|include/history\.h|include/readline/history.h|g" \ 23 -e "s|include/history\.h|include/readline/history.h|g" \
24 -e "s|include/readline\.h|include/readline/readline.h|g" 24 -e "s|include/readline\.h|include/readline/readline.h|g"
25 25
26# Many GNU configure scripts don't check for the correct terminal library 26# Many GNU configure scripts don't check for the correct terminal library
27# when testing for -lreadline. If BROKEN_READLINE_DETECTION is set to 27# when testing for -lreadline. If BROKEN_READLINE_DETECTION is set to
28# "yes", then automatically add the right one. 28# "yes", then automatically add the right one.
29# 29#
30. include "../../mk/bsd.fast.prefs.mk" 30. include "../../mk/bsd.fast.prefs.mk"
31BROKEN_READLINE_DETECTION?= no 31BROKEN_READLINE_DETECTION?= no
32. if !empty(BROKEN_READLINE_DETECTION:M[yY][eE][sS]) 32. if !empty(BROKEN_READLINE_DETECTION:M[yY][eE][sS])
33BUILDLINK_TRANSFORM+= l:readline:readline:${BUILDLINK_LIBNAME.termlib} 33BUILDLINK_TRANSFORM+= l:readline:readline:${BUILDLINK_LIBNAME.termcap}
34. endif 34. endif
35.endif # READLINE_BUILDLINK3_MK 35.endif # READLINE_BUILDLINK3_MK
36 36
37CHECK_BUILTIN.readline:= yes 37CHECK_BUILTIN.readline:= yes
38.include "../../devel/readline/builtin.mk" 38.include "../../devel/readline/builtin.mk"
39CHECK_BUILTIN.readline:= no 39CHECK_BUILTIN.readline:= no
40 40
41# A built-in readline is always going to use a built-in termlib. 41# A built-in readline is always going to use a built-in termcap.
42.if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) 42.if !empty(USE_BUILTIN.readline:M[yY][eE][sS])
43USE_BUILTIN.termlib= yes 43USE_BUILTIN.termcap= yes
44.endif 44.endif
45 45
46.include "../../mk/termlib.buildlink3.mk" 46.include "../../mk/termcap.buildlink3.mk"
47 47
48BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 48BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}

cvs diff -r1.16 -r1.17 pkgsrc/devel/readline/builtin.mk (expand / switch to unified diff)

--- pkgsrc/devel/readline/builtin.mk 2008/02/27 18:16:37 1.16
+++ pkgsrc/devel/readline/builtin.mk 2008/02/29 22:41:13 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.16 2008/02/27 18:16:37 jlam Exp $ 1# $NetBSD: builtin.mk,v 1.17 2008/02/29 22:41:13 jlam Exp $
2 2
3BUILTIN_PKG:= readline 3BUILTIN_PKG:= readline
4 4
5BUILTIN_FIND_LIBS:= edit readline history 5BUILTIN_FIND_LIBS:= edit readline history
6BUILTIN_FIND_FILES_VAR:= H_READLINE _BLTN_H_READLINE 6BUILTIN_FIND_FILES_VAR:= H_READLINE _BLTN_H_READLINE
7BUILTIN_FIND_FILES.H_READLINE= /usr/include/readline/readline.h \ 7BUILTIN_FIND_FILES.H_READLINE= /usr/include/readline/readline.h \
8 /usr/include/readline.h 8 /usr/include/readline.h
9BUILTIN_FIND_FILES._BLTN_H_READLINE= \ 9BUILTIN_FIND_FILES._BLTN_H_READLINE= \
10 /usr/include/readline/readline.h \ 10 /usr/include/readline/readline.h \
11 /usr/include/readline.h 11 /usr/include/readline.h
12BUILTIN_FIND_GREP.H_READLINE= \#define[ ]*RL_VERSION_MAJOR 12BUILTIN_FIND_GREP.H_READLINE= \#define[ ]*RL_VERSION_MAJOR
13 13
14.include "../../mk/buildlink3/bsd.builtin.mk" 14.include "../../mk/buildlink3/bsd.builtin.mk"
@@ -99,26 +99,26 @@ USE_BUILTIN.readline= no @@ -99,26 +99,26 @@ USE_BUILTIN.readline= no
99. endif 99. endif
100.endif 100.endif
101 101
102### 102###
103### The section below only applies if we are not including this file 103### The section below only applies if we are not including this file
104### solely to determine whether a built-in implementation exists. 104### solely to determine whether a built-in implementation exists.
105### 105###
106CHECK_BUILTIN.readline?= no 106CHECK_BUILTIN.readline?= no
107.if !empty(CHECK_BUILTIN.readline:M[nN][oO]) 107.if !empty(CHECK_BUILTIN.readline:M[nN][oO])
108 108
109. if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) 109. if !empty(USE_BUILTIN.readline:M[yY][eE][sS])
110. if !empty(BUILTIN_LIB_FOUND.history:M[Nn][Oo]) && \ 110. if !empty(BUILTIN_LIB_FOUND.history:M[Nn][Oo]) && \
111 !empty(BUILTIN_LIB_FOUND.readline:M[Yy][Ee][Ss]) 111 !empty(BUILTIN_LIB_FOUND.readline:M[Yy][Ee][Ss])
112BUILDLINK_TRANSFORM+= l:history:readline:${BUILTIN_LIBNAME.termlib} 112BUILDLINK_TRANSFORM+= l:history:readline:${BUILTIN_LIBNAME.termcap}
113. endif 113. endif
114. if !empty(BUILTIN_LIB_FOUND.history:M[nN][oO]) && \ 114. if !empty(BUILTIN_LIB_FOUND.history:M[nN][oO]) && \
115 !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) 115 !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS])
116BUILDLINK_TRANSFORM+= l:history:edit:${BUILTIN_LIBNAME.termlib} 116BUILDLINK_TRANSFORM+= l:history:edit:${BUILTIN_LIBNAME.termcap}
117. endif 117. endif
118. if !empty(BUILTIN_LIB_FOUND.readline:M[nN][oO]) && \ 118. if !empty(BUILTIN_LIB_FOUND.readline:M[nN][oO]) && \
119 !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) 119 !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS])
120BUILDLINK_TRANSFORM+= l:readline:edit:${BUILTIN_LIBNAME.termlib} 120BUILDLINK_TRANSFORM+= l:readline:edit:${BUILTIN_LIBNAME.termcap}
121. endif 121. endif
122. endif 122. endif
123 123
124.endif # CHECK_BUILTIN.readline 124.endif # CHECK_BUILTIN.readline

File Added: pkgsrc/mk/termcap.buildlink3.mk
# $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

File Added: pkgsrc/mk/termcap.builtin.mk
# $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

File Deleted: pkgsrc/mk/Attic/termlib.buildlink3.mk

File Deleted: pkgsrc/mk/Attic/termlib.builtin.mk

cvs diff -r1.65 -r1.66 pkgsrc/security/heimdal/Makefile (expand / switch to unified diff)

--- pkgsrc/security/heimdal/Makefile 2008/02/28 08:14:41 1.65
+++ pkgsrc/security/heimdal/Makefile 2008/02/29 22:41:13 1.66
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.65 2008/02/28 08:14:41 jlam Exp $ 1# $NetBSD: Makefile,v 1.66 2008/02/29 22:41:13 jlam Exp $
2 2
3DISTNAME= heimdal-1.1 3DISTNAME= heimdal-1.1
4CATEGORIES= security 4CATEGORIES= security
5MASTER_SITES= http://www.h5l.org/dist/src/ 5MASTER_SITES= http://www.h5l.org/dist/src/
6 6
7MAINTAINER= lha@NetBSD.org 7MAINTAINER= lha@NetBSD.org
8HOMEPAGE= http://www.h5l.org/ 8HOMEPAGE= http://www.h5l.org/
9COMMENT= Kerberos 5 implementation 9COMMENT= Kerberos 5 implementation
10 10
11CONFLICTS+= arla-[0-9]* 11CONFLICTS+= arla-[0-9]*
12CONFLICTS+= mit-krb5-[0-9]* 12CONFLICTS+= mit-krb5-[0-9]*
13CONFLICTS+= openafs-[0-9]* 13CONFLICTS+= openafs-[0-9]*
14CONFLICTS+= gss-[0-9]* 14CONFLICTS+= gss-[0-9]*
@@ -40,27 +40,27 @@ CONFIGURE_ENV+= COMPILE_ET=no # build H @@ -40,27 +40,27 @@ CONFIGURE_ENV+= COMPILE_ET=no # build H
40 40
41CFLAGS.Darwin+= -DBIND_8_COMPAT 41CFLAGS.Darwin+= -DBIND_8_COMPAT
42 42
43# Though Solaris has a <vis.h> header, it does something very unrelated 43# Though Solaris has a <vis.h> header, it does something very unrelated
44# to the BSD <vis.h> header. 44# to the BSD <vis.h> header.
45# 45#
46OPSYSVARS+= CONFIGURE_ENV 46OPSYSVARS+= CONFIGURE_ENV
47CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no 47CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no
48 48
49# Heimdal's configure script expects to find the readline.h header as 49# Heimdal's configure script expects to find the readline.h header as
50# <readline.h>. Also force the configure script to use the terminal 50# <readline.h>. Also force the configure script to use the terminal
51# library needed by the readline library. 51# library needed by the readline library.
52# 52#
53CONFIGURE_ENV+= ac_cv_funclib_tgetent=${BUILDLINK_LDADD.termlib:Q} 53CONFIGURE_ENV+= ac_cv_funclib_tgetent=${BUILDLINK_LDADD.termcap:Q}
54CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 54CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
55CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline 55CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline
56 56
57.if ${OPSYS} == "IRIX" 57.if ${OPSYS} == "IRIX"
58PLIST_SUBST+= IF_IRIX="" 58PLIST_SUBST+= IF_IRIX=""
59.else 59.else
60PLIST_SUBST+= IF_IRIX="@comment " 60PLIST_SUBST+= IF_IRIX="@comment "
61.endif 61.endif
62 62
63OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${ROOT_USER} ${ROOT_GROUP} 0700 63OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${ROOT_USER} ${ROOT_GROUP} 0700
64SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS} 64SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS}
65SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS} 65SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS}
66RCD_SCRIPTS= kadmind kcm kdc kpasswdd 66RCD_SCRIPTS= kadmind kcm kdc kpasswdd