Simplify previous.

2 files changed, 82 insertions, 82 deletions

diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index f4538650b52..71dc32c309c 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2016/12/30 23:09:41 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2016/12/30 23:18:53 wiz Exp $
 
 PKGNAME=	${DISTNAME}
 PKGREVISION=	23
@@ -13,86 +13,6 @@ PKG_SUGGESTED_OPTIONS+=		x11
 
 .include "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
-
-###
-### 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
-
 .include "Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk
index 509c4823097..689b0ec678b 100644
--- a/editors/xemacs-current/options.mk
+++ b/editors/xemacs-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2016/12/30 23:09:41 wiz Exp $
+# $NetBSD: options.mk,v 1.14 2016/12/30 23:18:53 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS+=		ldap xface canna debug
@@ -6,6 +6,26 @@ PKG_SUPPORTED_OPTIONS+=		ldap xface canna debug
 
 .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
@@ -38,3 +58,63 @@ 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