[pkgsrc/trunk]: pkgsrc/mk Oy, what a hack. But then, so is Interix....

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1854219f55dc
branches:  trunk
changeset: 481859:1854219f55dc
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Oct 13 20:10:31 2004 +0000

description:
Oy, what a hack.  But then, so is Interix....

On Interix, force inclusion of devel/ncurses/buildlink3.mk from
mk/curses.buildlink3.mk.  This forces inclusion of its builtin.mk too.

In devel/ncurses/builtin.mk, if using Interix's builtin ncurses, always
transform -lncurses to -lcurses.  (-lncurses is static, but -lcurses is
shared; we want the shared version.)

diffstat:

 devel/ncurses/builtin.mk |   5 +++--
 mk/curses.buildlink3.mk  |  11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r e75a32343f93 -r 1854219f55dc devel/ncurses/builtin.mk
--- a/devel/ncurses/builtin.mk  Wed Oct 13 20:09:55 2004 +0000
+++ b/devel/ncurses/builtin.mk  Wed Oct 13 20:10:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2004/03/29 05:43:30 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2004/10/13 20:10:31 tv Exp $
 
 .if !defined(_BLNK_LIBNCURSES_FOUND)
 _BLNK_LIBNCURSES_FOUND!=       \
@@ -99,7 +99,8 @@
 .if !empty(CHECK_BUILTIN.ncurses:M[nN][oO])
 
 .if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
-.  if !empty(_BLNK_LIBNCURSES_FOUND:M[nN][oO])
+.  include "../../mk/bsd.prefs.mk"
+.  if !empty(_BLNK_LIBNCURSES_FOUND:M[nN][oO]) || ${OPSYS} == "Interix"
 BUILDLINK_TRANSFORM.ncurses+=  -e "s|/curses\.h|/ncurses.h|g"
 BUILDLINK_TRANSFORM+=          l:ncurses:curses
 .  endif
diff -r e75a32343f93 -r 1854219f55dc mk/curses.buildlink3.mk
--- a/mk/curses.buildlink3.mk   Wed Oct 13 20:09:55 2004 +0000
+++ b/mk/curses.buildlink3.mk   Wed Oct 13 20:10:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: curses.buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $
+# $NetBSD: curses.buildlink3.mk,v 1.3 2004/10/13 20:10:31 tv Exp $
 #
 # This file should be included by Makefiles for packages that use curses.
 # If a system curses isn't available, then add a dependency on ncurses.
@@ -9,4 +9,13 @@
 .if !exists(/usr/include/curses.h) && \
     !exists(/usr/include/ncurses.h)
 .  include "../../devel/ncurses/buildlink3.mk"
+.else
+
+# XXX this is ugly, but needed to get the BUILDLINK_TRANSFORM from builtin.mk;
+# on Interix, libncurses is static yet libcurses (also ncurses) is shared
+.  include "../../mk/bsd.prefs.mk"
+.  if ${OPSYS} == "Interix"
+.    include "../../devel/ncurses/buildlink3.mk"
+.  endif
+
 .endif