diff options
| author | joerg <joerg> | 2006-12-27 13:37:35 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-12-27 13:37:35 +0000 |
| commit | 9d817a0670ab62446c7e477d722a0da1c8c7e489 (patch) | |
| tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /x11/xview-lib | |
| parent | 173784dbf29b9a9d5e49dcecae83fbc5794121e0 (diff) | |
| download | pkgsrc-9d817a0670ab62446c7e477d722a0da1c8c7e489.tar.gz | |
- fine grained X11 dependencies for packages which have either USE_IMAKE
or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or
via buildlink3.mks
- introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm
in the !modular case
- fix some cases where the check for libX11 couldn't work at all by using
C++ for compilation without including the proper headers
Verified using a full X11_TYPE=xorg bulk build without additional
breakage. Discussed with salo@, wiz@ and send to packages@ for feedback.
Diffstat (limited to 'x11/xview-lib')
| -rw-r--r-- | x11/xview-lib/Makefile | 3 | ||||
| -rw-r--r-- | x11/xview-lib/buildlink3.mk | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile index a2224e04ebd..c182965f502 100644 --- a/x11/xview-lib/Makefile +++ b/x11/xview-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/03/04 21:31:14 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2006/12/27 13:37:47 joerg Exp $ DISTNAME= xview3.2p1-X11R6 PKGNAME= xview-lib-3.2.1 @@ -21,4 +21,5 @@ post-install: cd ${PREFIX}/lib && ${LN} -fs libolgx.so.3.2 libolgx.so.3 && \ ${LN} -fs libxview.so.3.2 libxview.so.3 +.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xview-lib/buildlink3.mk b/x11/xview-lib/buildlink3.mk index 75d73622b5f..e1c6ebf2f7e 100644 --- a/x11/xview-lib/buildlink3.mk +++ b/x11/xview-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:17 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2006/12/27 13:37:47 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XVIEW_LIB_BUILDLINK3_MK:= ${XVIEW_LIB_BUILDLINK3_MK}+ @@ -17,4 +17,6 @@ BUILDLINK_ABI_DEPENDS.xview-lib?= xview-lib>=3.2.1nb6 BUILDLINK_PKGSRCDIR.xview-lib?= ../../x11/xview-lib .endif # XVIEW_LIB_BUILDLINK3_MK +.include "../../x11/libX11/buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |