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/rxvt | |
| 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/rxvt')
| -rw-r--r-- | x11/rxvt/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index d3da340d5e1..30d3f8f3952 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2006/12/15 20:33:05 joerg Exp $ +# $NetBSD: Makefile,v 1.51 2006/12/27 13:37:43 joerg Exp $ DISTNAME= rxvt-2.7.10 PKGREVISION= 5 @@ -38,8 +38,8 @@ CONFIGURE_ARGS+= --enable-utmp \ --enable-languages \ --with-encoding=noenc -CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include/X11 -CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib +CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include/X11 +CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib .include "../../mk/bsd.prefs.mk" @@ -66,4 +66,5 @@ pre-install: fi .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |