[pkgsrc/trunk]: pkgsrc/devel/ncursesw Overwrite symlinks for <ncurses.h> and ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7709c631a40d
branches:  trunk
changeset: 538910:7709c631a40d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Feb 20 20:07:25 2008 +0000

description:
Overwrite symlinks for <ncurses.h> and <curses.h> to point to
<ncursesw/ncurses.h> so that including any of the curses headers will
consistently pull in the same information.

diffstat:

 devel/ncursesw/builtin.mk |  28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diffs (49 lines):

diff -r e1bd81cdc987 -r 7709c631a40d devel/ncursesw/builtin.mk
--- a/devel/ncursesw/builtin.mk Wed Feb 20 19:32:06 2008 +0000
+++ b/devel/ncursesw/builtin.mk Wed Feb 20 20:07:25 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2008/02/20 17:17:46 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/02/20 20:07:25 jlam Exp $
 
 BUILTIN_PKG:=  ncursesw
 
@@ -114,8 +114,15 @@
 .  endif
 BUILDLINK_TARGETS+=            buildlink-ncursesw-curses-h
 
-# Most packages expect <ncursesw/curses.h> to provide declarations for
-# ncursesw.
+# Packages will expect the following includes to provide declarations
+# for ncursesw if wide curses are supported:
+#
+#      <ncursesw/curses.h>
+#      <ncurses.h>
+#      <curses.h>
+#
+# We must explicitly force the symlinks to be created as we have to
+# overwrite any that ncurses/buildlink3.mk might create ahead of us.
 #
 .  if !target(buildlink-ncursesw-curses-h)
 .PHONY: buildlink-ncursesw-curses-h
@@ -124,12 +131,15 @@
        curses_h="ncursesw/ncurses.h curses.h";                         \
        for f in $$curses_h; do                                         \
                src=${BUILDLINK_PREFIX.ncursesw:Q}"/include/$$f";       \
-               dest=${BUILDLINK_DIR:Q}"/include/ncursesw/curses.h";    \
-               if ${TEST} ! -f "$$dest" -a -f "$$src"; then            \
-                       ${ECHO_BUILDLINK_MSG} "Linking ncursesw/curses.h -> $$f."; \
-                       ${MKDIR} `${DIRNAME} "$$dest"`;                 \
-                       ${LN} -s "$$src" "$$dest";                      \
-               fi;                                                     \
+               dests="ncursesw/curses.h ncurses.h curses.h";           \
+               for dest in $$dests; do                                 \
+                       dest=${BUILDLINK_DIR:Q}"/include/$$dest";       \
+                       if ${TEST} -f "$$src"; then                     \
+                               ${ECHO_BUILDLINK_MSG} "Linking $$dest -> $$f."; \
+                               ${MKDIR} `${DIRNAME} "$$dest"`;         \
+                               ${LN} -fs "$$src" "$$dest";             \
+                       fi;                                             \
+               done;                                                   \
        done
 .  endif