 @@ -1,93 +1,130 @@
-# $NetBSD: curses.buildlink3.mk,v 1.17 2010/02/07 10:28:13 roy Exp $
+# $NetBSD: curses.buildlink3.mk,v 1.18 2014/03/09 10:15:32 roy 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
 #	This value represents the type of curses we wish to use on the
 #	system.  Setting this to "curses" means that the system curses
 #	implementation is fine.
+#
-#	Possible: curses, ncurses, pdcurses
+#	Possible: curses, ncurses, ncursesw, pdcurses
 #	Default: (depends)
+#
 # === Variables set by this file ===
+#
 # CURSES_TYPE
 #	The name of the selected curses implementation.
 CURSES_BUILDLINK3_MK:=	${CURSES_BUILDLINK3_MK}+
 .include "bsd.fast.prefs.mk"
 .if !empty(CURSES_BUILDLINK3_MK:M+)
 .if !defined(USE_CURSES) && !empty(PKG_OPTIONS:Mwide-curses)
 USE_CURSES?=		wide
 .endif
 # _CURSES_PKGS is an exhaustive list of all of the curses implementations
 # that may be used with curses.buildlink3.mk.
+#
-_CURSES_PKGS?=		curses ncurses pdcurses
+_CURSES_PKGS?=		curses ncurses ncursesw pdcurses
 CHECK_BUILTIN.curses:=	yes
 .  include "curses.builtin.mk"
 CHECK_BUILTIN.curses:=	no
 # Set the value of CURSES_DEFAULT depending on the platform and what's
 # available in the base system.
+#
 .if defined(USE_BUILTIN.curses) && !empty(USE_BUILTIN.curses:M[yY][eE][sS])
 CURSES_DEFAULT?=	curses
 .elif !empty(USE_CURSES:Mwide) || !empty(PKG_OPTIONS:Mwide-curses)
 CURSES_DEFAULT?=	ncursesw
 .else
 CURSES_DEFAULT?=	ncurses
 .endif
 _CURSES_ACCEPTED=	# empty
 .if defined(USE_BUILTIN.curses) && !empty(USE_BUILTIN.curses:M[yY][eE][sS])
 _CURSES_ACCEPTED+=	curses		# system curses exists
 .endif
 .if defined(USE_BUILTIN.cursesw) && !empty(USE_BUILTIN.cursesw:M[yY][eE][sS])
 _CURSES_ACCEPTED+=	curses		# system curses exists
 .endif
 _CURSES_ACCEPTED+=	ncurses		# pkgsrc ncurses
 _CURSES_ACCEPTED+=	ncursesw	# pkgsrc ncursesw
 _CURSES_ACCEPTED+=	pdcurses	# pkgsrc pdcurses
 _CURSES_TYPE=		${CURSES_DEFAULT}
 .  if !empty(_CURSES_ACCEPTED:M${_CURSES_TYPE})
 CURSES_TYPE=		${_CURSES_TYPE}
 .  else
 CURSES_TYPE=		none
 .  endif
 BUILD_DEFS+=		CURSES_DEFAULT
 BUILD_DEFS_EFFECTS+=	CURSES_TYPE
 # _PKG_USE_CURSES is a flag for use by the curses packages' buildlink3.mk
 # files to indicate that the headers and libraries should be usable as
 # <curses.h> and -lcurses.
+#
 _PKG_USE_CURSES=	yes
 .PHONY: buildlink-curses-ncurses-h
 buildlink-curses-ncurses-h:
 	${RUN}								\
 	src="${H_CURSES}";						\
 	dest=${BUILDLINK_DIR}"/include/ncurses.h";			\
 	if ${TEST} ! -f "$$dest" -a -f "$$src"; then			\
 		${ECHO_BUILDLINK_MSG} "Linking ${H_CURSES} -> ncurses.h.";\
 		${MKDIR} `${DIRNAME} "$$dest"`;				\
 		${LN} -s "$$src" "$$dest";				\
 	fi
 .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"
 .  include "curses.builtin.mk"
 BUILDLINK_TREE+=		curses -curses
 BUILDLINK_LDADD.curses?=	${BUILDLINK_LIBNAME.curses:S/^/-l/:S/^-l$//}
-BUILDLINK_BUILTIN_MK.curses=	../../mk/curses.builtin.mk
+BUSILDLINK_BUILTIN_MK.curses=	../../mk/curses.builtin.mk
 # Some packages only look for ncurses
 # The correct action would be to write a patch and pass it upstream
 # but by setting FAKE_NCURSES=yes in the package we can temporarily work
 # around the short-coming.
 .  if !empty(FAKE_NCURSES:M[yY][eE][sS])
 BUILDLINK_TARGETS+=		buildlink-curses-ncurses-h
 BUILDLINK_TRANSFORM+=		l:ncurses:${BUILDLINK_LIBNAME.curses}
 BUILDLINK_TRANSFORM+=		l:ncursesw:${BUILDLINK_LIBNAME.curses}
 .  endif
 .elif ${CURSES_TYPE} == "ncurses"
 USE_NCURSES=			yes
 .  include "../../devel/ncurses/buildlink3.mk"
 BUILDLINK_PREFIX.curses?=	${BUILDLINK_PREFIX.ncurses}
 BUILDLINK_LIBNAME.curses?=	${BUILDLINK_LIBNAME.ncurses}
 BUILDLINK_LDADD.curses?=	${BUILDLINK_LDADD.ncurses}
 .elif ${CURSES_TYPE} == "ncursesw"
 .  include "../../devel/ncursesw/buildlink3.mk"
 BUILDLINK_PREFIX.curses?=	${BUILDLINK_PREFIX.ncursesw}
 BUILDLINK_LIBNAME.curses?=	${BUILDLINK_LIBNAME.ncursesw}
 BUILDLINK_LDADD.curses?=	${BUILDLINK_LDADD.ncursesw}
 .elif ${CURSES_TYPE} == "pdcurses"
 .  include "../../devel/pdcurses/buildlink3.mk"
 BUILDLINK_PREFIX.curses?=	${BUILDLINK_PREFIX.pdcurses}
 BUILDLINK_LIBNAME.curses?=	${BUILDLINK_LIBNAME.pdcurses}
 BUILDLINK_LDADD.curses?=	${BUILDLINK_LDADD.pdcurses}
 .endif

 @@ -1,21 +1,49 @@
-# $NetBSD: curses.builtin.mk,v 1.7 2013/11/23 09:10:14 obache Exp $
+# $NetBSD: curses.builtin.mk,v 1.8 2014/03/09 10:15:32 roy Exp $
 BUILTIN_PKG:=	curses
 BUILTIN_FIND_LIBS:=		curses
 BUILTIN_FIND_HEADERS_VAR:=	H_CURSES
 BUILTIN_FIND_HEADERS.H_CURSES=	curses.h
 BUILTIN_FIND_FILES_VAR+=	 H_CURSES_HALFDELAY
 BUILTIN_FIND_FILES.H_CURSES_HALFDELAY=	${BUILTIN_FIND_FILES.H_CURSES}
 BUILTIN_FIND_GREP.H_CURSES_HALFDELAY=	halfdelay
 BUILTIN_FIND_FILES_VAR+=	 H_CURSES_RESIZETERM
 BUILTIN_FIND_FILES.H_CURSES_RESIZETERM=	${BUILTIN_FIND_FILES.H_CURSES}
 BUILTIN_FIND_GREP.H_CURSES_RESIZETERM=	resizeterm
 BUILTIN_FIND_FILES_VAR+=	 H_CURSES_PUTWIN
 BUILTIN_FIND_FILES.H_CURSES_PUTWIN=	${BUILTIN_FIND_FILES.H_CURSES}
 BUILTIN_FIND_GREP.H_CURSES_PUTWIN=	putwin
 BUILTIN_FIND_FILES_VAR+=	 H_CURSES_WA_NORMAL
 BUILTIN_FIND_FILES.H_CURSES_WA_NORMAL=	${BUILTIN_FIND_FILES.H_CURSES}
 BUILTIN_FIND_GREP.H_CURSES_WA_NORMAL=	WA_NORMAL
 BUILTIN_FIND_FILES_VAR+=	 H_CURSES_WGETNSTR
 BUILTIN_FIND_FILES.H_CURSES_WGETNSTR=	${BUILTIN_FIND_FILES.H_CURSES}
 BUILTIN_FIND_GREP.H_CURSES_WGETNSTR=	wgetnstr
 BUILTIN_FIND_FILES_VAR+=	 H_CURSES_WSYNCUP
 BUILTIN_FIND_FILES.H_CURSES_WSYNCUP=	${BUILTIN_FIND_FILES.H_CURSES}
 BUILTIN_FIND_GREP.H_CURSES_WSYNCUP=	wsyncup
 BUILTIN_FIND_FILES_VAR+=	 H_CURSES_MVWCHGAT
 BUILTIN_FIND_FILES.H_CURSES_MVWCHGAT=	${BUILTIN_FIND_FILES.H_CURSES}
 BUILTIN_FIND_GREP.H_CURSES_MVWCHGAT=	mvwchgat
 .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.curses)
 IS_BUILTIN.curses=	no
 .  if empty(H_CURSES:M${LOCALBASE}/*) && exists(${H_CURSES})
 IS_BUILTIN.curses=	yes
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.curses
 @@ -34,35 +62,99 @@ USE_BUILTIN.curses=	yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.curses}
 .        if !empty(USE_BUILTIN.curses:M[yY][eE][sS])
 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
 # If it is set to chgat, a curses implementation with chgat(3) support
 # is considered good enough.
 .if defined(USE_CURSES) && empty(USE_CURSES:M[yY][eE][sS])
 .  if !empty(USE_CURSES:Mchgat) && !empty(H_CURSES_MVWCHGAT:M__nonexistent__)
 USE_BUILTIN.curses=	no
 .  endif
 # same for halfdelay(3)
 .  if !empty(USE_CURSES:Mhalfdelay)
 .    if !empty(H_CURSES_HALFDELAY:M__nonexistent__)
 USE_BUILTIN.curses=	no
 .    endif
 .  endif
 ## same for putwin(3)
 .  if !empty(USE_CURSES:Mputwin) && !empty(H_CURSES_PUTWIN:M__nonexistent__)
 USE_BUILTIN.curses=	no
 .  endif
 # same for resizeterm(3)
 .  if !empty(USE_CURSES:Mresizeterm)
 .    if !empty(H_CURSES_RESIZETERM:M__nonexistent__)
 USE_BUILTIN.curses=	no
 .    endif
 .  endif
 ## same for WA_NORMAL
 .  if !empty(USE_CURSES:MWA_NORMAL)
 .    if !empty(H_CURSES_WA_NORMAL:M__nonexistent__)
 USE_BUILTIN.curses=	no
 .    endif
 .  endif
 ## same for wgetnstr(3)
 .  if !empty(USE_CURSES:Mwgetnstr) && !empty(H_CURSES_WGETNSTR:M__nonexistent__)
 USE_BUILTIN.curses=	no
 .  endif
 # same for wsyncup(3)
 .  if !empty(USE_CURSES:Mwsyncup) && !empty(H_CURSES_WSYNCUP:M__nonexistent__)
 USE_BUILTIN.curses=	no
 .  endif
 # AFAIK there is no way of working out if a system curses library has wide
 # character support. So be safe and say no unless we know for sure.
 .  if !empty(USE_CURSES:Mwide)
 .    if ${OPSYS} == "NetBSD"
 .      if !empty(MACHINE_PLATFORM:MNetBSD-[0-4].*-*)
 USE_BUILTIN.curses=	no
 .      endif
 .    else
 USE_BUILTIN.curses=	no
 .    endif
 .  endif
 .endif
 # Even if the package requested tests above pass,
 # some system curses just are not good enough.
 # If your system is one, add it here so a suitable
 # curses from pkgsrc can be installed.
 _INCOMPAT_CURSES?=	NetBSD-0.*-* NetBSD-1.[0123]*-*			\
 			NetBSD-1.4.*-* NetBSD-1.4[A-X]-*
 .for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES}
 .  if !empty(MACHINE_PLATFORM:M${_pattern_})
 USE_BUILTIN.curses=	no
 .  endif
 .endfor
 MAKEVARS+=	USE_BUILTIN.curses
 # Define BUILTIN_LIBNAME.curses to be the base name of the built-in
 # curses library.
+#
 .if !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
 BUILTIN_LIBNAME.curses=		curses
 .endif
 BUILTIN_LIBNAME.curses=		curses
 ###
 ### 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

 @@ -1,14 +1,14 @@
-# $NetBSD: terminfo.buildlink3.mk,v 1.4 2013/11/19 11:43:19 obache Exp $
+# $NetBSD: terminfo.buildlink3.mk,v 1.5 2014/03/09 10:15:32 roy Exp $
+#
 # This Makefile fragment is meant to be included by packages that require
 # any terminfo implementation instead of one particular one.  The available
 # terminfo implementations are "terminfo" 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 ===
+#
 # TERMINFO_DEFAULT
 @@ -23,27 +23,27 @@
+#
 # TERMINFO_TYPE
 #	The name of the selected terminfo implementation.
 TERMINFO_BUILDLINK3_MK:=	${TERMINFO_BUILDLINK3_MK}+
 .include "bsd.fast.prefs.mk"
 .if !empty(TERMINFO_BUILDLINK3_MK:M+)
 # _TERMINFO_PKGS is an exhaustive list of all of the terminfo implementations
 # that may be used with terminfo.buildlink3.mk.
+#
 _TERMINFO_PKGS?=		terminfo ncurses pdcurses
-_TERMINFO_TYPES?=		terminfo tinfo
+_TERMINFO_TYPES?=		terminfo tinfo curses ncurses
 CHECK_BUILTIN.terminfo:=	yes
 .  include "terminfo.builtin.mk"
 CHECK_BUILTIN.terminfo:=	no
 # Set the value of TERMINFO_DEFAULT depending on the platform and what's
 # available in the base system.
+#
 .if defined(USE_BUILTIN.terminfo) && !empty(USE_BUILTIN.terminfo:M[yY][eE][sS])
 TERMINFO_DEFAULT?=	terminfo
 .else
 TERMINFO_DEFAULT?=	ncurses
 .endif
 @@ -63,27 +63,28 @@ TERMINFO_TYPE=		none
 .  endif
 BUILD_DEFS+=		TERMINFO_DEFAULT
 BUILD_DEFS_EFFECTS+=	TERMINFO_TYPE
 # Most GNU configure scripts will try finding every terminfo implementation,
 # so prevent them from finding any except for the one we decide upon.
+#
 # There is special handling for packages that can be provided by pkgsrc,
 # e.g. curses -- see terminfo.builtin.mk for details.
+#
 .if empty(TERMINFO_TYPE:Mnone)
 .  for _tcap_ in ${_TERMINFO_TYPES}
-.    if empty(TERMINFO_TYPE:M${_tcap_})
+.    if empty(TERMINFO_TYPE:M${_tcap_}) \
 	&& (!defined(CURSES_TYPE) || empty(CURSES_TYPE:M${_tcap_}))
 BUILDLINK_TRANSFORM+=		l:${_tcap_}:${BUILDLINK_LIBNAME.terminfo}
 .    endif
 .  endfor
 .endif
 .endif	# TERMINFO_BUILDLINK3_MK
 .if ${TERMINFO_TYPE} == "none"
 PKG_FAIL_REASON=	\
 	"${_TERMINFO_TYPE} is not an acceptable terminfo type for ${PKGNAME}."
 .elif ${TERMINFO_TYPE} == "terminfo"
 BUILDLINK_TREE+=		terminfo -terminfo
 BUILDLINK_LIBNAME.terminfo?=	${BUILTIN_LIBNAME.terminfo}