diff options
| author | mef <mef@pkgsrc.org> | 2020-10-19 14:37:17 +0000 |
|---|---|---|
| committer | mef <mef@pkgsrc.org> | 2020-10-19 14:37:17 +0000 |
| commit | e1f08a278339346c6fee3db46bb114dc3162d65e (patch) | |
| tree | f597ad676c3149065a00f4895670b37e0bd9b83d /editors/emacs26 | |
| parent | 98f1003c552e462bca1238ab13cc115ee97ba354 (diff) | |
| download | pkgsrc-e1f08a278339346c6fee3db46bb114dc3162d65e.tar.gz | |
(editors/emacs26) Add imagemagick for default configuration
Diffstat (limited to 'editors/emacs26')
| -rw-r--r-- | editors/emacs26/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs26/options.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/editors/emacs26/Makefile b/editors/emacs26/Makefile index 11608bab9a4..71f8bc3cd66 100644 --- a/editors/emacs26/Makefile +++ b/editors/emacs26/Makefile @@ -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 --git a/editors/emacs26/options.mk b/editors/emacs26/options.mk index 376a519198a..600d4c85d32 100644 --- a/editors/emacs26/options.mk +++ b/editors/emacs26/options.mk @@ -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 gtk3 motif xaw lucid # 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 |