From 2ba54867df030120dfa9a0cb1e2124469969300f Mon Sep 17 00:00:00 2001 From: nia Date: Sun, 3 Oct 2021 09:22:28 +0000 Subject: xemacs: Adjust inclusion order so MKPIE is properly honored --- editors/xemacs-current/Makefile | 6 +++--- editors/xemacs/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'editors') diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile index c8a04da9de8..1d4e86137cc 100644 --- a/editors/xemacs-current/Makefile +++ b/editors/xemacs-current/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.109 2021/05/24 19:52:09 wiz Exp $ +# $NetBSD: Makefile,v 1.110 2021/10/03 09:22:28 nia Exp $ PKGNAME= ${DISTNAME} PKGREVISION= 17 COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV} +.include "Makefile.common" + # extra options for x11 support, not for sharing with xemacs-current-nox11 PKG_SUPPORTED_OPTIONS+= x11 xft xface PKG_SUGGESTED_OPTIONS+= x11 @@ -20,7 +22,5 @@ SUBST_FILES.desktop-file= etc/xemacs.desktop INSTALLATION_DIRS+= share/applications -.include "Makefile.common" - .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index ac6798263f1..5c985329fe7 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.135 2021/05/24 19:52:08 wiz Exp $ +# $NetBSD: Makefile,v 1.136 2021/10/03 09:22:28 nia Exp $ PKGNAME= ${DISTNAME} PKGREVISION= 17 COMMENT= XEmacs text editor version 21.4 +.include "Makefile.common" + # extra options for x11 support, not for sharing with xemacs-current-nox11 PKG_SUPPORTED_OPTIONS+= x11 xface PKG_SUGGESTED_OPTIONS+= x11 @@ -18,7 +20,5 @@ SUBST_FILES.desktop-file= etc/xemacs.desktop INSTALLATION_DIRS+= share/applications -.include "Makefile.common" - .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3