diff options
| author | joerg <joerg> | 2006-12-27 13:37:35 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-12-27 13:37:35 +0000 |
| commit | b28533fe59c3ed8a07d089eec0ddb72591404098 (patch) | |
| tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /emulators | |
| parent | bf64c938460d5b59db13b14b1c0631ed2167b7e6 (diff) | |
| download | pkgsrc-b28533fe59c3ed8a07d089eec0ddb72591404098.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 'emulators')
| -rw-r--r-- | emulators/spim/Makefile | 5 | ||||
| -rw-r--r-- | emulators/vice/Makefile | 4 | ||||
| -rw-r--r-- | emulators/x48/Makefile | 4 | ||||
| -rw-r--r-- | emulators/xcopilot/Makefile | 5 |
4 files changed, 14 insertions, 4 deletions
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile index f75a62e6f5e..93c2b1da48c 100644 --- a/emulators/spim/Makefile +++ b/emulators/spim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/04/24 22:22:55 markd Exp $ +# $NetBSD: Makefile,v 1.32 2006/12/27 13:37:36 joerg Exp $ DISTNAME= spim-7.1 PKGREVISION= 3 @@ -43,4 +43,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Documentation/cycle.ps \ ${PREFIX}/share/doc/spim +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 9993cf6b52b..69c3e055d94 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2006/12/15 20:32:55 joerg Exp $ +# $NetBSD: Makefile,v 1.71 2006/12/27 13:37:36 joerg Exp $ # DISTNAME= vice-1.19 @@ -57,6 +57,8 @@ post-patch: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile index 6a2f31a99a0..b885ab9d177 100644 --- a/emulators/x48/Makefile +++ b/emulators/x48/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:37 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:36 joerg Exp $ # DISTNAME= x48_041 @@ -25,4 +25,6 @@ post-install: ${INSTALL_DATA} ROMDump ROMDump.s \ ${PREFIX}/share/doc/x48/romdump +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/xcopilot/Makefile b/emulators/xcopilot/Makefile index 0072454bb15..99a1c404b80 100644 --- a/emulators/xcopilot/Makefile +++ b/emulators/xcopilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:55 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:36 joerg Exp $ # DISTNAME= xcopilot-0.6.6 @@ -17,5 +17,8 @@ GNU_CONFIGURE= YES post-extract: ${RM} -f ${WRKSRC}/mc68k/custom.c +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |