emacs-git: match emacs27 more closely

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Sun Jun 13 22:29:04 2021 +0200
Changeset:	7e58dab01039fb3199515f5315a61bc015553999

Modified Files:
	emacs-git/DESCR
	emacs-git/options.mk

Log Message:
emacs-git: match emacs27 more closely

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7e58dab01039fb3199515f5315a61bc015553999

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 emacs-git/DESCR      |  29 ++++++++------
 emacs-git/options.mk | 105 +++++++++++++++------------------------------------
 2 files changed, 49 insertions(+), 85 deletions(-)

diffs:
diff --git a/emacs-git/DESCR b/emacs-git/DESCR
index 5856e3ec2a..8cc72c10b9 100644
--- a/emacs-git/DESCR
+++ b/emacs-git/DESCR
@@ -1,13 +1,20 @@
-GNU Emacs is a self-documenting, customizable, extensible real-time
-display editor.
+GNU Emacs is an extensible, customizable editor textand more.  At its
+core is an interpreter for Emacs Lisp, a dialect of the Lisp
+programming language with extensions to support text editing.  The
+features of GNU Emacs include:
 
-Users new to Emacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-Emacs also has an extensive interactive manual browser.  It is easily
-extensible since its editing commands are written in Lisp.
+- Content-sensitive editing modes, including syntax coloring, for a
+  wide variety of file types including plain text, source code, and
+  HTML.
+- Complete built-in documentation, including a tutorial for new users.
+- Support for many languages and their scripts, including all scripts,
+  Russian, Greek, Japanese, Chinese, Korean, Thai, Vietnamese, Lao,
+  Ethiopian, and some Indian scripts.
+- Highly customizable, using Emacs Lisp code or a graphical
+  customization interface.
+- A large number of extensions that add other functionality, including
+  a project planner, mail and news reader, debugger interface,
+  calendar, and more.  Many of these extensions are distributed with
+  GNU Emacs; others are available separately.
 
-GNU Emacs's many special packages handle mail reading (RMail) and
-sending (Mail), outline editing (Outline), compiling (Compile),
-running subshells within Emacs windows (Shell), running a Lisp
-read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
-(Doctor :-) and many more.
+This package contains the current Emacs development version from git.
diff --git a/emacs-git/options.mk b/emacs-git/options.mk
index 813b0615c2..09d331d749 100644
--- a/emacs-git/options.mk
+++ b/emacs-git/options.mk
@@ -2,26 +2,27 @@
 
 ### Set options
 PKG_OPTIONS_VAR=			PKG_OPTIONS.emacs
-PKG_SUPPORTED_OPTIONS=			dbus gconf gnutls imagemagick jansson svg xaw3d xft2 xml
-PKG_SUGGESTED_OPTIONS=			jansson
+PKG_SUPPORTED_OPTIONS=			dbus gnutls imagemagick jansson svg xaw3d xml
 # xaw3d is only valid with tookit = xaw
 
 PKG_OPTIONS_OPTIONAL_GROUPS+=		window-system
 PKG_OPTIONS_GROUP.window-system=	x11 nextstep
 
-# tempted to have 'nox11' :-)
 
 PKG_OPTIONS_OPTIONAL_GROUPS+=		toolkit
 PKG_SUGGESTED_OPTIONS.Darwin=		nextstep
-#  --with-x-toolkit=KIT    use an X toolkit (KIT one of: yes or  gtk2,
-#                          gtk3, lucid or athena, motif, no)
+#  --with-x-toolkit=KIT    use an X toolkit (KIT one of: yes or gtk2,
+#                          gtk3, xaw or lucid or athena, motif, no)
 # gtk in next line implies gtk2, xaw = athena = lucid
-PKG_OPTIONS_GROUP.toolkit=		gtk gtk2 gtk3 motif xaw lucid
+PKG_OPTIONS_GROUP.toolkit=		gtk gtk2 gtk3 motif xaw
 # gtk2 and gtk has the same effect
-# 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.
+# gtk3 is default in the logic below (even not included in SUGGESTED_=)
+# gtk* will be ignored for nextstep even shown as selected.
 
-PKG_SUGGESTED_OPTIONS=	dbus gconf gnutls gtk3 xaw3d xft2 xml x11
+# imagemagick is disabled because of stability/security
+# svg is omitted because it is rarely needed and heavyweight due to the rust dependency
+# xaw3d is omitted because it is only valid with xaw
+PKG_SUGGESTED_OPTIONS=	dbus gnutls gtk3 jansson xml x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -35,6 +36,15 @@ PKG_SUGGESTED_OPTIONS=	dbus gconf gnutls gtk3 xaw3d xft2 xml x11
 CONFIGURE_ARGS+=	--without-dbus
 .endif
 
+###
+### Support JSON
+###
+.if !empty(PKG_OPTIONS:Mjansson)
+.  include "../../textproc/jansson/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-json
+.endif
+
 ###
 ### Support XML2
 ###
@@ -57,12 +67,18 @@ CONFIGURE_ARGS+=	--without-gnutls
 .endif
 
 ###
-### Check non nextstep (implies x11) options  ---------------------
+### Check non nextstep (implies x11) options
 ###
 ### x11 is selected (as SUGGESTED above)
 ###
 .if !empty(PKG_OPTIONS:Mx11)
 ###
+### on OSX the configure script will select the "nextstep" window system
+### unless you explicitly tell it not to.  this should not impact other
+### platforms.
+###
+CONFIGURE_ARGS+=	--without-ns
+###
 ### Support SVG
 ###
 .  if !empty(PKG_OPTIONS:Msvg)
@@ -72,15 +88,6 @@ CONFIGURE_ARGS+=	--without-gnutls
 CONFIGURE_ARGS+=	--without-rsvg
 .  endif
 
-###
-### Support gconf
-###
-.  if !empty(PKG_OPTIONS:Mgconf)
-.include "../../devel/gconfmm/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--without-gconf
-.  endif
-
 ###
 ### Support ImageMagick (not recognized for now, sorry)
 ###
@@ -91,15 +98,6 @@ CONFIGURE_ARGS+=	--without-gconf
 CONFIGURE_ARGS+=	--without-imagemagick
 .  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)
 ###
@@ -108,23 +106,13 @@ CONFIGURE_ARGS+=	--without-json
 .  else
 CONFIGURE_ARGS+=	--without-xaw3d
 .  endif
-### Enable font backend
-###
-.  if !empty(PKG_OPTIONS:Mxft2)
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/libotf/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../devel/m17n-lib/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=	--without-xft --without-libotf --without-m17n-flt
-.  endif
 
 ###
 ### Toolkit selection
 ###
-.  if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) && \
-       empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mgtk2) && \
+.  if (empty(PKG_OPTIONS:Mxaw) && \
+       empty(PKG_OPTIONS:Mgtk) && \
+       empty(PKG_OPTIONS:Mgtk2) && \
        empty(PKG_OPTIONS:Mmotif))
 # defaults to gtk3
 USE_TOOLS+=		pkg-config
@@ -137,16 +125,13 @@ CONFIGURE_ARGS+=	--with-x-toolkit=gtk2
 .  elif !empty(PKG_OPTIONS:Mxaw)
 .include "../../mk/xaw.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-x-toolkit=athena
-.  elif !empty(PKG_OPTIONS:Mlucid)
-.include "../../mk/xaw.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-x-toolkit=athena
 .  elif !empty(PKG_OPTIONS:Mmotif)
 .include "../../mk/motif.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-x-toolkit=motif
 .  endif
 
 ###
-### End of Check non nextstep (implies x11) options  ---------------------
+### End of Check non nextstep (implies x11) options
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
@@ -167,14 +152,13 @@ CONFIGURE_ARGS+=	--with-x-toolkit=motif
 .elif !empty(PKG_OPTIONS:Mnextstep)
 .  if exists(/System/Library/Frameworks/Cocoa.framework)
 APPLICATIONS_DIR=	Applications
-NS_APPBINDIR=		nextstep/Emacs.app/Contents/MacOS
 PLIST_SRC+=		PLIST.cocoa
 CHECK_WRKREF_SKIP+=	Applications/Emacs.app/Contents/MacOS/Emacs
+CHECK_WRKREF_SKIP+=	Applications/Emacs.app/Contents/MacOS/Emacs.pdmp
 .  else
 .include "../../x11/gnustep-gui/buildlink3.mk"
 MAKE_FILE=		Makefile
 APPLICATIONS_DIR=	share/GNUstep/Local/Applications
-NS_APPBINDIR=		nextstep/Emacs.app
 PLIST_SRC+=		PLIST.gnustep
 CHECK_WRKREF_SKIP+=	share/GNUstep/Local/Applications/Emacs.app/Emacs
 .  endif
@@ -191,7 +175,6 @@ post-install:
 		pax -rw -pp -pm Emacs.app ${DESTDIR}${PREFIX}/${APPLICATIONS_DIR}
 
 .else  # no window system
-#.if empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--without-xpm
 CONFIGURE_ARGS+=	--without-jpeg
@@ -205,29 +188,3 @@ CONFIGURE_ARGS+=	--without-png
 # outline-regexp: "\\(.[ \t]*\\(if\\|endif\\|else\\|elif\\|include.*options\\|PKG_SUGGES\\)\\)\\|### .\\|# Local"
 # End:
 
-### How To Test (or the possible combinations) -- watch the result of 'make configure'
-# Set PKG_OPTIONS.emacs=	result
-# ----------		----------------------------------------------------------
-# (none)		.. x11 gtk    svg gconf       xft2 dbus gnutls imagemagick
-
-#  xaw			.. x11 lucid  svg gconf xaw3d xft2 dbus gnutls imagemagick
-#  lucid		.. x11 lucid  svg gconf xaw3d xft2 dbus gnutls imagemagick
-#  motif		.. x11 motif  svg gconf       xft2 dbus gnutls imagemagick
-
-# -x11 nextstep		.. nextstep
-# -xft2			.. x11 gtk    svg gconf		   dbus gnutls imagemagick
-# -gnutls		.. x11 gtk    svg gconf       xft2 dbus	       imagemagick
-# -gnutls -imagemagick -dbus
-#                       .. x11 gtk    svg gconf       xft2
-# -x11 -svg -gconf -xaw3d -xft2
-#                       .. nox11	                   dbus gnutls             xml2
-# -x11 			.. nox11			   dbus gnutls imagemagick
-#			.. nox11 but several x11 libraries built and not used
-
-### Window system options and result matrix
-#        x11 | YES  none     NO
-#   nextstep |
-#   -------- +----- -------- -------
-#        YES | --   NextStep NextStep
-#       none | X11  X11      (no Window)
-#         NO | X11  X11      (no Window)