diff options
| author | joerg <joerg> | 2007-02-08 00:08:20 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-02-08 00:08:20 +0000 |
| commit | 5f9685da09a08e07f90347b3868ae2321e247bdc (patch) | |
| tree | 19458a69d6b78ae2d7f10d3fa5cc139803588118 /x11/Xaw3d | |
| parent | f12542dd873b85dfa7558c232d2c8c105468cd02 (diff) | |
| download | pkgsrc-5f9685da09a08e07f90347b3868ae2321e247bdc.tar.gz | |
Xaw3d worked more or less accidently for most packages as they continued
to use include/X11/Xaw/* and not the versions provided by Xaw3d. Many
packages also incorrectly linked against libXaw and not libXaw3d,
effectively making the dependency a nop.
Address this problem in two steps:
(a) Transform -lXaw to -lXaw3d. This magically fixes the packages which
got it wrong before. I haven't checked a list of packages affected by
this, so no revision bumps here.
(b) Link include/X11/Xaw3d to include/X11/Xaw for modular Xorg, so that
the dependency on Xaw3d actually works without pulling in libXaw as well.
This should be extended to the other Xaw packages, but I don't use them
nor do I have any interest in them.
Discussed with and not objected by: jlam
Diffstat (limited to 'x11/Xaw3d')
| -rw-r--r-- | x11/Xaw3d/buildlink3.mk | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/x11/Xaw3d/buildlink3.mk b/x11/Xaw3d/buildlink3.mk index 55522b9bb07..5f38ad345b2 100644 --- a/x11/Xaw3d/buildlink3.mk +++ b/x11/Xaw3d/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/01/24 03:46:59 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2007/02/08 00:08:20 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XAW3D_BUILDLINK3_MK:= ${XAW3D_BUILDLINK3_MK}+ @@ -15,9 +15,22 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xaw3d BUILDLINK_API_DEPENDS.Xaw3d+= Xaw3d>=1.5 BUILDLINK_ABI_DEPENDS.Xaw3d?= Xaw3d>=1.5Enb1 BUILDLINK_PKGSRCDIR.Xaw3d?= ../../x11/Xaw3d -.endif # XAW3D_BUILDLINK3_MK + +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d .include "../../mk/bsd.fast.prefs.mk" + +.if ${X11_TYPE} == "modular" +.PHONY: buildlink-Xaw3d-inc-hack +buildlink-Xaw3d-cookie: buildlink-Xaw3d-inc-hack + +buildlink-Xaw3d-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 # XAW3D_BUILDLINK3_MK + .include "../../x11/libXmu/buildlink3.mk" LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib \ |