[pkgsrc/trunk]: pkgsrc/x11 Add logic gleefully ripped from x11/Xaw3d/buildlin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/564d9b5012b8
branches:  trunk
changeset: 536834:564d9b5012b8
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Mon Dec 24 18:57:49 2007 +0000

description:
Add logic gleefully ripped from x11/Xaw3d/buildlink3.mk to make these
libraries work properly with xaw.buildlink3.mk.  That's better!

This was done so that X/Open Curses (pkgsrc-wip/pdcurses) could
have a chance of using these libraries. ;)

diffstat:

 x11/Xaw-Xpm/buildlink3.mk |  15 +++++++++++++--
 x11/neXtaw/buildlink3.mk  |  14 +++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diffs (59 lines):

diff -r 2ee9900b1ef4 -r 564d9b5012b8 x11/Xaw-Xpm/buildlink3.mk
--- a/x11/Xaw-Xpm/buildlink3.mk Mon Dec 24 10:35:55 2007 +0000
+++ b/x11/Xaw-Xpm/buildlink3.mk Mon Dec 24 18:57:49 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/12/27 13:37:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/12/24 18:57:49 bjs Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 XAW_XPM_BUILDLINK3_MK:=        ${XAW_XPM_BUILDLINK3_MK}+
@@ -15,9 +15,20 @@
 BUILDLINK_API_DEPENDS.Xaw-Xpm+=        Xaw-Xpm>=1.1
 BUILDLINK_ABI_DEPENDS.Xaw-Xpm?=        Xaw-Xpm>=1.1nb2
 BUILDLINK_PKGSRCDIR.Xaw-Xpm?=  ../../x11/Xaw-Xpm
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} == "modular"
+.PHONY: buildlink-Xaw_Xpm-inc-hack
+buildlink-Xaw-Xpm-cookie: buildlink-Xaw-Xpm-inc-hack
+
+buildlink-Xaw-Xpm-inc-hack: buildlink-directories
+       [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \
+               ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \
+               ${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw
+.endif
 .endif # XAW_XPM_BUILDLINK3_MK
 
-.include "../../mk/bsd.fast.prefs.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 
 LIBXAW?=       -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib                       \
diff -r 2ee9900b1ef4 -r 564d9b5012b8 x11/neXtaw/buildlink3.mk
--- a/x11/neXtaw/buildlink3.mk  Mon Dec 24 10:35:55 2007 +0000
+++ b/x11/neXtaw/buildlink3.mk  Mon Dec 24 18:57:49 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/01/30 21:00:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/12/24 18:57:49 bjs Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 NEXTAW_BUILDLINK3_MK:= ${NEXTAW_BUILDLINK3_MK}+
@@ -15,6 +15,18 @@
 BUILDLINK_API_DEPENDS.neXtaw+= neXtaw>=0.15.1
 BUILDLINK_ABI_DEPENDS.neXtaw+= neXtaw>=0.15.1nb2
 BUILDLINK_PKGSRCDIR.neXtaw?=   ../../x11/neXtaw
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} == "modular"
+.PHONY: buildlink-neXtaw-inc-hack
+buildlink-neXtaw-cookie: buildlink-neXtaw-inc-hack
+ 
+buildlink-neXtaw-inc-hack: buildlink-directories
+       [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \
+               ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \
+               ${LN} -s neXtaw ${BUILDLINK_DIR}/include/X11/Xaw
+.endif
 .endif # NEXTAW_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"