[pkgsrc/trunk]: pkgsrc/editors/emacs-snapshot PR pkg/54848 jansson option sho...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4345962886c0
branches:  trunk
changeset: 421099:4345962886c0
user:      mef <mef%pkgsrc.org@localhost>
date:      Sat Jan 11 11:43:04 2020 +0000

description:
PR pkg/54848 jansson option should not be related to (should not depend on) x11 option.
Thanks  dasricht%gmail.com@localhost for the report. (Now always enabled by the way)
So PKGREVISION++

diffstat:

 editors/emacs-snapshot/Makefile   |   3 ++-
 editors/emacs-snapshot/options.mk |  24 ++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diffs (70 lines):

diff -r 172e5e1d6505 -r 4345962886c0 editors/emacs-snapshot/Makefile
--- a/editors/emacs-snapshot/Makefile   Sat Jan 11 11:35:50 2020 +0000
+++ b/editors/emacs-snapshot/Makefile   Sat Jan 11 11:43:04 2020 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.93 2019/12/31 17:32:41 mef Exp $
+# $NetBSD: Makefile,v 1.94 2020/01/11 11:43:04 mef Exp $
 
 DISTNAME=      emacs-27.0.60_2019-12-29
 PKGVERSION=    27.0.60
 PKGNAME=       emacs27-${PKGVERSION}
+PKGREVISION=   1
 MASTER_SITES=  https://alpha.gnu.org/gnu/emacs/pretest/windows/emacs-27/
 CATEGORIES=    editors
 
diff -r 172e5e1d6505 -r 4345962886c0 editors/emacs-snapshot/options.mk
--- a/editors/emacs-snapshot/options.mk Sat Jan 11 11:35:50 2020 +0000
+++ b/editors/emacs-snapshot/options.mk Sat Jan 11 11:43:04 2020 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: options.mk,v 1.13 2019/12/18 12:38:48 mef Exp $
+# $NetBSD: options.mk,v 1.14 2020/01/11 11:43:04 mef Exp $
 
 ### Set options
 PKG_OPTIONS_VAR=                       PKG_OPTIONS.emacs
 PKG_SUPPORTED_OPTIONS=                 dbus gconf gnutls imagemagick jansson svg xaw3d xft2 xml
-PKG_SUGGESTED_OPTIONS=                 jansson
 # xaw3d is only valid with tookit = xaw
 
 PKG_OPTIONS_OPTIONAL_GROUPS+=          window-system
@@ -21,7 +20,7 @@
 # gtk3 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 gtk3 xaw3d xft2 xml x11
+PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 jansson xaw3d xft2 xml x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -92,15 +91,6 @@
 .  endif
 
 ###
-### Support jansson (JSON library)
-###
-.  if !empty(PKG_OPTIONS:Mjansson)
-.include "../../textproc/jansson/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=       --without-json
-.  endif
-
-###
 ### Support Xaw3d (This is only valid with Lucid Toolkit)
 ###
 .  if !empty(PKG_OPTIONS:Mxaw3d)
@@ -192,6 +182,16 @@
 
 .else  # no window system
 #.if empty(PKG_OPTIONS:Mx11)
+
+###
+### Support jansson (JSON library)
+###
+.  if !empty(PKG_OPTIONS:Mjansson)
+.include "../../textproc/jansson/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=       --without-json
+.  endif
+
 CONFIGURE_ARGS+=       --without-x
 CONFIGURE_ARGS+=       --without-xpm
 CONFIGURE_ARGS+=       --without-jpeg