diff options
| author | morr <morr> | 2013-01-15 16:21:34 +0000 |
|---|---|---|
| committer | morr <morr> | 2013-01-15 16:21:34 +0000 |
| commit | b4ff12da4803459662dfa0965d9df487b3fdaa59 (patch) | |
| tree | 32a57d9d2dc8b1b3e8b11c0456cec6c97f2deee2 /x11/Xaw-Xpm | |
| parent | 1f845d8faa3004ad8fc8250b73e4a915503bdcf6 (diff) | |
| download | pkgsrc-b4ff12da4803459662dfa0965d9df487b3fdaa59.tar.gz | |
Clean up libXaw handling. [1/2]
- remove LIBXAW variable. It is handled by buildlink3.mk now
- simplify patches and Makefile in packages using libXaw
- in some cases force use of Xaw3d (won't build with Xaw)
- replace some directly included of x11/Xaw3d with mk/xaw.buildlink3.mk
In next part:
- replace more includes with mk/xaw.buildlink3.mk
Diffstat (limited to 'x11/Xaw-Xpm')
| -rw-r--r-- | x11/Xaw-Xpm/buildlink3.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk index 3e58ba2863f..d29c7c74341 100644 --- a/x11/Xaw-Xpm/buildlink3.mk +++ b/x11/Xaw-Xpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2012/06/15 23:06:02 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2013/01/15 16:21:35 morr Exp $ BUILDLINK_TREE+= Xaw-Xpm @@ -9,6 +9,8 @@ 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 +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d + .include "../../mk/bsd.fast.prefs.mk" .if ${X11_TYPE} == "modular" @@ -20,12 +22,6 @@ buildlink-Xaw-Xpm-inc-hack: .PHONY buildlink-directories ${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw .endif -LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ - -L${BUILDLINK_PREFIX.libXpm}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXpm}/lib \ - -lXaw3d -lXpm - .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .endif # XAW_XPM_BUILDLINK3_MK |