Fix comments.

Augment debug option arguments.

Explicitly select garbage collector.

Set dialogs and widgets to "athena" explicitly.
There are no "lucid" implementations; instead, configure will look for
Motif implementations, and fall back to Athena. The former is prone to
sneak in undeclared dependencies on Motif and (on sole platforms) xft.

Remove the patch that was supposed to fix this, but didn't.

5 files changed, 13 insertions, 29 deletions

diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index d76b13b4714..18cc5fb99e1 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2018/03/12 11:16:25 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2018/12/19 13:41:45 hauke Exp $
 
 PKGNAME=	${DISTNAME}
-PKGREVISION=	5
+PKGREVISION=	6
 COMMENT=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV}
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11
diff --git a/editors/xemacs-current/Makefile.common b/editors/xemacs-current/Makefile.common
index 81cfab93062..07290b85fbe 100644
--- a/editors/xemacs-current/Makefile.common
+++ b/editors/xemacs-current/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2018/02/01 14:25:30 hauke Exp $
+# $NetBSD: Makefile.common,v 1.11 2018/12/19 13:41:45 hauke Exp $
 #
 # used by editors/xemacs-current/Makefile
 # used by editors/xemacs-current-nox11/Makefile
@@ -21,7 +21,7 @@ PLIST_SRC=	${.CURDIR}/../../editors/xemacs-current/PLIST
 
 USE_TOOLS+=		makeinfo
 
-# The portable dumper --with-newgc creates a dump file with a build ID in its name
+# The portable dumper creates a dump file with a build ID in its name
 GENERATE_PLIST+=	${ECHO} bin/${EMACS_DISTNAME}-`${WRKSRC}/src/xemacs -sd`.dmp ;
 
 # Having the build path in the dumped emacs is not a problem.
@@ -46,6 +46,7 @@ CONFIGURE_ARGS+=	--without-msw
 CONFIGURE_ARGS+=	--with-pdump
 CONFIGURE_ARGS+=	--with-system-malloc
 CONFIGURE_ARGS+=	--with-newgc
+CONFIGURE_ARGS+=	--with-kkcc
 CFLAGS+=		-Dunix
 
 # Use terminfo on NetBSD-6 and newer.
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index 167a4d83c50..bf423a90237 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2018/03/15 06:08:21 wiz Exp $
+$NetBSD: distinfo,v 1.34 2018/12/19 13:41:45 hauke Exp $
 
 SHA1 (xemacs-21.5.34.tar.gz) = ed1fe3ff6ce6eeb9ff75ac0ee34c6530e1c355ce
 RMD160 (xemacs-21.5.34.tar.gz) = 2f6a5bc7fd72508722dded16ee7742db3e87ffaf
@@ -11,7 +11,6 @@ SHA1 (patch-lib-src_fakemail.c) = e62f75055b80f207696cfd77cd7b55fd46e8249b
 SHA1 (patch-lwlib_Makefile.in.in) = 8d243f1c85122429187b8250c18221dee8423ed0
 SHA1 (patch-modules_common_Makefile.common) = d62a23a05e72cc196557e2f7fbbccea791ee0101
 SHA1 (patch-src_Makefile.in.in) = 7a7ea5fe03b11e8690f44f4dbef17e793fbf50f2
-SHA1 (patch-src_console-xlike-inc.h) = 21922eac0858f161d6a6aa24b70eb84f5647a17d
 SHA1 (patch-src_dired.c) = d850495e567224dc7a43e1db74f4e305a906f177
 SHA1 (patch-src_lisp.h) = c5f3b5f920ec6d451a5d5c5d1e414d6ae3d6660f
 SHA1 (patch-src_unexelf.c) = 96b2cf1d2512ad23fca98db9b48c34533bba8b66
diff --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk
index c1a943c1d82..6334d29685e 100644
--- a/editors/xemacs-current/options.mk
+++ b/editors/xemacs-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2018/01/30 11:47:39 hauke Exp $
+# $NetBSD: options.mk,v 1.17 2018/12/19 13:41:45 hauke Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS+=		ldap canna debug
@@ -32,13 +32,14 @@ CONFIGURE_ARGS+=	--with-site-libraries=${PREFIX}/lib:${X11BASE}/lib
 CONFIGURE_ARGS+=	--with-site-runtime-libraries=${PREFIX}/lib:${X11BASE}/lib
 # Lucid widgets
 CONFIGURE_ARGS+=	--with-toolbars=yes
-CONFIGURE_ARGS+=	--with-menubars=yes
+CONFIGURE_ARGS+=	--with-menubars=lucid
 CONFIGURE_ARGS+=	--with-scrollbars=lucid
-CONFIGURE_ARGS+=	--with-dialogs=lucid
-CONFIGURE_ARGS+=	--with-widgets=lucid
+# Setting these to 'lucid' will sneak in Motif and Xft, so don't
+CONFIGURE_ARGS+=	--with-dialogs=athena
+CONFIGURE_ARGS+=	--with-widgets=athena
 CONFIGURE_ARGS+=	--with-athena=xaw
 CONFIGURE_ARGS+=	--with-xim=xlib
-# Explicitely exclude other toolkits
+# Explicitly exclude other toolkits
 CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--without-gnome
 .else
@@ -88,6 +89,7 @@ CONFIGURE_ARGS+=	--without-canna
 PLIST_VARS+=            debug
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug=yes --with-debug
+CONFIGURE_ARGS+=	--with-assertions --with-error-checking=all
 CFLAGS+=                -g3
 INSTALL_UNSTRIPPED=     yes
 .endif
diff --git a/editors/xemacs-current/patches/patch-src_console-xlike-inc.h b/editors/xemacs-current/patches/patch-src_console-xlike-inc.h
deleted file mode 100644
index 3059ad440f8..00000000000
--- a/editors/xemacs-current/patches/patch-src_console-xlike-inc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_console-xlike-inc.h,v 1.1 2018/01/30 11:47:39 hauke Exp $
-
-On some target platforms, Xm headers #define *_XFT_ symbols
-
---- src/console-xlike-inc.h.orig	2013-08-21 17:43:45.000000000 +0000
-+++ src/console-xlike-inc.h
-@@ -115,6 +115,11 @@ along with XEmacs.  If not, see <http://
- #define USE_XFT_MENUBARS
- #define USE_XFT_TABS
- #define USE_XFT_GAUGES
-+#else /* Xm headers might #define *_XFT */
-+#undef USE_XFT
-+#undef USE_XFT_MENUBARS
-+#undef USE_XFT_TABS
-+#undef USE_XFT_GAUGES
- #endif
- 
- /***************************************************************************/