[pkgsrc/trunk]: pkgsrc/editors/emacs26 (editors/emacs26) Add imagemagick for ...

[mef <mef%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/504da158ac5c
branches:  trunk
changeset: 440800:504da158ac5c
user:      mef <mef%pkgsrc.org@localhost>
date:      Mon Oct 19 14:37:17 2020 +0000

description:
(editors/emacs26) Add imagemagick for default configuration

diffstat:

 editors/emacs26/Makefile   |  4 ++--
 editors/emacs26/options.mk |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 94824c5c3d6c -r 504da158ac5c editors/emacs26/Makefile
--- a/editors/emacs26/Makefile  Mon Oct 19 14:37:07 2020 +0000
+++ b/editors/emacs26/Makefile  Mon Oct 19 14:37:17 2020 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2020/08/17 20:18:32 leot Exp $
+# $NetBSD: Makefile,v 1.23 2020/10/19 14:37:17 mef Exp $
 
 CONFLICTS+=    emacs26-nox11-[0-9]*
 
 .include "../../editors/emacs26/Makefile.common"
 
-PKGREVISION=   9
+PKGREVISION=   10
 
 .include "options.mk"
 
diff -r 94824c5c3d6c -r 504da158ac5c editors/emacs26/options.mk
--- a/editors/emacs26/options.mk        Mon Oct 19 14:37:07 2020 +0000
+++ b/editors/emacs26/options.mk        Mon Oct 19 14:37:17 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2019/09/05 13:04:55 ryoon Exp $
+# $NetBSD: options.mk,v 1.13 2020/10/19 14:37:17 mef Exp $
 
 ### Set options
 PKG_OPTIONS_VAR=                       PKG_OPTIONS.emacs
@@ -22,7 +22,7 @@
 
 # svg is omitted because it is rarely needed and either very
 # heavyweight or unmaintained.
-PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 xaw3d xft2 xml x11
+PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 xaw3d xft2 xml x11 imagemagick
 
 .include "../../mk/bsd.options.mk"
 
@@ -93,7 +93,7 @@
 ### Support ImageMagick (not recognized for now, sorry)
 ###
 .  if !empty(PKG_OPTIONS:Mimagemagick)
-.include "../../graphics/ImageMagick/buildlink3.mk"
+.include "../../graphics/ImageMagick6/buildlink3.mk"
 # DEPENDS+=    py[0-9]*-wand-[0-9]*:../../graphics/py-wand
 .  else
 CONFIGURE_ARGS+=       --without-imagemagick