Set emacs22 up with a proper Makefile.common instead of including

the whole makefile from emacs22-nox11.

3 files changed, 94 insertions, 86 deletions

diff --git a/editors/emacs22-nox11/Makefile b/editors/emacs22-nox11/Makefile
index 8c5abbbd689..f99caf8b109 100644
--- a/editors/emacs22-nox11/Makefile
+++ b/editors/emacs22-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/02/17 00:40:40 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2013/02/17 08:01:50 dholland Exp $
 
 PKGNAME=	${DISTNAME:S/emacs/emacs22/:S/-/-nox11-/}
 PKGREVISION=	3
@@ -7,11 +7,11 @@ FILESDIR=	${.CURDIR}/../../editors/emacs22/files
 PATCHDIR=	${.CURDIR}/../../editors/emacs22/patches
 PKGDIR=		${.CURDIR}/../../editors/emacs22
 
-# Mirror pre-bsd.prefs.mk settings from emacs/Makefile.
+# This needs to be set before including bsd.prefs.mk.
 SETGIDGAME=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS.emacs+=	-x11 -gtk -motif -xaw
 
-.include "../../editors/emacs22/Makefile"
+.include "../../editors/emacs22/Makefile.common"
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index a191bc8b5aa..ee65d72668a 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -1,86 +1,5 @@
-# $NetBSD: Makefile,v 1.35 2013/02/17 07:54:18 dholland Exp $
+# $NetBSD: Makefile,v 1.36 2013/02/17 08:01:50 dholland Exp $
 
-COMMENT?=	GNU editing macros (editor)
-
-DISTNAME=	emacs-22.3
-PKGNAME?=	${DISTNAME:S/emacs/emacs22/}
 PKGREVISION=	26
-CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
-LICENSE=	gnu-gpl-v3
-
-CONFLICTS+=	elisp-manual-[0-9]*
-CONFLICTS+=	emacs-[0-9]*
-CONFLICTS+=	emacs-nox11-[0-9]*
-CONFLICTS+=	mule-[0-9]*
-
-USE_TOOLS+=		gmake gzip mktemp:run perl:run pkg-config
-GNU_CONFIGURE=		yes
-INFO_FILES=		yes
-
-SETGIDGAME=		yes
-
-.include "options.mk"
-
-MAKEFLAGS+=		EMACSLOADPATH=${WRKSRC}/lisp
-
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ENV+=		GAMEOWN=${GAMEOWN:Q}
-
-BUILD_DEFS+=		VARBASE
-BUILD_DEFS+=		GAMEDATAMODE
-
-# build PATH in the dumped emacs is not a problem
-CHECK_WRKREF_SKIP+=	bin/emacs
-CHECK_WRKREF_SKIP+=	bin/emacs-[0-9]*
-
-REPLACE_PERL=		lib-src/grep-changelog
-
-SUBST_CLASSES+=			test_equal
-SUBST_STAGE.test_equal=		pre-configure
-SUBST_MESSAGE.test_equal=	Fixing bashisms in test(1) usage.
-SUBST_FILES.test_equal=		mac/make-package
-SUBST_SED.test_equal=		-e 's/ == / = /g'
-
-MAKE_DIRS_PERMS+=	${VARBASE}/games/emacs \
-			${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE:Q}
-CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores \
-			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE:Q}
-CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores \
-			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE:Q}
-SPECIAL_PERMS+=		libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS}
-
-.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
-CPPFLAGS+=		-DDFLY_CRT_USRLIB
-.endif
-
-.include "../../mk/compiler.mk"
-
-# "emacs" uses the C pre-processor to generate makefiles. The C pre-processor
-# of newer GCC version is designed to break this by purpose. We work around
-# that using the traditional mode to generate makefiles. 
-.if !empty(CC_VERSION:Mgcc-[4-9].*)
-CPP+=		-P
-CONFIGURE_ENV+=	CPP=${CPP:Q}
-.endif
-
-post-extract:
-	cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp
-	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
-	${CHMOD} -R go-w ${WRKSRC}
-
-# These dirs are installed by tar-copy and can sometimes come out mode
-# 754, which if PKG_DEVELOPER is set causes the build to fail.
-post-install:
-.for file in leim leim/ja-dic leim/quail
-	${CHMOD} 755 ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/${file}
-.endfor
-
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/termcap.buildlink3.mk"
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../editors/emacs22/Makefile.common"
diff --git a/editors/emacs22/Makefile.common b/editors/emacs22/Makefile.common
new file mode 100644
index 00000000000..7b0655fbcf0
--- /dev/null
+++ b/editors/emacs22/Makefile.common
@@ -0,0 +1,89 @@
+# $NetBSD: Makefile.common,v 1.1 2013/02/17 08:01:50 dholland Exp $
+#
+# used by editors/emacs22/Makefile
+# used by editors/emacs22-nox11/Makefile
+
+PKGNAME?=	${DISTNAME}
+COMMENT?=	GNU editing macros (editor)
+
+DISTNAME=	emacs-22.3
+PKGNAME?=	${DISTNAME:S/emacs/emacs22/}
+CATEGORIES=	editors
+MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
+LICENSE=	gnu-gpl-v3
+
+CONFLICTS+=	elisp-manual-[0-9]*
+CONFLICTS+=	emacs-[0-9]*
+CONFLICTS+=	emacs-nox11-[0-9]*
+CONFLICTS+=	mule-[0-9]*
+
+USE_TOOLS+=		gmake gzip mktemp:run perl:run pkg-config
+GNU_CONFIGURE=		yes
+INFO_FILES=		yes
+
+SETGIDGAME=		yes
+
+.include "options.mk"
+
+MAKEFLAGS+=		EMACSLOADPATH=${WRKSRC}/lisp
+
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ENV+=		GAMEOWN=${GAMEOWN:Q}
+
+BUILD_DEFS+=		VARBASE
+BUILD_DEFS+=		GAMEDATAMODE
+
+# build PATH in the dumped emacs is not a problem
+CHECK_WRKREF_SKIP+=	bin/emacs
+CHECK_WRKREF_SKIP+=	bin/emacs-[0-9]*
+
+REPLACE_PERL=		lib-src/grep-changelog
+
+SUBST_CLASSES+=			test_equal
+SUBST_STAGE.test_equal=		pre-configure
+SUBST_MESSAGE.test_equal=	Fixing bashisms in test(1) usage.
+SUBST_FILES.test_equal=		mac/make-package
+SUBST_SED.test_equal=		-e 's/ == / = /g'
+
+MAKE_DIRS_PERMS+=	${VARBASE}/games/emacs \
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE:Q}
+CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores \
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE:Q}
+CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores \
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE:Q}
+SPECIAL_PERMS+=		libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS}
+
+.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
+CPPFLAGS+=		-DDFLY_CRT_USRLIB
+.endif
+
+.include "../../mk/compiler.mk"
+
+# "emacs" uses the C pre-processor to generate makefiles. The C pre-processor
+# of newer GCC version is designed to break this by purpose. We work around
+# that using the traditional mode to generate makefiles. 
+.if !empty(CC_VERSION:Mgcc-[4-9].*)
+CPP+=		-P
+CONFIGURE_ENV+=	CPP=${CPP:Q}
+.endif
+
+post-extract:
+	cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp
+	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
+	${CHMOD} -R go-w ${WRKSRC}
+
+# These dirs are installed by tar-copy and can sometimes come out mode
+# 754, which if PKG_DEVELOPER is set causes the build to fail.
+post-install:
+.for file in leim leim/ja-dic leim/quail
+	${CHMOD} 755 ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/${file}
+.endfor
+
+
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"