Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171405554649350"
MIME-Version: 1.0
Date: Thu, 25 Apr 2024 14:32:26 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/mk
To: pkgsrc-changes@NetBSD.org
Reply-To: tnn@netbsd.org
Message-Id: <20240425143227.03262FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171405554649350
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tnn
Date:		Thu Apr 25 14:32:26 UTC 2024

Modified Files:
	pkgsrc/mk: termcap.builtin.mk

Log Message:
mk: fix termcap/terminfo detection issue when both are builtin

Both termcap.builtin.mk and terminfo.builtin.mk used the same variable
H_TERM for BUILTIN_FIND_HEADERS_VAR. This for some reason causes the
logic to trip up in a specific scenario:
when termcap.buildlink3.mk is included before terminfo.buildlink3.mk.

When termcap was introduced as a dependency in audio/lame/buildlink3.mk
in r1.12, then audio/libsndfile incorrectly started to depend on ncurses
on NetBSD.

Fix this by using a different variable name for the builtin detection.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mk/termcap.builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171405554649350
Content-Disposition: inline
Content-Length: 1854
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/termcap.builtin.mk
diff -u pkgsrc/mk/termcap.builtin.mk:1.10 pkgsrc/mk/termcap.builtin.mk:1.11
--- pkgsrc/mk/termcap.builtin.mk:1.10	Sat Nov 23 09:10:14 2013
+++ pkgsrc/mk/termcap.builtin.mk	Thu Apr 25 14:32:26 2024
@@ -1,11 +1,11 @@
-# $NetBSD: termcap.builtin.mk,v 1.10 2013/11/23 09:10:14 obache Exp $
+# $NetBSD: termcap.builtin.mk,v 1.11 2024/04/25 14:32:26 tnn Exp $
 
 BUILTIN_PKG:=	termcap
 
 BUILTIN_FIND_LIBS:=		terminfo curses termcap termlib tinfo
-BUILTIN_FIND_HEADERS_VAR:=	H_TERM H_TERMCAP H_TERMLIB
-BUILTIN_FIND_HEADERS.H_TERM:=	term.h
-BUILTIN_FIND_GREP.H_TERM:=	tgetent
+BUILTIN_FIND_HEADERS_VAR:=	H_TERM_TC H_TERMCAP H_TERMLIB
+BUILTIN_FIND_HEADERS.H_TERM_TC:=term.h
+BUILTIN_FIND_GREP.H_TERM_TC:=	tgetent
 BUILTIN_FIND_HEADERS.H_TERMCAP:=	termcap.h
 BUILTIN_FIND_GREP.H_TERMCAP:=	tgetent
 BUILTIN_FIND_HEADERS.H_TERMLIB:=	termlib.h
@@ -19,7 +19,7 @@ BUILTIN_FIND_GREP.H_TERMLIB:=	tgetent
 ###
 .if !defined(IS_BUILTIN.termcap)
 IS_BUILTIN.termcap=	no
-.  if empty(H_TERM:M__nonexistent__) && empty(H_TERM:M${LOCALBASE}/*) || \
+.  if empty(H_TERM_TC:M__nonexistent__) && empty(H_TERM_TC: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])
@@ -55,7 +55,7 @@ MAKEVARS+=	USE_BUILTIN.termcap
 # (7) If <termlib.h> exists and libtermlib doesn't, then it's "c".
 # (8) If libtermlib exists by itself, then it's "termlib".
 #
-.if empty(H_TERM:M__nonexistent__) && empty(H_TERM:M${LOCALBASE}/*)
+.if empty(H_TERM_TC:M__nonexistent__) && empty(H_TERM_TC:M${LOCALBASE}/*)
 .  if !empty(BUILTIN_LIB_FOUND.terminfo:M[yY][eE][sS])
 BUILTIN_LIBNAME.termcap=	terminfo
 .  elif !empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS])


--_----------=_171405554649350--