Make emacs and emacs-nox11 look more like xemacs and xemacs-nox11 in

terms of file structure.  Also add DESTDIR support.

5 files changed, 73 insertions, 91 deletions

diff --git a/editors/emacs-nox11/DESCR b/editors/emacs-nox11/DESCR
deleted file mode 100644
index 5856e3ec2a2..00000000000
--- a/editors/emacs-nox11/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-GNU Emacs is a self-documenting, customizable, extensible real-time
-display editor.
-
-Users new to Emacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-Emacs also has an extensive interactive manual browser.  It is easily
-extensible since its editing commands are written in Lisp.
-
-GNU Emacs's many special packages handle mail reading (RMail) and
-sending (Mail), outline editing (Outline), compiling (Compile),
-running subshells within Emacs windows (Shell), running a Lisp
-read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
-(Doctor :-) and many more.
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
index 6c76626f8f3..1bc5d346f8f 100644
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@@ -1,13 +1,16 @@
-# $NetBSD: Makefile,v 1.27 2007/08/13 12:40:57 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2008/04/25 16:35:32 jlam Exp $
 
-PKGNAME=	emacs-nox11-${EMACSVERSION}
-COMMENT_EXTRA=	: non-X11 version
+PKGNAME=	${DISTNAME:S/-/-nox11-/}
 
-CONFLICTS+=	emacs-[0-9]*
+FILESDIR=	${.CURDIR}/../../editors/emacs/files
+PATCHDIR=	${.CURDIR}/../../editors/emacs/patches
+PKGDIR=		${.CURDIR}/../../editors/emacs
+
+# Mirror PKG_DESTDIR_SUPPORT setting from emacs/Makefile.
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-# Forcibly remove any "x11" options.
 PKG_OPTIONS.emacs+=	-x11 -gtk -motif -xaw
 
 .include "../../editors/emacs/Makefile"
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 09902bc0c57..83374a16f0c 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,14 +1,66 @@
-# $NetBSD: Makefile,v 1.106 2007/12/06 12:10:32 markd Exp $
+# $NetBSD: Makefile,v 1.107 2008/04/25 16:35:32 jlam Exp $
 
-DISTNAME=	emacs-${EMACSVERSION}
+PKGNAME?=	${DISTNAME}
+COMMENT?=	GNU editing macros (editor)
+
+DISTNAME=	emacs-22.1
 PKGREVISION=	2
 CATEGORIES=	editors
-COMMENT=	GNU editing macros (editor)${COMMENT_EXTRA}
+MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 
-.include "../../editors/emacs/Makefile.common"
+MAINTAINER=	markd@NetBSD.org
+HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 
+CONFLICTS+=	elisp-manual-[0-9]*
+CONFLICTS+=	emacs-[0-9]*
 CONFLICTS+=	emacs-nox11-[0-9]*
+CONFLICTS+=	mule-[0-9]*
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_TOOLS+=		gmake gzip perl:run pkg-config
+GNU_CONFIGURE=		yes
+INFO_FILES=		# PLIST
 
 .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 \
+			${GAMEOWN:Q} ${GAMEGRP} ${GAMEDIRMODE:Q}
+CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores \
+			${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
+CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores \
+			${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
+SPECIAL_PERMS+=		libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEMODE:Q}
+
+.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtbegin.o)
+CPPFLAGS+=		-DDFLY_PRE_17_CRT
+.endif
+
+post-extract:
+	cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp
+	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
+
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common
deleted file mode 100644
index 6a68dfe4b6e..00000000000
--- a/editors/emacs/Makefile.common
+++ /dev/null
@@ -1,60 +0,0 @@
-# $NetBSD: Makefile.common,v 1.20 2008/02/16 13:46:09 wiz Exp $
-
-MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
-MAINTAINER=	markd@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
-
-CONFLICTS=	mule-[0-9]*
-CONFLICTS+=	elisp-manual-[0-9]*
-
-USE_TOOLS+=		gmake gzip perl:run pkg-config
-GNU_CONFIGURE=		yes
-
-PATCHDIR=	${.CURDIR}/../../editors/emacs/patches
-FILESDIR=	${.CURDIR}/../../editors/emacs/files
-DISTINFO_FILE=	${.CURDIR}/../../editors/emacs/distinfo
-PLIST_SRC=	${.CURDIR}/../../editors/emacs/PLIST
-
-EMACSVERSION=	22.1
-
-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-${EMACSVERSION}
-
-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 ${GAMEOWN:Q} ${GAMEGRP} ${GAMEDIRMODE:Q}
-CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
-CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
-SPECIAL_PERMS+=		${PREFIX}/libexec/emacs/22.1/${MACHINE_GNU_PLATFORM}/update-game-score ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEMODE:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "DragonFly" && exists(/usr/lib/crtbegin.o)
-CPPFLAGS+=	-DDFLY_PRE_17_CRT
-.endif
-
-INFO_FILES=	# PLIST
-REPLACE_PERL=	lib-src/grep-changelog
-
-post-extract:
-	${CP} ${FILESDIR}/site-init.el ${WRKSRC}/lisp
-	${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
-
-post-install:
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/emacs
-
-.include "../../mk/oss.buildlink3.mk"
-
diff --git a/editors/emacs/options.mk b/editors/emacs/options.mk
index d86de804c04..81a0e6f96db 100644
--- a/editors/emacs/options.mk
+++ b/editors/emacs/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2007/11/01 06:44:08 uebayasi Exp $
+# $NetBSD: options.mk,v 1.7 2008/04/25 16:35:32 jlam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.emacs
 PKG_SUPPORTED_OPTIONS=		x11
@@ -11,17 +11,19 @@ PKG_SUGGESTED_OPTIONS=		x11
 ###
 ### Any of the "toolkit" options implies "x11".
 ###
-.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxaw)
+.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mmotif) || \
+    !empty(PKG_OPTIONS:Mxaw)
 .  if empty(PKG_OPTIONS:Mx11)
 PKG_OPTIONS+=		x11
 .  endif
 .endif
 
 ###
-### Default to using the Xaw X11 toolkit if none is specified.
+### Default to using the Athena X11 toolkit if none is specified.
 ###
 .if !empty(PKG_OPTIONS:Mx11)
-.  if empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mmotif) && empty(PKG_OPTIONS:Mxaw)
+.  if empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mmotif) && \
+      empty(PKG_OPTIONS:Mxaw)
 PKG_OPTIONS+=		xaw
 .  endif
 .endif
@@ -53,13 +55,11 @@ CONFIGURE_ARGS+=	--without-tiff
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--without-xpm
 .  if exists(/System/Library/Frameworks/Carbon.framework)
-APPLICATIONS_DIR=	Applications
 CONFIGURE_ARGS+=	--with-carbon
-CONFIGURE_ARGS+=	--enable-carbon-app=${PREFIX}/${APPLICATIONS_DIR}
+CONFIGURE_ARGS+=	--enable-carbon-app=${PREFIX}/Applications
 PLIST_SRC+=		PLIST.carbon
-PLIST_SUBST+=		APPLIDATIONS_DIR=${APPLICATIONS_DIR:Q}
-INSTALLATION_DIRS+=	${APPLICATIONS_DIR}
-CHECK_WRKREF_SKIP+=	${APPLICATIONS_DIR}/Emacs.app/Contents/MacOS/Emacs
+INSTALLATION_DIRS+=	Applications
+CHECK_WRKREF_SKIP+=	Applications/Emacs.app/Contents/MacOS/Emacs
 .  endif
 .endif