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 /graphics/xpaint/Makefile | |
| 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 'graphics/xpaint/Makefile')
| -rw-r--r-- | graphics/xpaint/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index a6926649723..9d0f963c9bd 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: Makefile,v 1.57 2006/12/27 13:37:38 joerg Exp $ DISTNAME= xpaint-2.7.8.1 PKGREVISION= 2 @@ -20,7 +20,7 @@ SUBST_FILES.foo= Local.config configure SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g" \ -e "s|@PREFIX@|${PREFIX}|g" \ -e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g" \ - -e "s|@XPMDIR@|${BUILDLINK_PREFIX.xpm}|g" + -e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g" pre-configure: cd ${WRKSRC} && ./configure xaw3dg |