diff options
| author | mef <mef@pkgsrc.org> | 2018-07-15 15:21:28 +0000 |
|---|---|---|
| committer | mef <mef@pkgsrc.org> | 2018-07-15 15:21:28 +0000 |
| commit | 1cfac4b1b5e66f6cc0428cb726fda495eeb73ebd (patch) | |
| tree | 66aeff0527b7a58e2206ebebcbd8505c246be24e /editors | |
| parent | 164a5eebea3868566cccf0594f3012de9cf824d5 (diff) | |
| download | pkgsrc-1cfac4b1b5e66f6cc0428cb726fda495eeb73ebd.tar.gz | |
(Editors/emacs26) Default options adjustment, drop ImageMagick and set gtk3.
1. ImageMagick is listed as buildlink3, but configure stage says no.
Drop from the default options for now. (need py-wand and ImageMagick 6 ?)
2. gtk/gtk3 logic was not the same as emacs-25.x. Default was gtk2.
Now default is gtk3 (the same as emacs-25). Option gtk and gtk2
have the same effect now.
Thanks tsutsui@ for information
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs26/Makefile | 3 | ||||
| -rw-r--r-- | editors/emacs26/options.mk | 22 |
2 files changed, 14 insertions, 11 deletions
diff --git a/editors/emacs26/Makefile b/editors/emacs26/Makefile index 7d82f522285..9447292ee39 100644 --- a/editors/emacs26/Makefile +++ b/editors/emacs26/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2018/06/20 11:04:19 mef Exp $ +# $NetBSD: Makefile,v 1.2 2018/07/15 15:21:28 mef Exp $ CONFLICTS+= emacs26-nox11-[0-9]* +PKGREVISION= 1 .include "../../editors/emacs26/Makefile.common" diff --git a/editors/emacs26/options.mk b/editors/emacs26/options.mk index ff507d9a7dc..bbae619844d 100644 --- a/editors/emacs26/options.mk +++ b/editors/emacs26/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2018/07/03 11:24:08 mef Exp $ +# $NetBSD: options.mk,v 1.3 2018/07/15 15:21:28 mef Exp $ ### Set options PKG_OPTIONS_VAR= PKG_OPTIONS.emacs @@ -12,14 +12,15 @@ PKG_OPTIONS_GROUP.window-system= x11 nextstep PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit PKG_SUGGESTED_OPTIONS.Darwin= nextstep -# --with-x-toolkit=KIT use an X toolkit (KIT one of: yes or gtk, gtk2, +# --with-x-toolkit=KIT use an X toolkit (KIT one of: yes or gtk2, # gtk3, lucid or athena, motif, no) # gtk in next line implies gtk2, xaw = athena = lucid -PKG_OPTIONS_GROUP.toolkit= gtk motif xaw lucid +PKG_OPTIONS_GROUP.toolkit= gtk gtk2 gtk3 motif xaw lucid +# gtk2 and gtk has the same effect # gtk is default in the logic below (even not included in SUGGESTED_= # gconf, gtk and xft2 will be ignored for nextstep even shown as selected. -PKG_SUGGESTED_OPTIONS= dbus gconf gnutls imagemagick svg xaw3d xft2 xml x11 +PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 svg xaw3d xft2 xml x11 .include "../../mk/bsd.options.mk" @@ -80,10 +81,11 @@ CONFIGURE_ARGS+= --without-gconf . endif ### -### Support ImageMagick +### Support ImageMagick (not recognized for now, sorry) ### . if !empty(PKG_OPTIONS:Mimagemagick) .include "../../graphics/ImageMagick/buildlink3.mk" +# DEPENDS+= py[0-9]*-wand-[0-9]*:../../graphics/py-wand . else CONFIGURE_ARGS+= --without-imagemagick . endif @@ -112,14 +114,14 @@ CONFIGURE_ARGS+= --without-xft --without-libotf --without-m17n-flt ### Toolkit selection ### . if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) && empty(PKG_OPTIONS:Mmotif)) -# defaults to gtk +# defaults to gtk3 USE_TOOLS+= pkg-config -.include "../../x11/gtk2/buildlink3.mk" -CONFIGURE_ARGS+= --with-x-toolkit=gtk -. elif !empty(PKG_OPTIONS:Mgtk) +.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/gtk2/buildlink3.mk" -CONFIGURE_ARGS+= --with-x-toolkit=gtk +CONFIGURE_ARGS+= --with-x-toolkit=gtk2 . elif !empty(PKG_OPTIONS:Mxaw) .include "../../mk/xaw.buildlink3.mk" CONFIGURE_ARGS+= --with-x-toolkit=athena |