CVS commit: pkgsrc/editors/emacs26

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Mon Oct 19 14:37:17 UTC 2020

Modified Files:
        pkgsrc/editors/emacs26: Makefile options.mk

Log Message:
(editors/emacs26) Add imagemagick for default configuration


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/editors/emacs26/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/editors/emacs26/options.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/Makefile
diff -u pkgsrc/editors/emacs26/Makefile:1.22 pkgsrc/editors/emacs26/Makefile:1.23
--- pkgsrc/editors/emacs26/Makefile:1.22        Mon Aug 17 20:18:32 2020
+++ pkgsrc/editors/emacs26/Makefile     Mon Oct 19 14:37:17 2020
@@ -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"
 

Index: pkgsrc/editors/emacs26/options.mk
diff -u pkgsrc/editors/emacs26/options.mk:1.12 pkgsrc/editors/emacs26/options.mk:1.13
--- pkgsrc/editors/emacs26/options.mk:1.12      Thu Sep  5 13:04:55 2019
+++ pkgsrc/editors/emacs26/options.mk   Mon Oct 19 14:37:17 2020
@@ -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 @@ PKG_OPTIONS_GROUP.toolkit=            gtk gtk2 gtk
 
 # 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 @@ CONFIGURE_ARGS+=      --without-gconf
 ### 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