CVS commit: pkgsrc/mk

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Wed Jan  4 15:52:51 UTC 2017

Modified Files:
        pkgsrc/mk: curses.buildlink3.mk

Log Message:
Support FAKE_NCURSES=yes for pdcurses and ncursesw.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mk/curses.buildlink3.mk

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

Modified files:

Index: pkgsrc/mk/curses.buildlink3.mk
diff -u pkgsrc/mk/curses.buildlink3.mk:1.23 pkgsrc/mk/curses.buildlink3.mk:1.24
--- pkgsrc/mk/curses.buildlink3.mk:1.23 Mon Apr 11 04:22:34 2016
+++ pkgsrc/mk/curses.buildlink3.mk      Wed Jan  4 15:52:50 2017
@@ -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 @@ PKG_FAIL_REASON+= \
 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