emacs-git: update for latest upstream changes

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

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Thu Jan 31 15:47:55 2019 +0100
Changeset:	46b173d1c036ed8bc9a0c6177d389bc51fdb49bc

Modified Files:
	emacs-git/Makefile
	emacs-git/PLIST
	emacs-git/options.mk

Log Message:
emacs-git: update for latest upstream changes

Add new dump file to CHECK_WRKREF_SKIP.
Copy over latest options.mk file from emacs26.

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

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

diffstat:
 emacs-git/Makefile   |  1 +
 emacs-git/PLIST      |  9 +-------
 emacs-git/options.mk | 58 ++++++++++++++++++++++++++++------------------------
 3 files changed, 33 insertions(+), 35 deletions(-)

diffs:
diff --git a/emacs-git/Makefile b/emacs-git/Makefile
index 2691d8fa8a..afdee4a1d8 100644
--- a/emacs-git/Makefile
+++ b/emacs-git/Makefile
@@ -46,6 +46,7 @@ CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores \
 # build PATH in the dumped emacs is not a problem
 CHECK_WRKREF_SKIP+=	bin/emacs
 CHECK_WRKREF_SKIP+=	bin/emacs-${PKGVERSION_NOREV}
+CHECK_WRKREF_SKIP+=	libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/emacs.pdmp
 
 PRINT_PLIST_AWK+=	{ gsub(/${PKGVERSION_NOREV}/, "$${PKGVERSION}"); \
 			gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); \
diff --git a/emacs-git/PLIST b/emacs-git/PLIST
index 750ed9f5e5..79cecb4dc6 100644
--- a/emacs-git/PLIST
+++ b/emacs-git/PLIST
@@ -69,6 +69,7 @@ info/widget.info.gz
 info/wisent.info.gz
 info/woman.info.gz
 lib/systemd/user/emacs.service
+libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/emacs.pdmp
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/hexl
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/movemail
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/profile
@@ -81,7 +82,6 @@ man/man1/etags.1
 share/applications/emacs.desktop
 share/emacs/${PKGVERSION}/etc/AUTHORS
 share/emacs/${PKGVERSION}/etc/CALC-NEWS
-share/emacs/${PKGVERSION}/etc/CENSORSHIP
 share/emacs/${PKGVERSION}/etc/COPYING
 share/emacs/${PKGVERSION}/etc/DEBUG
 share/emacs/${PKGVERSION}/etc/DEVEL.HUMOR
@@ -90,16 +90,12 @@ share/emacs/${PKGVERSION}/etc/DOC
 share/emacs/${PKGVERSION}/etc/ERC-NEWS
 share/emacs/${PKGVERSION}/etc/ETAGS.EBNF
 share/emacs/${PKGVERSION}/etc/ETAGS.README
-share/emacs/${PKGVERSION}/etc/FTP
-share/emacs/${PKGVERSION}/etc/GNU
 share/emacs/${PKGVERSION}/etc/GNUS-NEWS
 share/emacs/${PKGVERSION}/etc/HELLO
 share/emacs/${PKGVERSION}/etc/HISTORY
 share/emacs/${PKGVERSION}/etc/JOKES
-share/emacs/${PKGVERSION}/etc/LINUX-GNU
 share/emacs/${PKGVERSION}/etc/MACHINES
 share/emacs/${PKGVERSION}/etc/MH-E-NEWS
-share/emacs/${PKGVERSION}/etc/MORE.STUFF
 share/emacs/${PKGVERSION}/etc/NEWS
 share/emacs/${PKGVERSION}/etc/NEWS.1-17
 share/emacs/${PKGVERSION}/etc/NEWS.18
@@ -113,14 +109,11 @@ share/emacs/${PKGVERSION}/etc/NEWS.25
 share/emacs/${PKGVERSION}/etc/NEWS.26
 share/emacs/${PKGVERSION}/etc/NEXTSTEP
 share/emacs/${PKGVERSION}/etc/NXML-NEWS
-share/emacs/${PKGVERSION}/etc/ORDERS
 share/emacs/${PKGVERSION}/etc/ORG-NEWS
 share/emacs/${PKGVERSION}/etc/PROBLEMS
 share/emacs/${PKGVERSION}/etc/README
 share/emacs/${PKGVERSION}/etc/TERMS
-share/emacs/${PKGVERSION}/etc/THE-GNU-PROJECT
 share/emacs/${PKGVERSION}/etc/TODO
-share/emacs/${PKGVERSION}/etc/WHY-FREE
 share/emacs/${PKGVERSION}/etc/charsets/8859-10.map
 share/emacs/${PKGVERSION}/etc/charsets/8859-11.map
 share/emacs/${PKGVERSION}/etc/charsets/8859-13.map
diff --git a/emacs-git/options.mk b/emacs-git/options.mk
index fbfbc096d5..bbae619844 100644
--- a/emacs-git/options.mk
+++ b/emacs-git/options.mk
@@ -1,24 +1,26 @@
-# $NetBSD: options.mk,v 1.35 2015/04/24 01:23:24 makoto Exp $
-#
+# $NetBSD: options.mk,v 1.3 2018/07/15 15:21:28 mef Exp $
 
 ### Set options
-PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs_current
-PKG_SUPPORTED_OPTIONS=	dbus gconf gnutls imagemagick svg xaw3d xft2 xml
+PKG_OPTIONS_VAR=			PKG_OPTIONS.emacs
+PKG_SUPPORTED_OPTIONS=			dbus gconf gnutls imagemagick svg xaw3d xft2 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
-#  --with-x-toolkit=KIT    use an X toolkit (KIT one of: yes or gtk, gtk2,
+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)
 # 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 ingnored for nextstep even shown as selected.
+# 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"
 
@@ -27,7 +29,7 @@ PKG_SUGGESTED_OPTIONS=	dbus gconf gnutls imagemagick svg xaw3d xft2 xml x11
 ### Support D-BUS
 ###
 .if !empty(PKG_OPTIONS:Mdbus)
-.include "../../sysutils/dbus/buildlink3.mk"
+.  include "../../sysutils/dbus/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-dbus
 .endif
@@ -36,11 +38,11 @@ CONFIGURE_ARGS+=	--without-dbus
 ### Support XML2
 ###
 .if !empty(PKG_OPTIONS:Mxml)
-USE_TOOLS+=             pkg-config
+USE_TOOLS+=		pkg-config
 BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.17
 .include "../../textproc/libxml2/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=        --without-xml2
+CONFIGURE_ARGS+=	--without-xml2
 .endif
 
 ###
@@ -48,19 +50,11 @@ CONFIGURE_ARGS+=        --without-xml2
 ###
 .if !empty(PKG_OPTIONS:Mgnutls)
 .include "../../security/gnutls/buildlink3.mk"
+.include "../../security/p11-kit/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-gnutls
 .endif
 
-###
-### Support ImageMagick
-###
-.if !empty(PKG_OPTIONS:Mimagemagick)
-.include "../../graphics/ImageMagick/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-imagemagick
-.endif
-
 ###
 ### Check non nextstep (implies x11) options  ---------------------
 ###
@@ -86,6 +80,16 @@ CONFIGURE_ARGS+=	--without-rsvg
 CONFIGURE_ARGS+=	--without-gconf
 .  endif
 
+###
+### 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
+
 ###
 ### Support Xaw3d (This is only valid with Lucid Toolkit)
 ###
@@ -110,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
@@ -190,7 +194,7 @@ CONFIGURE_ARGS+=	--without-png
 # End:
 
 ### How To Test (or the possible combinations) -- watch the result of 'make configure'
-# Set PKG_OPTIONS.emacs_current=	result
+# Set PKG_OPTIONS.emacs=	result
 # ----------		----------------------------------------------------------
 # (none)		.. x11 gtk    svg gconf       xft2 dbus gnutls imagemagick