7 files changed, 4 insertions, 210 deletions

diff --git a/irc/Makefile b/irc/Makefile
index effe2f8d3215..34dfcf175428 100644
--- a/irc/Makefile
+++ b/irc/Makefile
@@ -98,6 +98,7 @@
     SUBDIR += rbot
     SUBDIR += riece
     SUBDIR += riece-emacs20
+    SUBDIR += riece-emacs21
     SUBDIR += roxirc
     SUBDIR += ruby-irc
     SUBDIR += ruby-rica
diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile
index 462bf4cbd979..d8b5e0f2432f 100644
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@@ -4,35 +4,9 @@
 #
 # $FreeBSD$
 
-PORTNAME=	riece
-PORTVERSION=	4.0.0
-PORTEPOCH=	1
-CATEGORIES=	irc elisp
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-
-MAINTAINER=	yasu@utahime.org
-COMMENT=	IRC client for Emacs
+MASTERDIR=	${.CURDIR}/../riece
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
-		--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
-USE_GMAKE=	yes
-USE_RUBY=	yes
-RUBY_VER=	1.8
-
-INFO=	riece-en riece-ja
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in AUTHORS ChangeLog NEWS NEWS.ja README README.ja doc/HACKING doc/HACKING.ja
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
-	@${CAT} ${PKGMESSAGE}
+EMACS_PORT_NAME=	emacs21
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/irc/riece-emacs21/distinfo b/irc/riece-emacs21/distinfo
deleted file mode 100644
index 5bb1375155e6..000000000000
--- a/irc/riece-emacs21/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (riece-4.0.0.tar.gz) = 33056301675448150e96136a4a43f28d
-SHA256 (riece-4.0.0.tar.gz) = 035b7d3e624e230face7b1550df980214d23c01cb08ddd0c80b2781b5106bbe2
-SIZE (riece-4.0.0.tar.gz) = 373608
diff --git a/irc/riece-emacs21/pkg-descr b/irc/riece-emacs21/pkg-descr
deleted file mode 100644
index f86cdbccb15a..000000000000
--- a/irc/riece-emacs21/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Riece is an IRC client for Emacs. It provides the following features:
-
-- Several IRC servers may be used at the same time.
-- Essential features can be built upon the extension framework (called
-  "add-on") capable of dependency tracking.
-- Installation is easy.  Riece doesn't depend on other packages.
-- Setup is easy.  Automatically save/restore the configuration.
-- Riece uses separate windows to display users, channels, and
-  dialogues.  The user can select the window layout.
-- Step-by-step instructions (currently written in Japanese) are included.
-- Mostly compliant with RFC 2812.
-
-WWW: http://www.nongnu.org/riece/
diff --git a/irc/riece-emacs21/pkg-message b/irc/riece-emacs21/pkg-message
deleted file mode 100644
index a1dabae6abb6..000000000000
--- a/irc/riece-emacs21/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-**********************************************************************
-To use riece, you should add the following line to your .emacs file:
-
-(autoload 'riece "riece" "Start Riece" t)
-
-**********************************************************************
diff --git a/irc/riece-emacs21/pkg-plist b/irc/riece-emacs21/pkg-plist
deleted file mode 100644
index d2ff0ffa4654..000000000000
--- a/irc/riece-emacs21/pkg-plist
+++ /dev/null
@@ -1,158 +0,0 @@
-@comment $FreeBSD$
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-000.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-000.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-200.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-200.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-300.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-300.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-400.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-400.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-500.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-500.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-addon-modules.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-addon-modules.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-addon.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-addon.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-alias.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-alias.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-async.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-async.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-biff.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-biff.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-button.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-button.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-cache.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-cache.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-channel.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-channel.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-coding.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-coding.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-commands.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-commands.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-compat.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-compat.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-complete.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-complete.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-ctcp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-ctcp.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-ctlseq.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-ctlseq.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-debug.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-debug.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-display.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-display.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-doctor.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-doctor.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-emacs.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-emacs.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-epg.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-epg.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-eval-ruby.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-eval-ruby.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-eval.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-eval.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-filter.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-filter.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-foolproof.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-foolproof.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-globals.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-globals.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-google.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-google.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-guess.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-guess.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-handle.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-handle.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-hangman.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-hangman.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-highlight.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-highlight.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-history.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-history.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-icon.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-icon.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-identity.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-identity.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-ignore.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-ignore.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-irc.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-irc.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-kakasi.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-kakasi.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-keepalive.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-keepalive.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-keyword.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-keyword.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-layout.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-layout.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-log.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-log.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-lsdb.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-lsdb.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-mcat-japanese.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-mcat-japanese.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-mcat.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-mcat.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-menu.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-menu.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-message.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-message.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-mini.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-mini.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-misc.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-misc.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-mode.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-mode.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-naming.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-naming.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-options.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-options.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-package-info.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-package-info.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-rdcc.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-rdcc.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-ruby.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-ruby.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-server.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-server.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-shrink-buffer.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-shrink-buffer.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-signal.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-signal.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-skk-kakutei.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-skk-kakutei.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-toolbar.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-toolbar.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-twitter.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-twitter.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-unread.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-unread.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-url.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-url.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-user.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-user.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-version.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-version.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-xface.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-xface.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-xfaceb.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-xfaceb.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-yank.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-yank.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece.el
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/aproxy.rb
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/server.rb
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-command-next-channel.xpm
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-command-previous-channel.xpm
-%%EMACS_VERSION_SITE_LISPDIR%%/riece/riece-submit-bug-report.xpm
-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/riece
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS.ja
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.ja
-%%PORTDOCS%%%%DOCSDIR%%/HACKING
-%%PORTDOCS%%%%DOCSDIR%%/HACKING.ja
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 462bf4cbd979..432436e55263 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	yasu@utahime.org
 COMMENT=	IRC client for Emacs
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 		--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}