CVS commit: pkgsrc/editors

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Oct  3 09:22:28 UTC 2021

Modified Files:
        pkgsrc/editors/xemacs: Makefile
        pkgsrc/editors/xemacs-current: Makefile

Log Message:
xemacs: Adjust inclusion order so MKPIE is properly honored


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 pkgsrc/editors/xemacs/Makefile
cvs rdiff -u -r1.109 -r1.110 pkgsrc/editors/xemacs-current/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/xemacs/Makefile
diff -u pkgsrc/editors/xemacs/Makefile:1.135 pkgsrc/editors/xemacs/Makefile:1.136
--- pkgsrc/editors/xemacs/Makefile:1.135        Mon May 24 19:52:08 2021
+++ pkgsrc/editors/xemacs/Makefile      Sun Oct  3 09:22:28 2021
@@ -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.des
 
 INSTALLATION_DIRS+=            share/applications
 
-.include "Makefile.common"
-
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/editors/xemacs-current/Makefile
diff -u pkgsrc/editors/xemacs-current/Makefile:1.109 pkgsrc/editors/xemacs-current/Makefile:1.110
--- pkgsrc/editors/xemacs-current/Makefile:1.109        Mon May 24 19:52:09 2021
+++ pkgsrc/editors/xemacs-current/Makefile      Sun Oct  3 09:22:28 2021
@@ -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.des
 
 INSTALLATION_DIRS+=            share/applications
 
-.include "Makefile.common"
-
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"