Fix options framework abuse by xemacs-current*.

Partially tested, xemacs-current-nox11 build hangs because of temacs
eating 99% CPU.

4 files changed, 180 insertions, 169 deletions

diff --git a/editors/xemacs-current-nox11/Makefile b/editors/xemacs-current-nox11/Makefile
index 7fee054aa83..495ecafacb8 100644
--- a/editors/xemacs-current-nox11/Makefile
+++ b/editors/xemacs-current-nox11/Makefile
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2012/10/03 11:43:47 asau Exp $
+# $NetBSD: Makefile,v 1.4 2016/12/30 23:09:41 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-nox11-/}
+COMMENT=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV} (no X11 support)
+PKGREVISION=	23
 
-FILESDIR=	${.CURDIR}/../../editors/xemacs-current/files
-PATCHDIR=	${.CURDIR}/../../editors/xemacs-current/patches
-PKGDIR=		${.CURDIR}/../../editors/xemacs-current
+CONFIGURE_ARGS+=	--without-x
+CONFIGURE_ARGS+=	--without-jpeg
+CONFIGURE_ARGS+=	--without-png
+CONFIGURE_ARGS+=	--without-tiff
+CONFIGURE_ARGS+=	--without-xpm
+CONFIGURE_ARGS+=	--with-site-prefixes=${PREFIX}
+CONFIGURE_ARGS+=	--with-site-runtime-libraries=${PREFIX}/lib
 
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS.xemacs+=	-x11 -xft -gtk -lucid -motif
-
-.include "../../editors/xemacs-current/Makefile"
+.include "../../editors/xemacs-current/options.mk"
+.include "../../editors/xemacs-current/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index a8c832040b1..f4538650b52 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,92 +1,98 @@
-# $NetBSD: Makefile,v 1.89 2016/03/05 11:28:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.90 2016/12/30 23:09:41 wiz Exp $
 
-PKGNAME?=	${DISTNAME}
-COMMENT?=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV}
-
-DISTNAME=	xemacs-21.5.27
-EMACSVERSION=	21.5-b27
-EMACS_DISTNAME=	xemacs-${EMACSVERSION}
+PKGNAME=	${DISTNAME}
 PKGREVISION=	23
-CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.xemacs.org/
-
-CONFLICTS+=	gnuclient-[0-9]*
-CONFLICTS+=	xemacs-[0-9]*
-CONFLICTS+=	xemacs-nox11-[0-9]*
+COMMENT=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV}
 
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=		2.95.3
-.endif
+# extra options for x11 support, not for sharing with xemacs-current-nox11
 
-PLIST_SUBST+=		DISTNAME=${EMACS_DISTNAME}
-FILES_SUBST+=		DISTNAME=${EMACS_DISTNAME}
-MESSAGE_SUBST+=		DISTNAME=${EMACS_DISTNAME}
-INFO_FILES=	yes
+PKG_SUPPORTED_OPTIONS+=		x11 xft
+PKG_OPTIONS_OPTIONAL_GROUPS=	toolkit
+PKG_OPTIONS_GROUP.toolkit=	gtk lucid motif
+PKG_SUGGESTED_OPTIONS+=		x11
 
 .include "options.mk"
 
-# The XEmacs configure script does something silly to the value of mandir
-# passed to the configure script to point it to where the man1 pages go.
-# Point it there directly.
-#
-GNU_CONFIGURE_MANDIR=	${PREFIX:Q}/${PKGMANDIR}/man1
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-clash-detection
-CONFIGURE_ARGS+=	--with-mule
-CONFIGURE_ARGS+=	--with-zlib
-CONFIGURE_ARGS+=	--without-msw
-CONFIGURE_ARGS+=	--with-pdump
-CFLAGS+=		-Dunix
+###
+### Any of the "toolkit" options or "xft" implies "x11".
+###
+.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mlucid) || \
+    !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxft)
+.  if empty(PKG_OPTIONS:Mx11)
+PKG_OPTIONS+=		x11
+.  endif
+.endif
 
-# Newer gcc has big trouble with aliasing.  This should be fixed in the
-# source, but until then, use the big hammer here.
-#
-CFLAGS+=		-fno-strict-aliasing
+###
+### Default to using the Lucid X11 toolkit if none is specified.
+###
+.if !empty(PKG_OPTIONS:Mx11)
+.  if empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mlucid) && \
+      empty(PKG_OPTIONS:Mmotif)
+PKG_OPTIONS+=		lucid
+.  endif
+.endif
 
-.if ${X11_TYPE} != "modular"
-INFOPATH=		${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
+###
+### Support drawing pretty X11 widgets.
+###
+.if !empty(PKG_OPTIONS:Mx11)
+.  include "../../mk/jpeg.buildlink3.mk"
+.  include "../../graphics/png/buildlink3.mk"
+.  include "../../graphics/tiff/buildlink3.mk"
+.  include "../../x11/xbitmaps/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-x
+.  if ${X11_TYPE} != "modular"
+CONFIGURE_ARGS+=	--with-site-prefixes=${PREFIX}:${X11BASE}
+CONFIGURE_ARGS+=	--with-site-runtime-libraries=${PREFIX}/lib:${X11BASE}/lib
+.  else
+CONFIGURE_ARGS+=	--with-site-prefixes=${PREFIX}
+CONFIGURE_ARGS+=	--with-site-runtime-libraries=${PREFIX}/lib
+.  endif
 .else
-INFOPATH=		${PREFIX}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
+CONFIGURE_ARGS+=	--without-x
+CONFIGURE_ARGS+=	--without-jpeg
+CONFIGURE_ARGS+=	--without-png
+CONFIGURE_ARGS+=	--without-tiff
+CONFIGURE_ARGS+=	--without-xpm
+CONFIGURE_ARGS+=	--with-site-prefixes=${PREFIX}
+CONFIGURE_ARGS+=	--with-site-runtime-libraries=${PREFIX}/lib
 .endif
-CONFIGURE_ARGS+=	--with-infopath=${INFOPATH:Q}
 
-# Having the build path in the dumped emacs is not a problem.
-CHECK_WRKREF_SKIP+=	bin/xemacs
-CHECK_WRKREF_SKIP+=	bin/xemacs-${EMACSVERSION}
+###
+### Support using Xft for rendering TrueType fonts.
+###
+.if !empty(PKG_OPTIONS:Mxft)
+.  include "../../fonts/fontconfig/buildlink3.mk"
+.  include "../../graphics/freetype2/buildlink3.mk"
+.  include "../../x11/libXft/buildlink3.mk"
+.  include "../../x11/libXrender/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-xft=emacs,tabs,menubars,gauges
+.endif
 
-LIBDIR=			${PREFIX}/lib/${EMACS_DISTNAME}
-ARCHLIBDIR=		${LIBDIR}/${MACHINE_GNU_PLATFORM}
+###
+### Support using GTK X11 widgets.
+###
+.if !empty(PKG_OPTIONS:Mgtk)
+.  include "../../x11/gtk/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gtk
+.endif
 
-# This list overrides variables used in the source Makefiles at install
-# time to allow for ${DESTDIR}-style installation.  This variables list
-# is pulled from the ``mkdir'' target of Makefile.in.in.
-#
-INSTALL_MAKE_FLAGS+=	archlibdir=${DESTDIR}${ARCHLIBDIR}
-INSTALL_MAKE_FLAGS+=	bindir=${DESTDIR}${PREFIX}/bin
-INSTALL_MAKE_FLAGS+=	datadir=${DESTDIR}${PREFIX}/lib
-INSTALL_MAKE_FLAGS+=	docdir=${DESTDIR}${ARCHLIBDIR}
-INSTALL_MAKE_FLAGS+=	etcdir=${DESTDIR}${LIBDIR}/etc
-INSTALL_MAKE_FLAGS+=	exec_prefix=${DESTDIR}${PREFIX}
-INSTALL_MAKE_FLAGS+=	infodir=${DESTDIR}${LIBDIR}/info
-INSTALL_MAKE_FLAGS+=	libdir=${DESTDIR}/lib
-INSTALL_MAKE_FLAGS+=	lispdir=${DESTDIR}${LIBDIR}/lisp
-INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-INSTALL_MAKE_FLAGS+=	moduledir=${DESTDIR}${ARCHLIBDIR}/modules
-INSTALL_MAKE_FLAGS+=	pkgdir=${DESTDIR}${LIBDIR}/lisp
-INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
-INSTALL_MAKE_FLAGS+=	sitelispdir=${DESTDIR}${PREFIX}/lib/xemacs/site-lisp
-INSTALL_MAKE_FLAGS+=	sitemoduledir=${DESTDIR}${PREFIX}/lib/xemacs/site-modules
+###
+### Support using Motif X11 widgets.
+###
+.if !empty(PKG_OPTIONS:Mmotif)
+.  include "../../mk/motif.buildlink3.mk"
+.endif
 
-pre-build:
-	rm -f ${WRKSRC}/etc/ctags.1.orig
+###
+### Support using Lucid X11 widgets.
+###
+.if !empty(PKG_OPTIONS:Mlucid)
+.  include "../../mk/xaw.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-widgets=lucid
+.endif
 
-.include "../../databases/gdbm/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/termcap.buildlink3.mk"
+.include "Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs-current/Makefile.common b/editors/xemacs-current/Makefile.common
new file mode 100644
index 00000000000..3baa23b99a2
--- /dev/null
+++ b/editors/xemacs-current/Makefile.common
@@ -0,0 +1,85 @@
+# $NetBSD: Makefile.common,v 1.4 2016/12/30 23:09:41 wiz Exp $
+#
+# used by editors/xemacs-current/Makefile
+# used by editors/xemacs-current-nox11/Makefile
+
+DISTNAME=	xemacs-21.5.27
+EMACSVERSION=	21.5-b27
+EMACS_DISTNAME=	xemacs-${EMACSVERSION}
+CATEGORIES=	editors
+MASTER_SITES=	${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.xemacs.org/
+
+PATCHDIR=	${.CURDIR}/../../editors/xemacs-current/patches
+DISTINFO_FILE=	${.CURDIR}/../../editors/xemacs-current/distinfo
+PLIST_SRC=	${.CURDIR}/../../editors/xemacs-current/PLIST
+
+PLIST_SUBST+=		DISTNAME=${EMACS_DISTNAME}
+FILES_SUBST+=		DISTNAME=${EMACS_DISTNAME}
+MESSAGE_SUBST+=		DISTNAME=${EMACS_DISTNAME}
+INFO_FILES=	yes
+
+# The XEmacs configure script does something silly to the value of mandir
+# passed to the configure script to point it to where the man1 pages go.
+# Point it there directly.
+#
+GNU_CONFIGURE_MANDIR=	${PREFIX:Q}/${PKGMANDIR}/man1
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-clash-detection
+CONFIGURE_ARGS+=	--with-mule
+CONFIGURE_ARGS+=	--with-zlib
+CONFIGURE_ARGS+=	--without-msw
+CONFIGURE_ARGS+=	--with-pdump
+CFLAGS+=		-Dunix
+
+# Newer gcc has big trouble with aliasing.  This should be fixed in the
+# source, but until then, use the big hammer here.
+#
+CFLAGS+=		-fno-strict-aliasing
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+INFOPATH=		${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
+.else
+INFOPATH=		${PREFIX}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
+.endif
+CONFIGURE_ARGS+=	--with-infopath=${INFOPATH:Q}
+
+# Having the build path in the dumped emacs is not a problem.
+CHECK_WRKREF_SKIP+=	bin/xemacs
+CHECK_WRKREF_SKIP+=	bin/xemacs-${EMACSVERSION}
+
+LIBDIR=			${PREFIX}/lib/${EMACS_DISTNAME}
+ARCHLIBDIR=		${LIBDIR}/${MACHINE_GNU_PLATFORM}
+
+# This list overrides variables used in the source Makefiles at install
+# time to allow for ${DESTDIR}-style installation.  This variables list
+# is pulled from the ``mkdir'' target of Makefile.in.in.
+#
+INSTALL_MAKE_FLAGS+=	archlibdir=${DESTDIR}${ARCHLIBDIR}
+INSTALL_MAKE_FLAGS+=	bindir=${DESTDIR}${PREFIX}/bin
+INSTALL_MAKE_FLAGS+=	datadir=${DESTDIR}${PREFIX}/lib
+INSTALL_MAKE_FLAGS+=	docdir=${DESTDIR}${ARCHLIBDIR}
+INSTALL_MAKE_FLAGS+=	etcdir=${DESTDIR}${LIBDIR}/etc
+INSTALL_MAKE_FLAGS+=	exec_prefix=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=	infodir=${DESTDIR}${LIBDIR}/info
+INSTALL_MAKE_FLAGS+=	libdir=${DESTDIR}/lib
+INSTALL_MAKE_FLAGS+=	lispdir=${DESTDIR}${LIBDIR}/lisp
+INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+INSTALL_MAKE_FLAGS+=	moduledir=${DESTDIR}${ARCHLIBDIR}/modules
+INSTALL_MAKE_FLAGS+=	pkgdir=${DESTDIR}${LIBDIR}/lisp
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=	sitelispdir=${DESTDIR}${PREFIX}/lib/xemacs/site-lisp
+INSTALL_MAKE_FLAGS+=	sitemoduledir=${DESTDIR}${PREFIX}/lib/xemacs/site-modules
+
+pre-build:
+	rm -f ${WRKSRC}/etc/ctags.1.orig
+
+.include "../../databases/gdbm/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
diff --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk
index 892c25ac717..509c4823097 100644
--- a/editors/xemacs-current/options.mk
+++ b/editors/xemacs-current/options.mk
@@ -1,35 +1,11 @@
-# $NetBSD: options.mk,v 1.12 2010/12/23 11:44:29 dsainty Exp $
+# $NetBSD: options.mk,v 1.13 2016/12/30 23:09:41 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.xemacs
-PKG_SUPPORTED_OPTIONS=		ldap xface canna debug x11 xft
+PKG_SUPPORTED_OPTIONS+=		ldap xface canna debug
 #PKG_SUPPORTED_OPTIONS+=	esound
-PKG_OPTIONS_OPTIONAL_GROUPS=	toolkit
-PKG_OPTIONS_GROUP.toolkit=	gtk lucid motif
-PKG_OPTIONS_LEGACY_OPTS=	xaw:lucid
-PKG_SUGGESTED_OPTIONS=		x11
 
 .include "../../mk/bsd.options.mk"
 
-###
-### Any of the "toolkit" options or "xft" implies "x11".
-###
-.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mlucid) || \
-    !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxft)
-.  if empty(PKG_OPTIONS:Mx11)
-PKG_OPTIONS+=		x11
-.  endif
-.endif
-
-###
-### Default to using the Lucid X11 toolkit if none is specified.
-###
-.if !empty(PKG_OPTIONS:Mx11)
-.  if empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mlucid) && \
-      empty(PKG_OPTIONS:Mmotif)
-PKG_OPTIONS+=		lucid
-.  endif
-.endif
-
 PLIST_VARS+=		ldap
 .if !empty(PKG_OPTIONS:Mldap)
 PLIST.ldap=		yes
@@ -62,63 +38,3 @@ CONFIGURE_ARGS+=	--with-sound=none
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug=yes --with-debug
 .endif
-
-###
-### Support drawing pretty X11 widgets.
-###
-.if !empty(PKG_OPTIONS:Mx11)
-.  include "../../mk/jpeg.buildlink3.mk"
-.  include "../../graphics/png/buildlink3.mk"
-.  include "../../graphics/tiff/buildlink3.mk"
-.  include "../../x11/xbitmaps/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-x
-.  if ${X11_TYPE} != "modular"
-CONFIGURE_ARGS+=	--with-site-prefixes=${PREFIX}:${X11BASE}
-CONFIGURE_ARGS+=	--with-site-runtime-libraries=${PREFIX}/lib:${X11BASE}/lib
-.  else
-CONFIGURE_ARGS+=	--with-site-prefixes=${PREFIX}
-CONFIGURE_ARGS+=	--with-site-runtime-libraries=${PREFIX}/lib
-.  endif
-.else
-CONFIGURE_ARGS+=	--without-x
-CONFIGURE_ARGS+=	--without-jpeg
-CONFIGURE_ARGS+=	--without-png
-CONFIGURE_ARGS+=	--without-tiff
-CONFIGURE_ARGS+=	--without-xpm
-CONFIGURE_ARGS+=	--with-site-prefixes=${PREFIX}
-CONFIGURE_ARGS+=	--with-site-runtime-libraries=${PREFIX}/lib
-.endif
-
-###
-### Support using Xft for rendering TrueType fonts.
-###
-.if !empty(PKG_OPTIONS:Mxft)
-.  include "../../fonts/fontconfig/buildlink3.mk"
-.  include "../../graphics/freetype2/buildlink3.mk"
-.  include "../../x11/libXft/buildlink3.mk"
-.  include "../../x11/libXrender/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-xft=emacs,tabs,menubars,gauges
-.endif
-
-###
-### Support using GTK X11 widgets.
-###
-.if !empty(PKG_OPTIONS:Mgtk)
-.  include "../../x11/gtk/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-gtk
-.endif
-
-###
-### Support using Motif X11 widgets.
-###
-.if !empty(PKG_OPTIONS:Mmotif)
-.  include "../../mk/motif.buildlink3.mk"
-.endif
-
-###
-### Support using Lucid X11 widgets.
-###
-.if !empty(PKG_OPTIONS:Mlucid)
-.  include "../../mk/xaw.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-widgets=lucid
-.endif