 @@ -1,14 +1,14 @@
-# $NetBSD: builtin.mk,v 1.18 2008/02/27 06:14:23 jlam Exp $
+# $NetBSD: builtin.mk,v 1.19 2008/02/27 15:26:34 jlam Exp $
 BUILTIN_PKG:=	ncurses
 BUILTIN_FIND_LIBS:=		ncurses curses
 BUILTIN_FIND_FILES_VAR:=	H_NCURSES
 BUILTIN_FIND_FILES.H_NCURSES=	/usr/include/ncurses.h /usr/include/curses.h
 BUILTIN_FIND_GREP.H_NCURSES=	\#define[ 	]*NCURSES_VERSION
 .include "../../mk/buildlink3/bsd.builtin.mk"
 ###
 ### Determine if there is a built-in implementation of the package and
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 @@ -90,54 +90,53 @@ USE_BUILTIN.ncurses=	no
 .  endif  # PREFER.ncurses
 .endif
 MAKEVARS+=	USE_BUILTIN.ncurses
 # If USE_NCURSES is defined, then force the use of an ncurses
 # implementation.
+#
 .if defined(USE_NCURSES)
 .  if !empty(IS_BUILTIN.ncurses:M[nN][oO])
 USE_BUILTIN.ncurses=	no
 .  endif
 .endif
-# Define BUILTIN_LIBNAME.ncurses to be the built-in ncurses library
+# Define BUILTIN_LIBNAME.ncurses to be the base name of the built-in
-# only if we're using the built-in ncurses.
+# ncurses library.
+#
-.if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
+.if !empty(BUILTIN_LIB_FOUND.ncurses:M[nN][oO]) && \
-.  if !empty(BUILTIN_LIB_FOUND.ncurses:M[nN][oO]) && \
+    !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
       !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
 BUILTIN_LIBNAME.ncurses=	curses
-.  endif
+.endif
+#
 # On Interix, there is a libncurses.a and a libcurses.so but strangely,
 # no libncurses.so.  We want to link against the shared library, so
 # turn "-lncurses" into "-lcurses".
+#
-.  if (${OPSYS} == "Interix") && \
+.if (${OPSYS} == "Interix") && \
-      !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
+    !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
 BUILTIN_LIBNAME.ncurses=	curses
 .  endif
 .endif
 ###
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
 ###
 CHECK_BUILTIN.ncurses?=	no
 .if !empty(CHECK_BUILTIN.ncurses:M[nN][oO])
 BUILDLINK_TRANSFORM+=		l:ncurses:${BUILDLINK_LIBNAME.ncurses}
 .  if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
 BUILDLINK_LIBNAME.ncurses=	${BUILTIN_LIBNAME.ncurses}
 BUILDLINK_TARGETS+=		buildlink-curses-ncurses-h
 BUILDLINK_TARGETS+=		buildlink-ncurses-extra-includes
 .  endif
 # A full ncurses implementation provides more headers than some curses
 # implementations.  Touch empty replacements for those headers so that
 # packages can continue to use the familiar ncurses header names.
+#
 .  if !target(buildlink-ncurses-extra-includes)
 .PHONY: buildlink-ncurses-extra-includes
 buildlink-ncurses-extra-includes:
 	${RUN}								\
 	extra_includes="include/term.h";				\

 @@ -1,14 +1,14 @@
-# $NetBSD: curses.buildlink3.mk,v 1.9 2008/02/27 06:15:04 jlam Exp $
+# $NetBSD: curses.buildlink3.mk,v 1.10 2008/02/27 15:26:34 jlam Exp $
+#
 # This Makefile fragment is meant to be included by packages that require
 # any curses implementation instead of one particular one.  The available
 # curses implementations are "curses" if built-in, "ncurses", and
 # "pdcurses".
+#
 # If a package genuinely requires ncurses or pdcurses, then it should
 # directly include the appropriate buildlink3.mk instead of this file in
 # the package Makefile.
+#
 # === User-settable variables ===
+#
 # CURSES_DEFAULT
 @@ -77,26 +77,25 @@ BUILD_DEFS_EFFECTS+=	CURSES_TYPE
 # <curses.h> and -lcurses.
+#
 _PKG_USE_CURSES=	yes
 .endif	# CURSES_BUILDLINK3_MK
 .if ${CURSES_TYPE} == "none"
 PKG_FAIL_REASON=	\
 	"${_CURSES_TYPE} is not an acceptable curses type for ${PKGNAME}."
 .elif ${CURSES_TYPE} == "curses"
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ncurses}
 BUILDLINK_PACKAGES+=		curses
 BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}curses
 BUILDLINK_LIBNAME.curses?=	${BUILTIN_LIBNAME.curses}
 BUILDLINK_LDADD.curses?=	${BUILDLINK_LIBNAME.curses:S/^/-l/}
 BUILDLINK_BUILTIN_MK.curses=	../../mk/curses.builtin.mk
 .elif ${CURSES_TYPE} == "ncurses"
 USE_NCURSES=			yes
 .  include "../../devel/ncurses/buildlink3.mk"
 BUILDLINK_LIBNAME.curses?=	${BUILDLINK_LIBNAME.ncurses}
 BUILDLINK_LDADD.curses?=	${BUILDLINK_LDADD.ncurses}
 .elif ${CURSES_TYPE} == "pdcurses"
 .  include "../../devel/pdcurses/buildlink3.mk"
 BUILDLINK_LIBNAME.curses?=	${BUILDLINK_LIBNAME.pdcurses}
 BUILDLINK_LDADD.curses?=	${BUILDLINK_LDADD.pdcurses}
 .endif

 @@ -1,14 +1,14 @@
-# $NetBSD: curses.builtin.mk,v 1.4 2008/02/27 06:14:23 jlam Exp $
+# $NetBSD: curses.builtin.mk,v 1.5 2008/02/27 15:26:34 jlam Exp $
 BUILTIN_PKG:=	curses
 BUILTIN_FIND_LIBS:=		curses
 BUILTIN_FIND_FILES_VAR:=	H_CURSES
 BUILTIN_FIND_FILES.H_CURSES=	/usr/include/curses.h
 .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").
 ###
 @@ -36,36 +36,35 @@ USE_BUILTIN.curses=	yes
 USE_BUILTIN.curses!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.curses:Q}; then	\
 		${ECHO} yes;						\
 	else								\
 		${ECHO} no;						\
 	fi
 .        endif
 .      endfor
 .    endif
 .  endif  # PREFER.curses
 .endif
 MAKEVARS+=	USE_BUILTIN.curses
-# Define BUILTIN_LIBNAME.curses to be the built-in curses library only if
+# Define BUILTIN_LIBNAME.curses to be the base name of the built-in
-# we're using the built-in curses.
+# curses library.
+#
-.if !empty(USE_BUILTIN.curses:M[yY][eE][sS])
+.if !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
 .  if !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
 BUILTIN_LIBNAME.curses=		curses
 .  endif
 .endif
 ###
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
 ###
 CHECK_BUILTIN.curses?=	no
 .if !empty(CHECK_BUILTIN.curses:M[nN][oO])
 .  if !empty(USE_BUILTIN.curses:M[yY][eE][sS])
 .    if exists(${H_CURSES})
 BUILDLINK_INCDIRS.curses?=	${H_CURSES:H:S/^${BUILDLINK_PREFIX.curses}\///}
 .    endif
 BUILDLINK_LIBNAME.curses=	${BUILTIN_LIBNAME.curses}
 .  endif
 .endif	# CHECK_BUILTIN.curses

 @@ -1,14 +1,14 @@
-# $NetBSD: termlib.builtin.mk,v 1.1 2008/02/27 04:47:02 jlam Exp $
+# $NetBSD: termlib.builtin.mk,v 1.2 2008/02/27 15:26:34 jlam Exp $
 BUILTIN_PKG:=	termlib
 BUILTIN_FIND_LIBS:=	termcap 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.termlib)
 IS_BUILTIN.termlib=	no
 @@ -22,23 +22,34 @@ MAKEVARS+=	IS_BUILTIN.termlib
 ###
 ### 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
 .  else
 USE_BUILTIN.termlib=	${IS_BUILTIN.termlib}
 .  endif  # PREFER.termlib
 .endif
 MAKEVARS+=	USE_BUILTIN.termlib
-# Define BUILTIN_LIBNAME.termlib to be the built-in terminal library
+# Define BUILTIN_LIBNAME.termlib to be the base name of the built-in
-# only if we're using the built-in termlib.
+# terminal library.
+#
-.if !empty(USE_BUILTIN.termlib:M[yY][eE][sS])
+.if !empty(BUILTIN_LIB_FOUND.termcap:M[yY][eE][sS])
 .  if !empty(BUILTIN_LIB_FOUND.termcap:M[yY][eE][sS])
 BUILTIN_LIBNAME.termlib=	termcap
-.  elif !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
+.elif !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
 BUILTIN_LIBNAME.termlib=	curses
 .  endif
 .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])
 .  if !empty(USE_BUILTIN.termlib:M[yY][eE][sS])
 BUILDLINK_LIBNAME.termlib=	${BUILTIN_LIBNAME.termlib}
 .  endif
 .endif	# CHECK_BUILTIN.termlib