Tue Jul 12 06:42:59 2011 UTC ()
fixes forgotten replacement of BUILDLINK_*.curses with *.terminfo


(obache)
diff -r1.1 -r1.2 pkgsrc/mk/terminfo.buildlink3.mk
cvs diff -r1.1 -r1.2 pkgsrc/mk/terminfo.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/terminfo.buildlink3.mk 2010/02/08 22:11:43 1.1
+++ pkgsrc/mk/terminfo.buildlink3.mk 2011/07/12 06:42:58 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: terminfo.buildlink3.mk,v 1.1 2010/02/08 22:11:43 roy Exp $ 1# $NetBSD: terminfo.buildlink3.mk,v 1.2 2011/07/12 06:42:58 obache Exp $
2# 2#
3# This Makefile fragment is meant to be included by packages that require 3# This Makefile fragment is meant to be included by packages that require
4# any terminfo implementation instead of one particular one. The available 4# any terminfo implementation instead of one particular one. The available
5# terminfo implementations are "terminfo" if built-in, "ncurses", and 5# terminfo implementations are "terminfo" if built-in, "ncurses", and
6# "pdcurses". 6# "pdcurses".
7# 7#
8# If a package genuinely requires ncurses or pdcurses, then it should 8# If a package genuinely requires ncurses or pdcurses, then it should
9# directly include the appropriate buildlink3.mk instead of this file in 9# directly include the appropriate buildlink3.mk instead of this file in
10# the package Makefile. 10# the package Makefile.
11# 11#
12# === User-settable variables === 12# === User-settable variables ===
13# 13#
14# TERMINFO_DEFAULT 14# TERMINFO_DEFAULT
@@ -63,22 +63,22 @@ TERMINFO_TYPE= none @@ -63,22 +63,22 @@ TERMINFO_TYPE= none
63 63
64BUILD_DEFS+= TERMINFO_DEFAULT 64BUILD_DEFS+= TERMINFO_DEFAULT
65BUILD_DEFS_EFFECTS+= TERMINFO_TYPE 65BUILD_DEFS_EFFECTS+= TERMINFO_TYPE
66 66
67.endif # TERMINFO_BUILDLINK3_MK 67.endif # TERMINFO_BUILDLINK3_MK
68 68
69.if ${TERMINFO_TYPE} == "none" 69.if ${TERMINFO_TYPE} == "none"
70PKG_FAIL_REASON= \ 70PKG_FAIL_REASON= \
71 "${_TERMINFO_TYPE} is not an acceptable terminfo type for ${PKGNAME}." 71 "${_TERMINFO_TYPE} is not an acceptable terminfo type for ${PKGNAME}."
72.elif ${TERMINFO_TYPE} == "terminfo" 72.elif ${TERMINFO_TYPE} == "terminfo"
73.elif ${TERMINFO_TYPE} == "ncurses" 73.elif ${TERMINFO_TYPE} == "ncurses"
74USE_NCURSES= yes 74USE_NCURSES= yes
75. include "../../devel/ncurses/buildlink3.mk" 75. include "../../devel/ncurses/buildlink3.mk"
76BUILDLINK_PREFIX.curses?= ${BUILDLINK_PREFIX.ncurses} 76BUILDLINK_PREFIX.terminfo?= ${BUILDLINK_PREFIX.ncurses}
77BUILDLINK_LIBNAME.curses?= ${BUILDLINK_LIBNAME.ncurses} 77BUILDLINK_LIBNAME.terminfo?= ${BUILDLINK_LIBNAME.ncurses}
78BUILDLINK_LDADD.curses?= ${BUILDLINK_LDADD.ncurses} 78BUILDLINK_LDADD.terminfo?= ${BUILDLINK_LDADD.ncurses}
79.elif ${TERMINFO_TYPE} == "pdcurses" 79.elif ${TERMINFO_TYPE} == "pdcurses"
80. include "../../devel/pdcurses/buildlink3.mk" 80. include "../../devel/pdcurses/buildlink3.mk"
81BUILDLINK_PREFIX.curses?= ${BUILDLINK_PREFIX.pdcurses} 81BUILDLINK_PREFIX.terminfo?= ${BUILDLINK_PREFIX.pdcurses}
82BUILDLINK_LIBNAME.curses?= ${BUILDLINK_LIBNAME.pdcurses} 82BUILDLINK_LIBNAME.terminfo?= ${BUILDLINK_LIBNAME.pdcurses}
83BUILDLINK_LDADD.curses?= ${BUILDLINK_LDADD.pdcurses} 83BUILDLINK_LDADD.terminfo?= ${BUILDLINK_LDADD.pdcurses}
84.endif 84.endif