* Copy the contents of the master port irc/irchat-pj-emacs20 to the slave port

  irc/irchat-pj-emacs21 because the former is deprecated and going to be removed
  soon. Adjust it to point to emacs21 by default.

* Adjust the slave port irc/irchat-pj-xemacs21-mule to point to the newly
  created master port irc/irchat-pj-emacs21.

4 files changed, 84 insertions, 5 deletions

diff --git a/irc/irchat-pj-emacs21/Makefile b/irc/irchat-pj-emacs21/Makefile
index 1dbcb64c9e10..8868dac2d8f0 100644
--- a/irc/irchat-pj-emacs21/Makefile
+++ b/irc/irchat-pj-emacs21/Makefile
@@ -1,13 +1,54 @@
-# New ports collection makefile for:	irchat-pj (for emacs21)
-# Date Created:		29 Oct 2001
+# New ports collection makefile for:	irchat-pj (for emacs20)
+# Date Created:		2 May 2001
 # Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../irchat-pj-emacs20
+PORTNAME=	irchat-pj
+PORTVERSION=	2.5.6
+PORTREVISION=	2
+CATEGORIES=	irc elisp
+MASTER_SITES=	http://his.luky.org/ftp/mirrors/irchat-pj/2.5/
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION}p
 
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	${PORTNAME}-${PORTVERSION}pl2.diff.gz
+PATCH_DIST_STRIP=	-p1
+
+MAINTAINER=	yoichi@FreeBSD.org
+COMMENT=	IRC client which runs under Emacsen
+
+BUILD_DEPENDS=	${LOCALBASE}/${LISPDIR:S,${PORTNAME},pure,g}/pure-make.el:${PORTSDIR}/irc/pure-${EMACS_PORT_NAME}
+RUN_DEPENDS=	${LOCALBASE}/${LISPDIR:S,${PORTNAME},pure,g}/pure-make.el:${PORTSDIR}/irc/pure-${EMACS_PORT_NAME} \
+		${LOCALBASE}/bin/dcc:${PORTSDIR}/irc/dcc
+
+USE_BZIP2=	yes
 USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
+EMACS_PORT_NAME?=	emacs21
+XEMACS_ONLY?=	"@comment "
+LISPDIR?=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+ETCDIR=		share/doc/${PORTNAME}
+
+MAKE_ARGS+=	LISPDIR=${PREFIX}/${LISPDIR} \
+		PACKDIR=${PREFIX}/${EMACS_LIBDIR}/site-packages
+
+DOCS=		README.25 doc24/CHANGELOG doc24/FAQ-about-jp24.txt\
+		doc24/FAQ-irchat-PJ.txt doc24/INSTALL.irchat-pj\
+		doc24/README.browse-url-plus doc24/README.irchat-pj\
+		doc24/browse-url-plus-init.el doc24/dot.irchat_vars.el
+
+PLIST_SUB=	LISPDIR=${LISPDIR} \
+		ETCDIR=${ETCDIR} \
+		XEMACS_ONLY=${XEMACS_ONLY}
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/${ETCDIR}
+.for f in ${DOCS}
+	${INSTALL_MAN} ${WRKSRC}/${f} ${PREFIX}/${ETCDIR}
+.endfor
+.endif
 
-.include "${MASTERDIR}/Makefile"
+.include <bsd.port.mk>
diff --git a/irc/irchat-pj-emacs21/distinfo b/irc/irchat-pj-emacs21/distinfo
new file mode 100644
index 000000000000..103d524a0b00
--- /dev/null
+++ b/irc/irchat-pj-emacs21/distinfo
@@ -0,0 +1,6 @@
+MD5 (irchat-pj-2.5.6p.tar.bz2) = b1a33999e08ea55874abc789c41b4c69
+SHA256 (irchat-pj-2.5.6p.tar.bz2) = 28b27ee9df9c8aaee4da7211f026f33c4bccf0d40640bc5c30fc771d4dc2cd45
+SIZE (irchat-pj-2.5.6p.tar.bz2) = 80707
+MD5 (irchat-pj-2.5.6pl2.diff.gz) = a49ce68ff200756a57dde96c459eee94
+SHA256 (irchat-pj-2.5.6pl2.diff.gz) = 26528fb25464d9bdc4b9040a2f00be3ff6a92cd47822cd9e9d20aa7943705b36
+SIZE (irchat-pj-2.5.6pl2.diff.gz) = 2382
diff --git a/irc/irchat-pj-emacs21/pkg-descr b/irc/irchat-pj-emacs21/pkg-descr
new file mode 100644
index 000000000000..d123196e72c4
--- /dev/null
+++ b/irc/irchat-pj-emacs21/pkg-descr
@@ -0,0 +1,6 @@
+irchat-pj is an IRC client which runs under Emacsen.
+
+Put the following line in your ~/.emacs:
+(autoload 'irchat "irchat" nil t)
+
+WWW: http://gouketsu.net/irchat-pj/
diff --git a/irc/irchat-pj-emacs21/pkg-plist b/irc/irchat-pj-emacs21/pkg-plist
new file mode 100644
index 000000000000..9df140d2b7dc
--- /dev/null
+++ b/irc/irchat-pj-emacs21/pkg-plist
@@ -0,0 +1,26 @@
+%%LISPDIR%%/irchat-commands.el
+%%LISPDIR%%/irchat-commands.elc
+%%LISPDIR%%/irchat-filter.el
+%%LISPDIR%%/irchat-filter.elc
+%%LISPDIR%%/irchat-handle.el
+%%LISPDIR%%/irchat-handle.elc
+%%LISPDIR%%/irchat-pj-modeline.el
+%%LISPDIR%%/irchat-pj-modeline.elc
+%%LISPDIR%%/irchat-pj-sound.el
+%%LISPDIR%%/irchat-pj-sound.elc
+%%LISPDIR%%/irchat-vars.el
+%%LISPDIR%%/irchat-vars.elc
+%%LISPDIR%%/irchat.el
+%%LISPDIR%%/irchat.elc
+@dirrm %%LISPDIR%%
+%%ETCDIR%%/README.25
+%%ETCDIR%%/CHANGELOG
+%%ETCDIR%%/FAQ-about-jp24.txt
+%%ETCDIR%%/FAQ-irchat-PJ.txt
+%%ETCDIR%%/INSTALL.irchat-pj
+%%ETCDIR%%/README.browse-url-plus
+%%ETCDIR%%/README.irchat-pj
+%%ETCDIR%%/browse-url-plus-init.el
+%%ETCDIR%%/dot.irchat_vars.el
+@dirrm %%ETCDIR%%
+%%XEMACS_ONLY%%lib/xemacs/site-packages/pkginfo/MANIFEST.irchat-pj