For the sake of MKPIE, we need to .include Makefile.common before

options.mk.

Since Makefile.common now does not see the x11 option, we have to move
all x11 related commands into options.mk. Within options, move
.includes to the end for consistency.

8 files changed, 74 insertions, 70 deletions

diff --git a/editors/xemacs-current-nox11/Makefile b/editors/xemacs-current-nox11/Makefile
index a96875fc028..1c994b770d3 100644
--- a/editors/xemacs-current-nox11/Makefile
+++ b/editors/xemacs-current-nox11/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2021/03/28 10:36:33 hauke Exp $
+# $NetBSD: Makefile,v 1.14 2021/10/03 17:53:11 hauke Exp $
 
 PKGNAME=	${DISTNAME:S/-/-nox11-/}
-PKGREVISION=	9
-COMMENT=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV} (no X11 support)
+PKGREVISION=	10
+COMMENT=	*BETA* XEmacs text editor version 21.5 (no X11 support)
 
-.include "../../editors/xemacs-current/options.mk"
 .include "../../editors/xemacs-current/Makefile.common"
+.include "../../editors/xemacs-current/options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 1d4e86137cc..3590fd7bb34 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.110 2021/10/03 09:22:28 nia Exp $
+# $NetBSD: Makefile,v 1.111 2021/10/03 17:53:11 hauke Exp $
 
 PKGNAME=	${DISTNAME}
-PKGREVISION=	17
+PKGREVISION=	18
 COMMENT=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV}
 
 .include "Makefile.common"
@@ -12,15 +12,4 @@ PKG_SUGGESTED_OPTIONS+=		x11
 
 .include "options.mk"
 
-LIBDIR=				${PREFIX}/lib/${DISTNAME}
-
-SUBST_CLASSES+=			desktop-file
-SUBST_STAGE.desktop-file=	pre-configure
-SUBST_MESSAGE.desktop-file=	Fixing paths in XEmacs desktop file
-SUBST_VARS.desktop-file=	PREFIX LIBDIR
-SUBST_FILES.desktop-file=	etc/xemacs.desktop
-
-INSTALLATION_DIRS+=		share/applications
-
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs-current/Makefile.common b/editors/xemacs-current/Makefile.common
index 4e2f2b74c61..69532e9ce56 100644
--- a/editors/xemacs-current/Makefile.common
+++ b/editors/xemacs-current/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2021/09/27 15:58:33 nia Exp $
+# $NetBSD: Makefile.common,v 1.19 2021/10/03 17:53:11 hauke Exp $
 #
 # used by editors/xemacs-current/Makefile
 # used by editors/xemacs-current-nox11/Makefile
@@ -62,15 +62,6 @@ INSTALL_MAKE_FLAGS+=	TAR=${TOOLS_PATH.gtar}
 CPPFLAGS+=	-DTERMINFO
 .endif
 
-.if !empty(PKG_OPTIONS:Mx11)
-post-extract:
-	cp ${.CURDIR}/../../editors/xemacs/files/xemacs.desktop ${WRKSRC}/etc/
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/etc/xemacs.desktop \
-		${DESTDIR}${PREFIX}/share/applications/
-.endif
-
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk
index f87ace2f379..49464bf55da 100644
--- a/editors/xemacs-current/options.mk
+++ b/editors/xemacs-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2020/11/29 19:52:26 nia Exp $
+# $NetBSD: options.mk,v 1.20 2021/10/03 17:53:11 hauke Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS+=		ldap canna debug
@@ -15,12 +15,6 @@ PKG_OPTIONS+=		x11
 ###
 PLIST_VARS+=		x11
 .if !empty(PKG_OPTIONS:Mx11)
-.  include "../../mk/jpeg.buildlink3.mk"
-.  include "../../graphics/png/buildlink3.mk"
-.  include "../../graphics/tiff/buildlink3.mk"
-.  include "../../x11/libXpm/buildlink3.mk"
-.  include "../../mk/xaw.buildlink3.mk"
-.  include "../../x11/xbitmaps/buildlink3.mk"
 PLIST.x11=		yes
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-jpeg
@@ -42,7 +36,33 @@ CONFIGURE_ARGS+=	--with-xim=xlib
 # Explicitly exclude other toolkits
 CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--without-gnome
+
+LIBDIR=				${PREFIX}/lib/${DISTNAME}
+
+SUBST_CLASSES+=			desktop-file
+SUBST_STAGE.desktop-file=	pre-configure
+SUBST_MESSAGE.desktop-file=	Fixing paths in XEmacs desktop file
+SUBST_VARS.desktop-file=	PREFIX LIBDIR
+SUBST_FILES.desktop-file=	etc/xemacs.desktop
+
+INSTALLATION_DIRS+=		share/applications
+
+post-extract:
+	cp ${.CURDIR}/../../editors/xemacs/files/xemacs.desktop ${WRKSRC}/etc/
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/etc/xemacs.desktop \
+		${DESTDIR}${PREFIX}/share/applications/
+
+.  include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.  include "../../mk/jpeg.buildlink3.mk"
+.  include "../../graphics/png/buildlink3.mk"
+.  include "../../graphics/tiff/buildlink3.mk"
+.  include "../../x11/libXpm/buildlink3.mk"
+.  include "../../mk/xaw.buildlink3.mk"
+.  include "../../x11/xbitmaps/buildlink3.mk"
 .else
+
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--without-jpeg
 CONFIGURE_ARGS+=	--without-png
@@ -63,11 +83,11 @@ CONFIGURE_ARGS+=	--without-ldap
 .endif
 
 .if !empty(PKG_OPTIONS:Mxft)
+CONFIGURE_ARGS+=	--with-xft=emacs,tabs,menubars,gauges
 .  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
 .else
 CONFIGURE_ARGS+=	--without-xft
 .endif
@@ -81,8 +101,8 @@ CONFIGURE_ARGS+=	--without-xface
 
 PLIST_VARS+=		canna
 .if !empty(PKG_OPTIONS:Mcanna)
-.  include "../../inputmethod/canna-lib/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-canna
+.  include "../../inputmethod/canna-lib/buildlink3.mk"
 PLIST.canna=		yes
 .else
 CONFIGURE_ARGS+=	--without-canna
diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile
index c224f426c89..49cd6f7b0f7 100644
--- a/editors/xemacs-nox11/Makefile
+++ b/editors/xemacs-nox11/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.37 2021/03/28 10:36:33 hauke Exp $
+# $NetBSD: Makefile,v 1.38 2021/10/03 17:53:11 hauke Exp $
 
 PKGNAME=	${DISTNAME:S/-/-nox11-/}
-PKGREVISION=	15
-COMMENT=	XEmacs text editor version 21 (no x11 support)
-
-.include "../../editors/xemacs/options.mk"
+PKGREVISION=	16
+COMMENT=	XEmacs text editor version 21.4 (no x11 support)
 
 .include "../../editors/xemacs/Makefile.common"
+.include "../../editors/xemacs/options.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 5c985329fe7..0f138f1ef40 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.136 2021/10/03 09:22:28 nia Exp $
+# $NetBSD: Makefile,v 1.137 2021/10/03 17:53:11 hauke Exp $
 
 PKGNAME=	${DISTNAME}
-PKGREVISION=	17
+PKGREVISION=	18
 COMMENT=	XEmacs text editor version 21.4
 
 .include "Makefile.common"
@@ -12,13 +12,4 @@ PKG_SUGGESTED_OPTIONS+=		x11
 
 .include "options.mk"
 
-SUBST_CLASSES+=			desktop-file
-SUBST_STAGE.desktop-file=	pre-configure
-SUBST_MESSAGE.desktop-file=	Fixing paths in XEmacs desktop file
-SUBST_VARS.desktop-file=	PREFIX LIBDIR
-SUBST_FILES.desktop-file=	etc/xemacs.desktop
-
-INSTALLATION_DIRS+=		share/applications
-
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common
index 4d3b04237e8..0a23d853a00 100644
--- a/editors/xemacs/Makefile.common
+++ b/editors/xemacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2021/09/27 15:57:32 nia Exp $
+# $NetBSD: Makefile.common,v 1.38 2021/10/03 17:53:11 hauke Exp $
 #
 # used by editors/xemacs-nox11/Makefile
 # used by editors/xemacs/Makefile
@@ -97,25 +97,18 @@ INSTALL_MAKE_FLAGS+=	sitemoduledir=${DESTDIR}${PREFIX}/lib/xemacs/site-modules
 
 INSTALL_MAKE_FLAGS+=	TAR=${TOOLS_PATH.gtar}
 
-post-extract:
+post-extract: post-extract-x11
 	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/
-.if !empty(PKG_OPTIONS:Mx11)
-	cp ${FILESDIR}/xemacs.desktop ${WRKSRC}/etc/
-.endif
 
 pre-build:
 	rm -f ${WRKSRC}/etc/ctags.1.orig
 	rm -f ${WRKSRC}/lisp/gui.el.orig
 
-post-install:
+post-install:	post-install-x11
 	${INSTALL_DATA} ${WRKSRC}/Installation ${DESTDIR}${LIBDIR}/etc/
 .if defined(MANZ)
 	find ${DESTDIR}${LIBDIR} -name "*.el" -type f -print | xargs ${GZIP_CMD}
 .endif
-.if !empty(PKG_OPTIONS:Mx11)
-	${INSTALL_DATA} ${WRKSRC}/etc/xemacs.desktop \
-		${DESTDIR}${PREFIX}/share/applications/
-.endif
 
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk
index 645d1f73c64..aad6c509750 100644
--- a/editors/xemacs/options.mk
+++ b/editors/xemacs/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2019/06/08 10:41:00 rillig Exp $
+# $NetBSD: options.mk,v 1.18 2021/10/03 17:53:11 hauke Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS+=		ldap canna debug
@@ -10,12 +10,6 @@ PKG_SUPPORTED_OPTIONS+=		ldap canna debug
 ###
 PLIST_VARS+=		x11
 .if !empty(PKG_OPTIONS:Mx11)
-.  include "../../mk/jpeg.buildlink3.mk"
-.  include "../../graphics/png/buildlink3.mk"
-.  include "../../graphics/tiff/buildlink3.mk"
-.  include "../../x11/libXpm/buildlink3.mk"
-.  include "../../mk/xaw.buildlink3.mk"
-.  include "../../x11/xbitmaps/buildlink3.mk"
 PLIST.x11=		yes
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-jpeg
@@ -34,6 +28,29 @@ CONFIGURE_ARGS+=	--with-dialogs=athena
 CONFIGURE_ARGS+=	--with-widgets=athena
 CONFIGURE_ARGS+=	--with-athena=xaw
 CONFIGURE_ARGS+=	--with-xim=xlib
+
+SUBST_CLASSES+=			desktop-file
+SUBST_STAGE.desktop-file=	pre-configure
+SUBST_MESSAGE.desktop-file=	Fixing paths in XEmacs desktop file
+SUBST_VARS.desktop-file=	PREFIX LIBDIR
+SUBST_FILES.desktop-file=	etc/xemacs.desktop
+
+INSTALLATION_DIRS+=		share/applications
+
+post-extract-x11:
+	cp ${FILESDIR}/xemacs.desktop ${WRKSRC}/etc/
+
+post-install-x11:
+	${INSTALL_DATA} ${WRKSRC}/etc/xemacs.desktop \
+		${DESTDIR}${PREFIX}/share/applications/
+
+.  include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.  include "../../mk/jpeg.buildlink3.mk"
+.  include "../../graphics/png/buildlink3.mk"
+.  include "../../graphics/tiff/buildlink3.mk"
+.  include "../../x11/libXpm/buildlink3.mk"
+.  include "../../mk/xaw.buildlink3.mk"
+.  include "../../x11/xbitmaps/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--without-jpeg
@@ -43,6 +60,10 @@ CONFIGURE_ARGS+=	--without-xpm
 CONFIGURE_ARGS+=	--site-includes=${PREFIX}/include
 CONFIGURE_ARGS+=	--site-libraries=${PREFIX}/lib
 CONFIGURE_ARGS+=	--site-runtime-libraries=${PREFIX}/lib
+
+# Nothing to do
+post-extract-x11:
+post-install-x11:
 .endif
 
 .if !empty(PKG_OPTIONS:Mldap)
@@ -61,8 +82,8 @@ CONFIGURE_ARGS+=	--without-xface
 
 PLIST_VARS+=		canna
 .if !empty(PKG_OPTIONS:Mcanna)
-.  include "../../inputmethod/canna-lib/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-canna
+.  include "../../inputmethod/canna-lib/buildlink3.mk"
 PLIST.canna=		yes
 .else
 CONFIGURE_ARGS+=	--without-canna