diff options
| author | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
| commit | d26cf36e5784f5b648404b8d68c21adb4398f33f (patch) | |
| tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /multimedia | |
| parent | 6432f76116c5a27e6f554145314e47d93eeec7a9 (diff) | |
| download | pkgsrc-d26cf36e5784f5b648404b8d68c21adb4398f33f.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 'multimedia')
| -rw-r--r-- | multimedia/mpeg_play/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/xanim/Makefile | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile index 1f22217c06c..dfa1e26ce97 100644 --- a/multimedia/mpeg_play/Makefile +++ b/multimedia/mpeg_play/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/10/04 21:50:09 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2006/12/27 13:37:39 joerg Exp $ DISTNAME= mpeg_play-2.4-patched PKGNAME= mpeg_play-2.4patched @@ -18,4 +18,6 @@ pre-configure: ${MV} -f ${WRKSRC}/Imakefile.proto ${WRKSRC}/Imakefile ${MV} -f ${WRKSRC}/mpeg_play.1 ${WRKSRC}/mpeg_play.man +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile index 02ac8fd0203..79ffa1d249d 100644 --- a/multimedia/xanim/Makefile +++ b/multimedia/xanim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/12/23 10:35:56 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:39 joerg Exp $ DISTNAME= xanim2920 PKGNAME= xanim-2.92.0 @@ -52,5 +52,8 @@ post-extract: .endif .include "../../devel/zlib/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |