pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Support FAKE_NCURSES=yes for pdcurses and ncursesw.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e40c3dfec2d
branches:  trunk
changeset: 356764:0e40c3dfec2d
user:      roy <roy%pkgsrc.org@localhost>
date:      Wed Jan 04 15:52:50 2017 +0000

description:
Support FAKE_NCURSES=yes for pdcurses and ncursesw.

diffstat:

 mk/curses.buildlink3.mk |  28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diffs (52 lines):

diff -r 27aaae61ce05 -r 0e40c3dfec2d mk/curses.buildlink3.mk
--- a/mk/curses.buildlink3.mk   Wed Jan 04 15:44:00 2017 +0000
+++ b/mk/curses.buildlink3.mk   Wed Jan 04 15:52:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: curses.buildlink3.mk,v 1.23 2016/04/11 04:22:34 dbj Exp $
+# $NetBSD: curses.buildlink3.mk,v 1.24 2017/01/04 15:52:50 roy Exp $
 #
 # This Makefile fragment is meant to be included by packages that require
 # any curses implementation instead of one particular one.  The available
@@ -102,28 +102,30 @@
 BUILDLINK_TREE+=               curses -curses
 BUILDLINK_LDADD.curses?=       ${BUILDLINK_LIBNAME.curses:S/^/-l/:S/^-l$//}
 BUSILDLINK_BUILTIN_MK.curses=  ../../mk/curses.builtin.mk
-# Some packages only look for ncurses
-# The correct action would be to write a patch and pass it upstream
-# but by setting FAKE_NCURSES=yes in the package we can temporarily work
-# around the short-coming.
-.  if defined(FAKE_NCURSES) && !empty(FAKE_NCURSES:M[yY][eE][sS])
-BUILDLINK_TARGETS+=            buildlink-curses-ncurses-h
-BUILDLINK_TRANSFORM+=          l:ncurses:${BUILDLINK_LIBNAME.curses}
-BUILDLINK_TRANSFORM+=          l:ncursesw:${BUILDLINK_LIBNAME.curses}
-.  endif
 .else
 .  if ${CURSES_TYPE} == "ncurses"
 USE_NCURSES=                   yes
 .    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 PKGNAME PREFIX INCDIRS LIBDIRS LIBNAME LDADD
 BUILDLINK_${_var_}.curses?=    ${BUILDLINK_${_var_}.${CURSES_TYPE}}
 .  endfor
 .endif
+
+# Some packages only look for ncurses
+# The correct action would be to write a patch and pass it upstream
+# but by setting FAKE_NCURSES=yes in the package we can temporarily work
+# around the short-coming.
+.if defined(FAKE_NCURSES) && !empty(FAKE_NCURSES:M[yY][eE][sS])
+.  if ${CURSES_TYPE} != "ncurses"
+.    if ${CURSES_TYPE} != "ncursesw"
+BUILDLINK_TARGETS+=            buildlink-curses-ncurses-h
+BUILDLINK_TRANSFORM+=          l:ncursesw:${BUILDLINK_LIBNAME.curses}
+.    endif
+BUILDLINK_TRANSFORM+=          l:ncurses:${BUILDLINK_LIBNAME.curses}
+.  endif
+.endif



Home | Main Index | Thread Index | Old Index