Sun Nov 10 02:54:47 2013 UTC ()
Prevent to strip -l{,n}curses for the case terminfo library name is itself.


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

--- pkgsrc/mk/terminfo.builtin.mk 2010/02/08 22:11:43 1.2
+++ pkgsrc/mk/terminfo.builtin.mk 2013/11/10 02:54:47 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: terminfo.builtin.mk,v 1.2 2010/02/08 22:11:43 roy Exp $ 1# $NetBSD: terminfo.builtin.mk,v 1.3 2013/11/10 02:54:47 obache Exp $
2 2
3BUILTIN_PKG:= terminfo 3BUILTIN_PKG:= terminfo
4 4
5BUILTIN_FIND_LIBS:= terminfo curses tinfo 5BUILTIN_FIND_LIBS:= terminfo curses tinfo
6BUILTIN_FIND_FILES_VAR:= H_TERM 6BUILTIN_FIND_FILES_VAR:= H_TERM
7BUILTIN_FIND_FILES.H_TERM:= /usr/include/term.h 7BUILTIN_FIND_FILES.H_TERM:= /usr/include/term.h
8BUILTIN_FIND_GREP.H_TERM:= tigetstr 8BUILTIN_FIND_GREP.H_TERM:= tigetstr
9 9
10.include "buildlink3/bsd.builtin.mk" 10.include "buildlink3/bsd.builtin.mk"
11 11
12### 12###
13### Determine if there is a built-in implementation of the package and 13### Determine if there is a built-in implementation of the package and
14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
@@ -67,18 +67,22 @@ BUILTIN_LIBNAME.terminfo= c @@ -67,18 +67,22 @@ BUILTIN_LIBNAME.terminfo= c
67CHECK_BUILTIN.terminfo?= no 67CHECK_BUILTIN.terminfo?= no
68.if !empty(CHECK_BUILTIN.terminfo:M[nN][oO]) 68.if !empty(CHECK_BUILTIN.terminfo:M[nN][oO])
69 69
70. if !empty(USE_BUILTIN.terminfo:M[yY][eE][sS]) 70. if !empty(USE_BUILTIN.terminfo:M[yY][eE][sS])
71BUILDLINK_LIBNAME.terminfo= ${BUILTIN_LIBNAME.terminfo} 71BUILDLINK_LIBNAME.terminfo= ${BUILTIN_LIBNAME.terminfo}
72. endif 72. endif
73 73
74# If the package wants both "terminfo" and "curses", then we must not 74# If the package wants both "terminfo" and "curses", then we must not
75# remove the -l options for the curses libraries; otherwise, we should 75# remove the -l options for the curses libraries; otherwise, we should
76# remove them as GNU configure scripts commonly check for one or both 76# remove them as GNU configure scripts commonly check for one or both
77# of those library options. 77# of those library options.
78# 78#
79. if empty(BUILDLINK_TREE:Mcurses) && empty(BUILDLINK_TREE:Mncurses) 79. if empty(BUILDLINK_TREE:Mcurses) && empty(BUILDLINK_TREE:Mncurses)
 80. if empty(BUILDLINK_LIBNAME.terminfo:Mcurses)
80BUILDLINK_TRANSFORM+= rm:-lcurses 81BUILDLINK_TRANSFORM+= rm:-lcurses
 82. endif
 83. if empty(BUILDLINK_LIBNAME.terminfo:Mncurses)
81BUILDLINK_TRANSFORM+= rm:-lncurses 84BUILDLINK_TRANSFORM+= rm:-lncurses
 85. endif
82. endif 86. endif
83 87
84.endif # CHECK_BUILTIN.terminfo 88.endif # CHECK_BUILTIN.terminfo