diff options
author | ryoon <ryoon@pkgsrc.org> | 2019-09-04 15:14:03 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2019-09-04 15:14:03 +0000 |
commit | 521db81b7936fd5f72d42379a92bdd998e2439bc (patch) | |
tree | 092f0cb5502a678b4f6d7a1d5fab3bfbb129f69a | |
parent | b9835b81b9a20e5e684b4467a3dce28665528c9a (diff) | |
download | pkgsrc-521db81b7936fd5f72d42379a92bdd998e2439bc.tar.gz |
Reduce per-package inclusion of x11/libXdamage
And graphics/MesaLib includes x11/libXdamage/buildlink3.mk
and remove it from editors/emacs26.
-rw-r--r-- | editors/emacs26/options.mk | 4 | ||||
-rw-r--r-- | x11/gtk2/buildlink3.mk | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/editors/emacs26/options.mk b/editors/emacs26/options.mk index ba7e633e383..6fc2394db4a 100644 --- a/editors/emacs26/options.mk +++ b/editors/emacs26/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2019/09/04 14:00:20 ryoon Exp $ +# $NetBSD: options.mk,v 1.11 2019/09/04 15:14:03 ryoon Exp $ ### Set options PKG_OPTIONS_VAR= PKG_OPTIONS.emacs @@ -128,12 +128,10 @@ CONFIGURE_ARGS+= --without-xft --without-libotf --without-m17n-flt # defaults to gtk3 USE_TOOLS+= pkg-config .include "../../graphics/MesaLib/buildlink3.mk" -.include "../../x11/libXdamage/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" CONFIGURE_ARGS+= --with-x-toolkit=gtk3 . elif !empty(PKG_OPTIONS:Mgtk2) || !empty(PKG_OPTIONS:Mgtk) USE_TOOLS+= pkg-config -.include "../../x11/libXdamage/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" CONFIGURE_ARGS+= --with-x-toolkit=gtk2 . elif !empty(PKG_OPTIONS:Mxaw) diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk index f23c954e167..00365a18ff4 100644 --- a/x11/gtk2/buildlink3.mk +++ b/x11/gtk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.73 2019/07/21 22:24:16 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.74 2019/09/04 15:14:04 ryoon Exp $ BUILDLINK_TREE+= gtk2 @@ -24,6 +24,7 @@ pkgbase := gtk2 .include "../../graphics/gdk-pixbuf2/buildlink3.mk" .if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11) .include "../../x11/libXcursor/buildlink3.mk" +.include "../../x11/libXdamage/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" |