Add emacs21 support for pure and irchat-pj.

Submitted by:	Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>

6 files changed, 34 insertions, 8 deletions

diff --git a/irc/Makefile b/irc/Makefile
index 8443c21b8de7..b17351688a28 100644
--- a/irc/Makefile
+++ b/irc/Makefile
@@ -15,6 +15,7 @@
     SUBDIR += ircatlite
     SUBDIR += ircd-hybrid
     SUBDIR += irchat-pj-emacs20
+    SUBDIR += irchat-pj-emacs21
     SUBDIR += irchat-pj-xemacs21-mule
     SUBDIR += iroffer
     SUBDIR += irssi
@@ -30,6 +31,7 @@
     SUBDIR += p5-POE-Component-IRC
     SUBDIR += party
     SUBDIR += pure-emacs20
+    SUBDIR += pure-emacs21
     SUBDIR += pure-xemacs21-mule
     SUBDIR += py-irclib
     SUBDIR += quirc
diff --git a/irc/irchat-pj-emacs20/Makefile b/irc/irchat-pj-emacs20/Makefile
index e659c319d36a..a650c80cda37 100644
--- a/irc/irchat-pj-emacs20/Makefile
+++ b/irc/irchat-pj-emacs20/Makefile
@@ -19,16 +19,16 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
 
-BUILD_DEPENDS=	${LOCALBASE}/${LISPDIR:S,/${PORTNAME}$,/pure,}/pure-make.el:${PORTSDIR}/irc/pure-${EMACS_PORT_NAME}
-RUN_DEPENDS=	${LOCALBASE}/${LISPDIR:S,/${PORTNAME}$,/pure,}/pure-make.el:${PORTSDIR}/irc/pure-${EMACS_PORT_NAME} \
+BUILD_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/pure/pure-make.el:${PORTSDIR}/irc/pure-${EMACS_PORT_NAME}
+RUN_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/pure/pure-make.el:${PORTSDIR}/irc/pure-${EMACS_PORT_NAME} \
 		${LOCALBASE}/bin/dcc:${PORTSDIR}/irc/dcc
 
 EMACS_PORT_NAME?=	emacs20
 XEMACS_ONLY?=	"@comment "
-LISPDIR?=	${EMACS_LIBDIR}/site-lisp/${PORTNAME}
+LISPDIR?=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 ETCDIR=		share/doc/${PORTNAME}
 
-MAKE_ENV+=	LISPDIR=${PREFIX}/${EMACS_SITE_LISPDIR} \
+MAKE_ARGS+=	LISPDIR=${PREFIX}/${LISPDIR} \
 		PACKDIR=${PREFIX}/${EMACS_LIBDIR}/site-packages
 
 DOCS=		README.25 doc24/CHANGELOG doc24/FAQ-about-jp24.txt\
diff --git a/irc/irchat-pj-emacs21/Makefile b/irc/irchat-pj-emacs21/Makefile
new file mode 100644
index 000000000000..6f3f413cb957
--- /dev/null
+++ b/irc/irchat-pj-emacs21/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	irchat-pj (for emacs21)
+# Date Created:		29 Oct 2001
+# Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
+#
+# $FreeBSD$
+#
+
+MASTERDIR=	${.CURDIR}/../irchat-pj-emacs20
+
+EMACS_PORT_NAME=	emacs21
+
+.include <${MASTERDIR}/Makefile>
diff --git a/irc/pure-emacs20/Makefile b/irc/pure-emacs20/Makefile
index c0b4f63d2335..c5e434f79097 100644
--- a/irc/pure-emacs20/Makefile
+++ b/irc/pure-emacs20/Makefile
@@ -20,15 +20,15 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
 
 EMACS_PORT_NAME?=	emacs20
-LISPDIR?=	${EMACS_SITE_LISPDIR}
+LISPDIR?=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 EMACS_ONLY?=	""
 XEMACS_ONLY?=	"@comment "
 PUREBIN?=	bin
-MAKE_ENV+=	LISPDIR=${PREFIX}/${EMACS_SITE_LISPDIR} \
+MAKE_ARGS+=	LISPDIR=${PREFIX}/${LISPDIR} \
 		PACKDIR=${PREFIX}/${EMACS_LIBDIR}/site-packages \
 		BINDIR=${PREFIX}/${PUREBIN}
 
-PLIST_SUB=	PURELISP=${LISPDIR}/${PORTNAME} \
+PLIST_SUB=	PURELISP=${LISPDIR} \
 		EMACS_ONLY=${EMACS_ONLY} \
 		XEMACS_ONLY=${XEMACS_ONLY} \
 		PUREBIN=${PUREBIN}
diff --git a/irc/pure-emacs21/Makefile b/irc/pure-emacs21/Makefile
new file mode 100644
index 000000000000..3ad5744eee1f
--- /dev/null
+++ b/irc/pure-emacs21/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	pure (for emacs21)
+# Date Created:		29 Oct 2001
+# Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
+#
+# $FreeBSD$
+#
+
+MASTERDIR=	${.CURDIR}/../pure-emacs20
+
+EMACS_PORT_NAME=	emacs21
+
+.include <${MASTERDIR}/Makefile>
diff --git a/irc/pure-xemacs21-mule/Makefile b/irc/pure-xemacs21-mule/Makefile
index 0ca393bf4613..3a1ee41ed3bc 100644
--- a/irc/pure-xemacs21-mule/Makefile
+++ b/irc/pure-xemacs21-mule/Makefile
@@ -8,7 +8,7 @@
 MASTERDIR=	${.CURDIR}/../pure-emacs20
 
 EMACS_PORT_NAME=	xemacs21-mule
-LISPDIR=		${EMACS_LIBDIR}/site-packages/lisp
+LISPDIR=		${EMACS_LIBDIR}/site-packages/lisp/${PORTNAME}
 EMACS_ONLY=		"@comment "
 XEMACS_ONLY=		""
 ALL_TARGET=		package c