Takahiro Kambe <taca%back-street.net@localhost> writes:
> How we handling x11/Xaw3d v.s. x11/libXaw3d?
>
> * x11/Xaw3d and x11/libXaw3d are conflicted.
> * Some packages need x11/Xaw3d and others do x11/libXaw3d.
> * pkgsrc's framework mk/xaw.buildlink3.mk dose not know about
> x11/libXaw3d at all.
>
> I wish this problem would be solved before branching pkgsrc-2015Q3.
Sorry for being late on this. Here is the uncommitted change I have,
which brings the xaw3d usage over to the modular version. Please
review/comment.
Index: mk/xaw.buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/xaw.buildlink3.mk,v
retrieving revision 1.6
diff -u -p -r1.6 xaw.buildlink3.mk
--- mk/xaw.buildlink3.mk 15 Jan 2013 16:21:34 -0000 1.6
+++ mk/xaw.buildlink3.mk 26 Sep 2015 23:03:30 -0000
@@ -22,7 +22,11 @@ BUILD_DEFS+= XAW_TYPE
. include "../../x11/Xaw-Xpm/buildlink3.mk"
BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.Xaw-Xpm}
.elif ${XAW_TYPE} == "3d"
-. include "../../x11/Xaw3d/buildlink3.mk"
+. if ${X11_TYPE} == "modular"
+. include "../../x11/libXaw3d/buildlink3.mk"
+. else
+. include "../../x11/Xaw3d/buildlink3.mk"
+. endif
BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.Xaw3d}
.elif ${XAW_TYPE} == "neXtaw"
. include "../../x11/neXtaw/buildlink3.mk"
Attachment:
pgpLF3mmDrFhF.pgp
Description: PGP signature