Fix options framework abuse by xemacs-nox11/xemacs.

Partially tested, xemacs-nox11 hangs during build with 99% CPU for me.

3 files changed, 117 insertions, 110 deletions

diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 5337019f895..86f77591ad4 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,110 +1,10 @@
-# $NetBSD: Makefile,v 1.116 2016/04/13 13:52:27 hauke Exp $
+# $NetBSD: Makefile,v 1.117 2016/12/30 23:27:14 wiz Exp $
 
-PKGNAME?=	${DISTNAME}
-COMMENT?=	XEmacs text editor version 21
+PKGNAME=	${DISTNAME}
+COMMENT=	XEmacs text editor version 21
 
-DISTNAME=	xemacs-21.4.24
-#PKGREVISION=	1
-CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
-
-MAINTAINER=	hauke@NetBSD.org
-HOMEPAGE=	http://www.xemacs.org/
-LICENSE=	gnu-gpl-v2
-
-CONFLICTS+=	gnuserv-[0-9]*
-CONFLICTS+=	xemacs-[0-9]*
-CONFLICTS+=	xemacs-nox11-[0-9]*
-
-USE_TOOLS+=	makeinfo
-
-HAS_CONFIGURE=		yes
-
-DIST_SUBDIR=		xemacs
-PLIST_SUBST+=		DISTNAME=${DISTNAME:Q}
-FILES_SUBST+=		DISTNAME=${DISTNAME:Q}
-MESSAGE_SUBST+=		DISTNAME=${DISTNAME:Q}
-INFO_FILES=		yes
-
-.if defined(MANZ)
-PLIST_SUBST+=		ELSUFX='.gz'
-.else
-PLIST_SUBST+=		ELSUFX=''
-.endif
-
-.include "options.mk"
-
-CONFIGURE_ARGS+=	${MACHINE_GNU_PLATFORM}
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}/man1
-CONFIGURE_ARGS+=	--infopath=${PREFIX}/${PKGINFODIR}
-CONFIGURE_ARGS+=	--with-clash-detection
-CONFIGURE_ARGS+=	--with-mule=yes
-CONFIGURE_ARGS+=	--with-msw=no
-CONFIGURE_ARGS+=	--pdump
-CFLAGS+=		-Dunix
-
-# Use terminfo on NetBSD-6 and newer.
-# We cannot use terminfo.*.mk as XEmacs enforces a link to termcap,
-# but this is fine for us.
-.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h)
-CPPFLAGS+=	-DTERMINFO
-.endif
-
-.if ${OPSYS} == "SunOS"
-.  if !exists(/usr/demo/SOUND/libaudio.a) && \
-      !exists(/usr/demo/SOUND/lib/libaudio.a)
-CONFIGURE_ARGS+=	--with_sound=none
-.  endif
-.endif
-
-.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
-CPPFLAGS+=		-DDFLY_CRT_USRLIB
-.endif
-
-CHECK_WRKREF_SKIP=	bin/xemacs*
-REPLACE_SH=		etc/check_cygwin_setup.sh
-
-LIBDIR=			${PREFIX}/lib/${DISTNAME}
-ARCHLIBDIR=		${LIBDIR}/${MACHINE_GNU_PLATFORM}
-
-# The portable dumper creates a dump file with a build ID in its name
-GENERATE_PLIST+=	${ECHO} bin/${DISTNAME}-`${WRKSRC}/src/xemacs -sd`.dmp ;
-
-# 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
-
-post-extract:
-	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/
-
-pre-build:
-	rm -f ${WRKSRC}/etc/ctags.1.orig
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/Installation ${DESTDIR}${LIBDIR}/etc/
-.if defined(MANZ)
-	find ${DESTDIR}${LIBDIR} -name "*.el" -type f -print | xargs ${GZIP_CMD}
-.endif
-
-.include "../../databases/gdbm/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/termcap.buildlink3.mk"
+PKG_SUPPORTED_OPTIONS+=		x11
+PKG_SUGGESTED_OPTIONS+=		x11
 
+.include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common
new file mode 100644
index 00000000000..72dfdab7017
--- /dev/null
+++ b/editors/xemacs/Makefile.common
@@ -0,0 +1,109 @@
+# $NetBSD: Makefile.common,v 1.22 2016/12/30 23:27:14 wiz Exp $
+#
+# used by editors/xemacs-nox11/Makefile
+# used by editors/xemacs/Makefile
+
+DISTNAME=	xemacs-21.4.24
+#PKGREVISION=	1
+CATEGORIES=	editors
+MASTER_SITES=	${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
+
+MAINTAINER=	hauke@NetBSD.org
+HOMEPAGE=	http://www.xemacs.org/
+LICENSE=	gnu-gpl-v2
+
+FILESDIR=		${.CURDIR}/../../editors/xemacs/files
+PATCHDIR=		${.CURDIR}/../../editors/xemacs/patches
+DISTINFO_FILE=		${.CURDIR}/../../editors/xemacs/distinfo
+PLIST_SRC=		${.CURDIR}/../../editors/xemacs/PLIST
+
+USE_TOOLS+=	makeinfo
+
+HAS_CONFIGURE=		yes
+
+DIST_SUBDIR=		xemacs
+PLIST_SUBST+=		DISTNAME=${DISTNAME:Q}
+FILES_SUBST+=		DISTNAME=${DISTNAME:Q}
+MESSAGE_SUBST+=		DISTNAME=${DISTNAME:Q}
+INFO_FILES=		yes
+
+.if defined(MANZ)
+PLIST_SUBST+=		ELSUFX='.gz'
+.else
+PLIST_SUBST+=		ELSUFX=''
+.endif
+
+.include "options.mk"
+
+CONFIGURE_ARGS+=	${MACHINE_GNU_PLATFORM}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}/man1
+CONFIGURE_ARGS+=	--infopath=${PREFIX}/${PKGINFODIR}
+CONFIGURE_ARGS+=	--with-clash-detection
+CONFIGURE_ARGS+=	--with-mule=yes
+CONFIGURE_ARGS+=	--with-msw=no
+CONFIGURE_ARGS+=	--pdump
+CFLAGS+=		-Dunix
+
+# Use terminfo on NetBSD-6 and newer.
+# We cannot use terminfo.*.mk as XEmacs enforces a link to termcap,
+# but this is fine for us.
+.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h)
+CPPFLAGS+=	-DTERMINFO
+.endif
+
+.if ${OPSYS} == "SunOS"
+.  if !exists(/usr/demo/SOUND/libaudio.a) && \
+      !exists(/usr/demo/SOUND/lib/libaudio.a)
+CONFIGURE_ARGS+=	--with_sound=none
+.  endif
+.endif
+
+.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
+CPPFLAGS+=		-DDFLY_CRT_USRLIB
+.endif
+
+CHECK_WRKREF_SKIP=	bin/xemacs*
+REPLACE_SH=		etc/check_cygwin_setup.sh
+
+LIBDIR=			${PREFIX}/lib/${DISTNAME}
+ARCHLIBDIR=		${LIBDIR}/${MACHINE_GNU_PLATFORM}
+
+# The portable dumper creates a dump file with a build ID in its name
+GENERATE_PLIST+=	${ECHO} bin/${DISTNAME}-`${WRKSRC}/src/xemacs -sd`.dmp ;
+
+# 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
+
+post-extract:
+	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/
+
+pre-build:
+	rm -f ${WRKSRC}/etc/ctags.1.orig
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/Installation ${DESTDIR}${LIBDIR}/etc/
+.if defined(MANZ)
+	find ${DESTDIR}${LIBDIR} -name "*.el" -type f -print | xargs ${GZIP_CMD}
+.endif
+
+.include "../../databases/gdbm/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk
index d94f02f1c0e..7e2fedf4663 100644
--- a/editors/xemacs/options.mk
+++ b/editors/xemacs/options.mk
@@ -1,9 +1,7 @@
-# $NetBSD: options.mk,v 1.12 2016/04/13 13:52:27 hauke Exp $
+# $NetBSD: options.mk,v 1.13 2016/12/30 23:27:14 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.xemacs
-PKG_SUPPORTED_OPTIONS=		ldap xface canna x11 debug
-
-PKG_SUGGESTED_OPTIONS=		x11
+PKG_SUPPORTED_OPTIONS+=		ldap xface canna debug
 
 .include "../../mk/bsd.options.mk"