[pkgsrc/trunk]: pkgsrc/editors Fix build of emacs21-nox11.

[uebayasi <uebayasi%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/26460542caaa
branches:  trunk
changeset: 534677:26460542caaa
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Mon Oct 29 12:38:02 2007 +0000

description:
Fix build of emacs21-nox11.

diffstat:

 editors/emacs21-nox11/Makefile  |   8 ++++++--
 editors/emacs21/Makefile        |  11 ++++-------
 editors/emacs21/Makefile.common |   6 +++++-
 3 files changed, 15 insertions(+), 10 deletions(-)

diffs (65 lines):

diff -r c85e9207555b -r 26460542caaa editors/emacs21-nox11/Makefile
--- a/editors/emacs21-nox11/Makefile    Mon Oct 29 12:37:13 2007 +0000
+++ b/editors/emacs21-nox11/Makefile    Mon Oct 29 12:38:02 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/08/13 12:40:59 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2007/10/29 12:38:02 uebayasi Exp $
 
 PKGNAME=       emacs-nox11-${EMACSVERSION}a
 CATEGORIES=    editors
@@ -11,4 +11,8 @@
 # Forcibly remove any "x11" options.
 PKG_OPTIONS.emacs+=    -x11 -emacs-xaw3d -motif -xaw
 
-.include "../../editors/emacs21/Makefile"
+.include "../../editors/emacs21/options.mk"
+
+.include "../../editors/emacs21/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
diff -r c85e9207555b -r 26460542caaa editors/emacs21/Makefile
--- a/editors/emacs21/Makefile  Mon Oct 29 12:37:13 2007 +0000
+++ b/editors/emacs21/Makefile  Mon Oct 29 12:38:02 2007 +0000
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2007/08/13 12:40:58 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/10/29 12:38:02 uebayasi Exp $
 
-DISTNAME=      emacs-${EMACSVERSION}a
 PKGREVISION=   11
 CATEGORIES=    editors
 COMMENT=       GNU editing macros (editor)
 
-.include "../../editors/emacs21/Makefile.common"
+CONFLICTS+=    emacs-nox11-[0-9]*
 
 USE_TOOLS+=    imake
 
-CONFLICTS+=    emacs-nox11-[0-9]*
-
-CONFIGURE_ARGS+=       --srcdir=${WRKSRC:Q}
-
 .include "options.mk"
 
+.include "../../editors/emacs21/Makefile.common"
+
 .include "../../mk/bsd.pkg.mk"
diff -r c85e9207555b -r 26460542caaa editors/emacs21/Makefile.common
--- a/editors/emacs21/Makefile.common   Mon Oct 29 12:37:13 2007 +0000
+++ b/editors/emacs21/Makefile.common   Mon Oct 29 12:38:02 2007 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.common,v 1.1 2007/06/11 13:38:29 markd Exp $
+# $NetBSD: Makefile.common,v 1.2 2007/10/29 12:38:02 uebayasi Exp $
+
+DISTNAME=      emacs-${EMACSVERSION}a
 
 MASTER_SITES=  ${MASTER_SITE_GNU:=emacs/}
 MAINTAINER=    markd%NetBSD.org@localhost
@@ -25,6 +27,8 @@
 CHECK_WRKREF_SKIP+=    bin/emacs
 CHECK_WRKREF_SKIP+=    bin/emacs-${EMACSVERSION}
 
+CONFIGURE_ARGS+=       --srcdir=${WRKSRC:Q}
+
 .include "../../mk/bsd.prefs.mk"
 
 # This matches NetBSD <1.7 releases and 1.6A-1.6P, where ld is <2.13.2.1.