CVS commit: pkgsrc

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Sep  4 15:14:04 UTC 2019

Modified Files:
        pkgsrc/editors/emacs26: options.mk
        pkgsrc/x11/gtk2: buildlink3.mk

Log Message:
Reduce per-package inclusion of x11/libXdamage

And graphics/MesaLib includes x11/libXdamage/buildlink3.mk
and remove it from editors/emacs26.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/editors/emacs26/options.mk
cvs rdiff -u -r1.73 -r1.74 pkgsrc/x11/gtk2/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/emacs26/options.mk
diff -u pkgsrc/editors/emacs26/options.mk:1.10 pkgsrc/editors/emacs26/options.mk:1.11
--- pkgsrc/editors/emacs26/options.mk:1.10      Wed Sep  4 14:00:20 2019
+++ pkgsrc/editors/emacs26/options.mk   Wed Sep  4 15:14:03 2019
@@ -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
 # 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)

Index: pkgsrc/x11/gtk2/buildlink3.mk
diff -u pkgsrc/x11/gtk2/buildlink3.mk:1.73 pkgsrc/x11/gtk2/buildlink3.mk:1.74
--- pkgsrc/x11/gtk2/buildlink3.mk:1.73  Sun Jul 21 22:24:16 2019
+++ pkgsrc/x11/gtk2/buildlink3.mk       Wed Sep  4 15:14:04 2019
@@ -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"