tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: builtin detection condition mismatch in mk/termcap.builtin.mk



proposed changes:

Index: termcap.builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/termcap.builtin.mk,v
retrieving revision 1.8
diff -u -r1.8 termcap.builtin.mk
--- termcap.builtin.mk  31 Oct 2012 03:28:40 -0000      1.8
+++ termcap.builtin.mk  21 Apr 2013 06:32:48 -0000
@@ -19,11 +19,10 @@
 ###
 .if !defined(IS_BUILTIN.termcap)
 IS_BUILTIN.termcap=    no
-.  if !empty(BUILTIN_LIB_FOUND.terminfo:M[yY][eE][sS]) || \
-      !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) || \
-      !empty(BUILTIN_LIB_FOUND.termcap:M[yY][eE][sS]) || \
-      !empty(BUILTIN_LIB_FOUND.termlib:M[yY][eE][sS]) || \
-      !empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS])
+.  if empty(H_TERM:M__nonexistent__) && empty(H_TERM:M${LOCALBASE}/*) || \
+      empty(H_TERMCAP:M__nonexistent__) && empty(H_TERMCAP:M${LOCALBASE}/*) || 
\
+      empty(H_TERMLIB:M__nonexistent__) && empty(H_TERMLIB:M${LOCALBASE}/*) || 
\
+      !empty(BUILTIN_LIB_FOUND.termlib:M[yY][eE][sS])
 IS_BUILTIN.termcap=    yes
 .  endif
 .endif

--
OBATA Akio / obache%NetBSD.org@localhost


Home | Main Index | Thread Index | Old Index