From 50e31c76f217307232bff5a1eec733a9a1b412b1 Mon Sep 17 00:00:00 2001
From: pho <pho@pkgsrc.org>
Date: Mon, 2 Feb 2015 15:16:32 +0000
Subject: Ensure BUILDLINK_{INCDIRS,LIBDIRS}.curses are always defined

These variables are for packages where populating -I/-L flags into
{C,CPP,LD}FLAGS is not enough and need to know accurate paths to
header and library directories.

This is particularly important for ncurses because its headers
sometimes reside in "${BUILDLINK_PREFIX.ncurses}/include/ncurses" and
sometimes in "${BUILDLINK_PREFIX.ncurses}/include" while no pkg-config
.pc files are available. The same goes for ncursesw.
---
 mk/curses.buildlink3.mk | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/mk/curses.buildlink3.mk b/mk/curses.buildlink3.mk
index 74b01ad79ab..f788cca7559 100644
--- a/mk/curses.buildlink3.mk
+++ b/mk/curses.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: curses.buildlink3.mk,v 1.20 2014/03/12 08:38:47 obache Exp $
+# $NetBSD: curses.buildlink3.mk,v 1.21 2015/02/02 15:16:32 pho Exp $
 #
 # This Makefile fragment is meant to be included by packages that require
 # any curses implementation instead of one particular one.  The available
@@ -111,20 +111,19 @@ 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"
+.else
+.  if ${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}
+.    include "../../devel/ncurses/buildlink3.mk"
+
+.  elif ${CURSES_TYPE} == "ncursesw"
+.    include "../../devel/ncursesw/buildlink3.mk"
+
+.  elif ${CURSES_TYPE} == "pdcurses"
+.    include "../../devel/pdcurses/buildlink3.mk"
+
+.  endif
+.  for _var_ in PREFIX INCDIRS LIBDIRS LIBNAME LDADD
+BUILDLINK_${_var_}.curses?=	${BUILDLINK_${_var_}.${CURSES_TYPE}}
+.  endfor
 .endif
-- 
cgit v1.2.3