Move master port to irc/liece and add support for emacs21.

Approved by:	knu(mentor)

18 files changed, 254 insertions, 640 deletions

diff --git a/irc/Makefile b/irc/Makefile
index b17351688a28..3f13cb7d8d23 100644
--- a/irc/Makefile
+++ b/irc/Makefile
@@ -20,6 +20,7 @@
     SUBDIR += iroffer
     SUBDIR += irssi
     SUBDIR += kvirc
+    SUBDIR += liece
     SUBDIR += liece-dcc
     SUBDIR += liece-emacs20
     SUBDIR += liece-xemacs21-mule
diff --git a/irc/liece-emacs20/Makefile b/irc/liece-emacs20/Makefile
index 27d6f51343bc..d9137de0c301 100644
--- a/irc/liece-emacs20/Makefile
+++ b/irc/liece-emacs20/Makefile
@@ -1,76 +1,13 @@
-# New ports collection makefile for:	liece
+# New ports collection makefile for:	liece (for emacs20)
 # Date Created:		9 Mar 2001
 # Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	liece
-PORTVERSION=	1.4.4
-PORTREVISION=	2
-CATEGORIES=	irc elisp
-MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
+MASTERDIR=	${.CURDIR}/../liece
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
-		${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
-		${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
+EMACS_PORT_NAME=	emacs20
 
-EMACS_PORT_NAME?=	emacs20
-LISPDIR?=		${EMACS_LIBDIR}/site-lisp/${PORTNAME}
-ETCDIR?=		share/${PORTNAME}
-PKGINFODIR?=		"@comment "
-
-# INFODIR is system reserved
-EMACS_INFODIR?=		info
-DIRSECTION?=		"The Emacs editor and associated tools"
-INFOENTRY?=		"* Liece: (liece).		IRC client on Emacsen."
-
-HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ARGS+=	--with-emacs="${EMACS_CMD}"
-ALL_TARGET=	all sample.dot.emacs
-PLIST_SUB=	EMACS_NAME=${EMACS_NAME} \
-		XEMACS_ONLY=${XEMACS_ONLY} \
-		EMACS_ONLY=${EMACS_ONLY} \
-		LISPDIR=${LISPDIR} \
-		ETCDIR=${ETCDIR} \
-		EMACS_INFODIR=${EMACS_INFODIR} \
-		PKGINFODIR=${PKGINFODIR} \
-		DIRSECTION=${DIRSECTION} \
-		INFOENTRY=${INFOENTRY}
-
-DOCS=		AUTHORS lisp/ChangeLog
-
-FLIM_BRANCH=	1.13
-FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
-
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_NAME} == xemacs
-XEMACS_ONLY?=		""
-EMACS_ONLY?=		"@comment "
-.else
-XEMACS_ONLY?=		"@comment "
-EMACS_ONLY?=		""
-.endif
-
-post-install:
-	${MKDIR} ${PREFIX}/${ETCDIR}/po/ja_JP.EUC/LC_MESSAGES
-	${LN} -sf ja_JP.EUC ${PREFIX}/${ETCDIR}/po/ja
-	msgfmt -o ${PREFIX}/${ETCDIR}/po/ja_JP.EUC/LC_MESSAGES/liece.mo ${WRKSRC}/etc/po/ja.po	
-.if !defined(NOPORTDOCS)
-	${INSTALL_DATA} ${WRKSRC}/sample.dot.emacs ${PREFIX}/${ETCDIR}/
-	${MKDIR} ${PREFIX}/${ETCDIR}/doc
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${ETCDIR}/doc/
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/doc/liece.info ${PREFIX}/${EMACS_INFODIR}/
-	install-info --section=${DIRSECTION} --entry=${INFOENTRY} \
-		${PREFIX}/${EMACS_INFODIR}/liece.info ${PREFIX}/${EMACS_INFODIR}/dir
-.endif
-
-.include <bsd.port.post.mk>
+.include <${MASTERDIR}/Makefile>
diff --git a/irc/liece-emacs20/distinfo b/irc/liece-emacs20/distinfo
deleted file mode 100644
index e78ea16f3ae5..000000000000
--- a/irc/liece-emacs20/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (liece-1.4.4.tar.gz) = e2ad08e4c80c4a5a9d323f736a54e91e
-MD5 (liece-1.4.4-1.4.5.p2001.02.12.gz) = 3ef95c08f9631c61c8fda17469136fa8
diff --git a/irc/liece-emacs20/pkg-comment b/irc/liece-emacs20/pkg-comment
deleted file mode 100644
index eeb112edeec2..000000000000
--- a/irc/liece-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another IRC client which runs under Emacsen
diff --git a/irc/liece-emacs20/pkg-descr b/irc/liece-emacs20/pkg-descr
deleted file mode 100644
index efd34f582918..000000000000
--- a/irc/liece-emacs20/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Liece is an IRC client which runs under Emacsen.
-
-Put the expression below into your ~/.emacs.
-
-(autoload 'liece "liece" nil t)
-
-WWW: http://www.unixuser.org/~ueno/liece/index.html.en
diff --git a/irc/liece-emacs20/pkg-plist b/irc/liece-emacs20/pkg-plist
deleted file mode 100644
index ec9354368363..000000000000
--- a/irc/liece-emacs20/pkg-plist
+++ /dev/null
@@ -1,123 +0,0 @@
-%%PKGINFODIR%%/MANIFEST.liece
-%%ETCDIR%%/icons/back.xpm
-%%ETCDIR%%/icons/ball.blank.xpm
-%%ETCDIR%%/icons/ball.gray.xpm
-%%ETCDIR%%/icons/ball.red.xpm
-%%ETCDIR%%/icons/balloon.xpm
-%%ETCDIR%%/icons/crypt.xpm
-%%ETCDIR%%/icons/encrypt.xpm
-%%ETCDIR%%/icons/forward.xpm
-%%ETCDIR%%/icons/home.xpm
-%%ETCDIR%%/icons/icons.gif
-%%ETCDIR%%/icons/icons.xpm
-%%ETCDIR%%/icons/key.xpm
-%%ETCDIR%%/icons/liece-pointer.xbm
-%%ETCDIR%%/icons/liece-pointer.xpm
-%%ETCDIR%%/icons/location.xpm
-%%ETCDIR%%/icons/naruto.blank.xpm
-%%ETCDIR%%/icons/naruto.gray.xpm
-%%ETCDIR%%/icons/naruto.red.xpm
-%%ETCDIR%%/icons/pindown.xpm
-%%ETCDIR%%/icons/print.xpm
-%%ETCDIR%%/icons/reload.xpm
-%%ETCDIR%%/icons/search.xpm
-%%ETCDIR%%/icons/stop.xpm
-%%ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES/liece.mo
-%%ETCDIR%%/po/ja.po
-%%ETCDIR%%/po/ja
-%%ETCDIR%%/styles/bottom
-%%ETCDIR%%/styles/middle
-%%ETCDIR%%/styles/top
-%%PORTDOCS%%@unexec install-info --delete --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/%%EMACS_INFODIR%%/liece.info %D/%%EMACS_INFODIR%%/dir
-%%PORTDOCS%%%%EMACS_INFODIR%%/liece.info
-%%PORTDOCS%%@exec install-info --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/%%EMACS_INFODIR%%/liece.info %D/%%EMACS_INFODIR%%/dir
-%%PORTDOCS%%%%ETCDIR%%/doc/AUTHORS
-%%PORTDOCS%%%%ETCDIR%%/doc/ChangeLog
-%%PORTDOCS%%@dirrm %%ETCDIR%%/doc
-%%PORTDOCS%%%%ETCDIR%%/sample.dot.emacs
-@dirrm %%ETCDIR%%/icons
-@dirrm %%ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES
-@dirrm %%ETCDIR%%/po/ja_JP.EUC
-@dirrm %%ETCDIR%%/po
-@dirrm %%ETCDIR%%/styles
-@dirrm %%ETCDIR%%
-%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el
-%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.elc
-%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.el
-%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.elc
-%%EMACS_ONLY%%%%LISPDIR%%/bitmap-stipple.el
-%%EMACS_ONLY%%%%LISPDIR%%/bitmap-stipple.elc
-%%LISPDIR%%/gettext.el
-%%LISPDIR%%/gettext.elc
-%%LISPDIR%%/liece-000.el
-%%LISPDIR%%/liece-000.elc
-%%LISPDIR%%/liece-200.el
-%%LISPDIR%%/liece-200.elc
-%%LISPDIR%%/liece-300.el
-%%LISPDIR%%/liece-300.elc
-%%LISPDIR%%/liece-400.el
-%%LISPDIR%%/liece-400.elc
-%%LISPDIR%%/liece-500.el
-%%LISPDIR%%/liece-500.elc
-%%LISPDIR%%/liece-channel.el
-%%LISPDIR%%/liece-channel.elc
-%%LISPDIR%%/liece-clfns.el
-%%LISPDIR%%/liece-clfns.elc
-%%LISPDIR%%/liece-coding.el
-%%LISPDIR%%/liece-coding.elc
-%%LISPDIR%%/liece-commands.el
-%%LISPDIR%%/liece-commands.elc
-%%LISPDIR%%/liece-compat.el
-%%LISPDIR%%/liece-compat.elc
-%%LISPDIR%%/liece-ctcp.el
-%%LISPDIR%%/liece-ctcp.elc
-%%LISPDIR%%/liece-dcc.el
-%%LISPDIR%%/liece-dcc.elc
-%%LISPDIR%%/liece-filter.el
-%%LISPDIR%%/liece-filter.elc
-%%LISPDIR%%/liece-globals.el
-%%LISPDIR%%/liece-globals.elc
-%%LISPDIR%%/liece-handle.el
-%%LISPDIR%%/liece-handle.elc
-%%LISPDIR%%/liece-handler.el
-%%LISPDIR%%/liece-handler.elc
-%%LISPDIR%%/liece-hilit.el
-%%LISPDIR%%/liece-hilit.elc
-%%LISPDIR%%/liece-inlines.el
-%%LISPDIR%%/liece-inlines.elc
-%%LISPDIR%%/liece-intl.el
-%%LISPDIR%%/liece-intl.elc
-%%LISPDIR%%/liece-mail.el
-%%LISPDIR%%/liece-mail.elc
-%%LISPDIR%%/liece-menu.el
-%%LISPDIR%%/liece-menu.elc
-%%LISPDIR%%/liece-message.el
-%%LISPDIR%%/liece-message.elc
-%%LISPDIR%%/liece-minibuf.el
-%%LISPDIR%%/liece-minibuf.elc
-%%LISPDIR%%/liece-misc.el
-%%LISPDIR%%/liece-misc.elc
-%%LISPDIR%%/liece-nick.el
-%%LISPDIR%%/liece-nick.elc
-%%LISPDIR%%/liece-q-ccl.el
-%%LISPDIR%%/liece-q-ccl.elc
-%%LISPDIR%%/liece-q-el.el
-%%LISPDIR%%/liece-q-el.elc
-%%LISPDIR%%/liece-setup.el
-%%LISPDIR%%/liece-tcp.el
-%%LISPDIR%%/liece-tcp.elc
-%%LISPDIR%%/liece-url.el
-%%LISPDIR%%/liece-url.elc
-%%LISPDIR%%/liece-vars.el
-%%LISPDIR%%/liece-vars.elc
-%%LISPDIR%%/liece-version.el
-%%LISPDIR%%/liece-version.elc
-%%LISPDIR%%/liece-window.el
-%%LISPDIR%%/liece-window.elc
-%%LISPDIR%%/liece-x-face.el
-%%LISPDIR%%/liece-x-face.elc
-%%LISPDIR%%/liece-%%EMACS_NAME%%.el
-%%LISPDIR%%/liece-%%EMACS_NAME%%.elc
-%%LISPDIR%%/liece.el
-%%LISPDIR%%/liece.elc
-@dirrm %%LISPDIR%%
diff --git a/irc/liece-xemacs21-mule/Makefile b/irc/liece-xemacs21-mule/Makefile
index a2315c60e529..b14da6425087 100644
--- a/irc/liece-xemacs21-mule/Makefile
+++ b/irc/liece-xemacs21-mule/Makefile
@@ -1,19 +1,12 @@
-# New ports collection makefile for:	liece-xemacs21-mule
+# New ports collection makefile for:	liece (for xemacs21-mule)
 # Date Created:		9 Mar 2001
 # Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../liece-emacs20
+MASTERDIR=	${.CURDIR}/../liece
 
 EMACS_PORT_NAME=	xemacs21-mule
-EMACS_PACKAGESDIR=	lib/xemacs/site-packages
-LISPDIR=		${EMACS_PACKAGESDIR}/lisp/${PORTNAME}
-ETCDIR=			${EMACS_PACKAGESDIR}/etc/${PORTNAME}
-EMACS_INFODIR=		${EMACS_PACKAGESDIR}/info
-PKGINFODIR=		${EMACS_PACKAGESDIR}/pkginfo
-
-CONFIGURE_ARGS=	--enable-package
 
 .include <${MASTERDIR}/Makefile>
diff --git a/irc/liece/Makefile b/irc/liece/Makefile
index 27d6f51343bc..b4dfeb915822 100644
--- a/irc/liece/Makefile
+++ b/irc/liece/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	liece
+# New ports collection makefile for:	liece (for emacs21)
 # Date Created:		9 Mar 2001
 # Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 #
@@ -12,65 +12,68 @@ CATEGORIES=	irc elisp
 MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
+MAINTAINER=	yoichi@FreeBSD.org
 
 BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
 		${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
 RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
 		${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
 
-EMACS_PORT_NAME?=	emacs20
-LISPDIR?=		${EMACS_LIBDIR}/site-lisp/${PORTNAME}
-ETCDIR?=		share/${PORTNAME}
-PKGINFODIR?=		"@comment "
-
-# INFODIR is system reserved
-EMACS_INFODIR?=		info
-DIRSECTION?=		"The Emacs editor and associated tools"
-INFOENTRY?=		"* Liece: (liece).		IRC client on Emacsen."
-
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS+=	--with-emacs="${EMACS_CMD}"
-ALL_TARGET=	all sample.dot.emacs
-PLIST_SUB=	EMACS_NAME=${EMACS_NAME} \
-		XEMACS_ONLY=${XEMACS_ONLY} \
-		EMACS_ONLY=${EMACS_ONLY} \
-		LISPDIR=${LISPDIR} \
-		ETCDIR=${ETCDIR} \
-		EMACS_INFODIR=${EMACS_INFODIR} \
-		PKGINFODIR=${PKGINFODIR} \
-		DIRSECTION=${DIRSECTION} \
-		INFOENTRY=${INFOENTRY}
-
-DOCS=		AUTHORS lisp/ChangeLog
 
 FLIM_BRANCH=	1.13
 FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
 
-.include <bsd.port.pre.mk>
+EMACS_PORT_NAME?=	emacs21
+CONFIGURE_ARGS+=	--with-emacs=${EMACS_CMD} --datadir=${PREFIX}/${EMACS_ETCDIR}
 
-.if ${EMACS_NAME} == xemacs
-XEMACS_ONLY?=		""
-EMACS_ONLY?=		"@comment "
+DIRSECTION?=		"The Emacs editor and associated tools"
+INFOENTRY?=		"* Liece: (liece).		IRC client on Emacsen."
+
+.if ${EMACS_PORT_NAME} == xemacs21-mule
+EMACS_PACKAGESDIR=	${EMACS_LIBDIR}/site-packages
+LISPDIR=		${EMACS_PACKAGESDIR}/lisp
+EMACS_ETCDIR=		${EMACS_PACKAGESDIR}/etc
+EMACS_INFODIR=		${EMACS_PACKAGESDIR}/info
+PKGINFODIR=		${EMACS_PACKAGESDIR}/pkginfo
+CONFIGURE_ARGS+=	--enable-package
+XEMACS_ONLY=		""
+EMACS_ONLY=		"@comment "
 .else
-XEMACS_ONLY?=		"@comment "
-EMACS_ONLY?=		""
+LISPDIR=		${EMACS_VERSION_SITE_LISPDIR}
+EMACS_ETCDIR=		share
+EMACS_INFODIR=		info
+PKGINFODIR=		"@comment "
+MAKE_ARGS+=		LISPDIR=${PREFIX}/${LISPDIR}
+XEMACS_ONLY=		"@comment "
+EMACS_ONLY=		""
 .endif
+LIECE_ETCDIR=	${EMACS_ETCDIR}/${PORTNAME}
+
+ALL_TARGET=	all sample.dot.emacs
+PLIST_SUB=	EMACS_NAME=${EMACS_NAME} \
+		XEMACS_ONLY=${XEMACS_ONLY} EMACS_ONLY=${EMACS_ONLY} \
+		LISPDIR=${LISPDIR}/${PORTNAME} LIECE_ETCDIR=${LIECE_ETCDIR} \
+		PKGINFODIR=${PKGINFODIR} \
+		EMACS_INFODIR=${EMACS_INFODIR} \
+		DIRSECTION=${DIRSECTION} INFOENTRY=${INFOENTRY}
+
+DOCS=		AUTHORS lisp/ChangeLog
 
 post-install:
-	${MKDIR} ${PREFIX}/${ETCDIR}/po/ja_JP.EUC/LC_MESSAGES
-	${LN} -sf ja_JP.EUC ${PREFIX}/${ETCDIR}/po/ja
-	msgfmt -o ${PREFIX}/${ETCDIR}/po/ja_JP.EUC/LC_MESSAGES/liece.mo ${WRKSRC}/etc/po/ja.po	
+	${MKDIR} ${PREFIX}/${LIECE_ETCDIR}/po/ja_JP.EUC/LC_MESSAGES
+	${LN} -sf ja_JP.EUC ${PREFIX}/${LIECE_ETCDIR}/po/ja
+	msgfmt -o ${PREFIX}/${LIECE_ETCDIR}/po/ja_JP.EUC/LC_MESSAGES/liece.mo ${WRKSRC}/etc/po/ja.po
 .if !defined(NOPORTDOCS)
-	${INSTALL_DATA} ${WRKSRC}/sample.dot.emacs ${PREFIX}/${ETCDIR}/
-	${MKDIR} ${PREFIX}/${ETCDIR}/doc
+	${INSTALL_DATA} ${WRKSRC}/sample.dot.emacs ${PREFIX}/${LIECE_ETCDIR}/
+	${MKDIR} ${PREFIX}/${LIECE_ETCDIR}/doc
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${ETCDIR}/doc/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${LIECE_ETCDIR}/doc/
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/liece.info ${PREFIX}/${EMACS_INFODIR}/
 	install-info --section=${DIRSECTION} --entry=${INFOENTRY} \
 		${PREFIX}/${EMACS_INFODIR}/liece.info ${PREFIX}/${EMACS_INFODIR}/dir
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/liece/pkg-plist b/irc/liece/pkg-plist
index ec9354368363..a08c4228b73a 100644
--- a/irc/liece/pkg-plist
+++ b/irc/liece/pkg-plist
@@ -1,46 +1,47 @@
 %%PKGINFODIR%%/MANIFEST.liece
-%%ETCDIR%%/icons/back.xpm
-%%ETCDIR%%/icons/ball.blank.xpm
-%%ETCDIR%%/icons/ball.gray.xpm
-%%ETCDIR%%/icons/ball.red.xpm
-%%ETCDIR%%/icons/balloon.xpm
-%%ETCDIR%%/icons/crypt.xpm
-%%ETCDIR%%/icons/encrypt.xpm
-%%ETCDIR%%/icons/forward.xpm
-%%ETCDIR%%/icons/home.xpm
-%%ETCDIR%%/icons/icons.gif
-%%ETCDIR%%/icons/icons.xpm
-%%ETCDIR%%/icons/key.xpm
-%%ETCDIR%%/icons/liece-pointer.xbm
-%%ETCDIR%%/icons/liece-pointer.xpm
-%%ETCDIR%%/icons/location.xpm
-%%ETCDIR%%/icons/naruto.blank.xpm
-%%ETCDIR%%/icons/naruto.gray.xpm
-%%ETCDIR%%/icons/naruto.red.xpm
-%%ETCDIR%%/icons/pindown.xpm
-%%ETCDIR%%/icons/print.xpm
-%%ETCDIR%%/icons/reload.xpm
-%%ETCDIR%%/icons/search.xpm
-%%ETCDIR%%/icons/stop.xpm
-%%ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES/liece.mo
-%%ETCDIR%%/po/ja.po
-%%ETCDIR%%/po/ja
-%%ETCDIR%%/styles/bottom
-%%ETCDIR%%/styles/middle
-%%ETCDIR%%/styles/top
+%%LIECE_ETCDIR%%/icons/back.xpm
+%%LIECE_ETCDIR%%/icons/ball.blank.xpm
+%%LIECE_ETCDIR%%/icons/ball.gray.xpm
+%%LIECE_ETCDIR%%/icons/ball.red.xpm
+%%LIECE_ETCDIR%%/icons/balloon.xpm
+%%LIECE_ETCDIR%%/icons/crypt.xpm
+%%LIECE_ETCDIR%%/icons/encrypt.xpm
+%%LIECE_ETCDIR%%/icons/forward.xpm
+%%LIECE_ETCDIR%%/icons/home.xpm
+%%LIECE_ETCDIR%%/icons/icons.gif
+%%LIECE_ETCDIR%%/icons/icons.xpm
+%%LIECE_ETCDIR%%/icons/key.xpm
+%%LIECE_ETCDIR%%/icons/liece-pointer.xbm
+%%LIECE_ETCDIR%%/icons/liece-pointer.xpm
+%%LIECE_ETCDIR%%/icons/location.xpm
+%%LIECE_ETCDIR%%/icons/naruto.blank.xpm
+%%LIECE_ETCDIR%%/icons/naruto.gray.xpm
+%%LIECE_ETCDIR%%/icons/naruto.red.xpm
+%%LIECE_ETCDIR%%/icons/pindown.xpm
+%%LIECE_ETCDIR%%/icons/print.xpm
+%%LIECE_ETCDIR%%/icons/reload.xpm
+%%LIECE_ETCDIR%%/icons/search.xpm
+%%LIECE_ETCDIR%%/icons/stop.xpm
+%%LIECE_ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES/liece.mo
+@exec ln -sf ja_JP.EUC %D/%%LIECE_ETCDIR%%/po/ja
+%%LIECE_ETCDIR%%/po/ja.po
+%%LIECE_ETCDIR%%/styles/bottom
+%%LIECE_ETCDIR%%/styles/middle
+%%LIECE_ETCDIR%%/styles/top
 %%PORTDOCS%%@unexec install-info --delete --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/%%EMACS_INFODIR%%/liece.info %D/%%EMACS_INFODIR%%/dir
 %%PORTDOCS%%%%EMACS_INFODIR%%/liece.info
 %%PORTDOCS%%@exec install-info --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/%%EMACS_INFODIR%%/liece.info %D/%%EMACS_INFODIR%%/dir
-%%PORTDOCS%%%%ETCDIR%%/doc/AUTHORS
-%%PORTDOCS%%%%ETCDIR%%/doc/ChangeLog
-%%PORTDOCS%%@dirrm %%ETCDIR%%/doc
-%%PORTDOCS%%%%ETCDIR%%/sample.dot.emacs
-@dirrm %%ETCDIR%%/icons
-@dirrm %%ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES
-@dirrm %%ETCDIR%%/po/ja_JP.EUC
-@dirrm %%ETCDIR%%/po
-@dirrm %%ETCDIR%%/styles
-@dirrm %%ETCDIR%%
+%%PORTDOCS%%%%LIECE_ETCDIR%%/doc/AUTHORS
+%%PORTDOCS%%%%LIECE_ETCDIR%%/doc/ChangeLog
+%%PORTDOCS%%@dirrm %%LIECE_ETCDIR%%/doc
+%%PORTDOCS%%%%LIECE_ETCDIR%%/sample.dot.emacs
+@dirrm %%LIECE_ETCDIR%%/icons
+@dirrm %%LIECE_ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES
+@dirrm %%LIECE_ETCDIR%%/po/ja_JP.EUC
+@unexec test -h %D/%%LIECE_ETCDIR%%/po/ja && rm -f %D/%%LIECE_ETCDIR%%/po/ja
+@dirrm %%LIECE_ETCDIR%%/po
+@dirrm %%LIECE_ETCDIR%%/styles
+@dirrm %%LIECE_ETCDIR%%
 %%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el
 %%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.elc
 %%XEMACS_ONLY%%%%LISPDIR%%/custom-load.el
diff --git a/irc/riece-emacs20/Makefile b/irc/riece-emacs20/Makefile
index 27d6f51343bc..d9137de0c301 100644
--- a/irc/riece-emacs20/Makefile
+++ b/irc/riece-emacs20/Makefile
@@ -1,76 +1,13 @@
-# New ports collection makefile for:	liece
+# New ports collection makefile for:	liece (for emacs20)
 # Date Created:		9 Mar 2001
 # Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	liece
-PORTVERSION=	1.4.4
-PORTREVISION=	2
-CATEGORIES=	irc elisp
-MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
+MASTERDIR=	${.CURDIR}/../liece
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
-		${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
-		${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
+EMACS_PORT_NAME=	emacs20
 
-EMACS_PORT_NAME?=	emacs20
-LISPDIR?=		${EMACS_LIBDIR}/site-lisp/${PORTNAME}
-ETCDIR?=		share/${PORTNAME}
-PKGINFODIR?=		"@comment "
-
-# INFODIR is system reserved
-EMACS_INFODIR?=		info
-DIRSECTION?=		"The Emacs editor and associated tools"
-INFOENTRY?=		"* Liece: (liece).		IRC client on Emacsen."
-
-HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ARGS+=	--with-emacs="${EMACS_CMD}"
-ALL_TARGET=	all sample.dot.emacs
-PLIST_SUB=	EMACS_NAME=${EMACS_NAME} \
-		XEMACS_ONLY=${XEMACS_ONLY} \
-		EMACS_ONLY=${EMACS_ONLY} \
-		LISPDIR=${LISPDIR} \
-		ETCDIR=${ETCDIR} \
-		EMACS_INFODIR=${EMACS_INFODIR} \
-		PKGINFODIR=${PKGINFODIR} \
-		DIRSECTION=${DIRSECTION} \
-		INFOENTRY=${INFOENTRY}
-
-DOCS=		AUTHORS lisp/ChangeLog
-
-FLIM_BRANCH=	1.13
-FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
-
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_NAME} == xemacs
-XEMACS_ONLY?=		""
-EMACS_ONLY?=		"@comment "
-.else
-XEMACS_ONLY?=		"@comment "
-EMACS_ONLY?=		""
-.endif
-
-post-install:
-	${MKDIR} ${PREFIX}/${ETCDIR}/po/ja_JP.EUC/LC_MESSAGES
-	${LN} -sf ja_JP.EUC ${PREFIX}/${ETCDIR}/po/ja
-	msgfmt -o ${PREFIX}/${ETCDIR}/po/ja_JP.EUC/LC_MESSAGES/liece.mo ${WRKSRC}/etc/po/ja.po	
-.if !defined(NOPORTDOCS)
-	${INSTALL_DATA} ${WRKSRC}/sample.dot.emacs ${PREFIX}/${ETCDIR}/
-	${MKDIR} ${PREFIX}/${ETCDIR}/doc
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${ETCDIR}/doc/
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/doc/liece.info ${PREFIX}/${EMACS_INFODIR}/
-	install-info --section=${DIRSECTION} --entry=${INFOENTRY} \
-		${PREFIX}/${EMACS_INFODIR}/liece.info ${PREFIX}/${EMACS_INFODIR}/dir
-.endif
-
-.include <bsd.port.post.mk>
+.include <${MASTERDIR}/Makefile>
diff --git a/irc/riece-emacs20/distinfo b/irc/riece-emacs20/distinfo
deleted file mode 100644
index e78ea16f3ae5..000000000000
--- a/irc/riece-emacs20/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (liece-1.4.4.tar.gz) = e2ad08e4c80c4a5a9d323f736a54e91e
-MD5 (liece-1.4.4-1.4.5.p2001.02.12.gz) = 3ef95c08f9631c61c8fda17469136fa8
diff --git a/irc/riece-emacs20/pkg-comment b/irc/riece-emacs20/pkg-comment
deleted file mode 100644
index eeb112edeec2..000000000000
--- a/irc/riece-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another IRC client which runs under Emacsen
diff --git a/irc/riece-emacs20/pkg-descr b/irc/riece-emacs20/pkg-descr
deleted file mode 100644
index efd34f582918..000000000000
--- a/irc/riece-emacs20/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Liece is an IRC client which runs under Emacsen.
-
-Put the expression below into your ~/.emacs.
-
-(autoload 'liece "liece" nil t)
-
-WWW: http://www.unixuser.org/~ueno/liece/index.html.en
diff --git a/irc/riece-emacs20/pkg-plist b/irc/riece-emacs20/pkg-plist
deleted file mode 100644
index ec9354368363..000000000000
--- a/irc/riece-emacs20/pkg-plist
+++ /dev/null
@@ -1,123 +0,0 @@
-%%PKGINFODIR%%/MANIFEST.liece
-%%ETCDIR%%/icons/back.xpm
-%%ETCDIR%%/icons/ball.blank.xpm
-%%ETCDIR%%/icons/ball.gray.xpm
-%%ETCDIR%%/icons/ball.red.xpm
-%%ETCDIR%%/icons/balloon.xpm
-%%ETCDIR%%/icons/crypt.xpm
-%%ETCDIR%%/icons/encrypt.xpm
-%%ETCDIR%%/icons/forward.xpm
-%%ETCDIR%%/icons/home.xpm
-%%ETCDIR%%/icons/icons.gif
-%%ETCDIR%%/icons/icons.xpm
-%%ETCDIR%%/icons/key.xpm
-%%ETCDIR%%/icons/liece-pointer.xbm
-%%ETCDIR%%/icons/liece-pointer.xpm
-%%ETCDIR%%/icons/location.xpm
-%%ETCDIR%%/icons/naruto.blank.xpm
-%%ETCDIR%%/icons/naruto.gray.xpm
-%%ETCDIR%%/icons/naruto.red.xpm
-%%ETCDIR%%/icons/pindown.xpm
-%%ETCDIR%%/icons/print.xpm
-%%ETCDIR%%/icons/reload.xpm
-%%ETCDIR%%/icons/search.xpm
-%%ETCDIR%%/icons/stop.xpm
-%%ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES/liece.mo
-%%ETCDIR%%/po/ja.po
-%%ETCDIR%%/po/ja
-%%ETCDIR%%/styles/bottom
-%%ETCDIR%%/styles/middle
-%%ETCDIR%%/styles/top
-%%PORTDOCS%%@unexec install-info --delete --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/%%EMACS_INFODIR%%/liece.info %D/%%EMACS_INFODIR%%/dir
-%%PORTDOCS%%%%EMACS_INFODIR%%/liece.info
-%%PORTDOCS%%@exec install-info --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/%%EMACS_INFODIR%%/liece.info %D/%%EMACS_INFODIR%%/dir
-%%PORTDOCS%%%%ETCDIR%%/doc/AUTHORS
-%%PORTDOCS%%%%ETCDIR%%/doc/ChangeLog
-%%PORTDOCS%%@dirrm %%ETCDIR%%/doc
-%%PORTDOCS%%%%ETCDIR%%/sample.dot.emacs
-@dirrm %%ETCDIR%%/icons
-@dirrm %%ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES
-@dirrm %%ETCDIR%%/po/ja_JP.EUC
-@dirrm %%ETCDIR%%/po
-@dirrm %%ETCDIR%%/styles
-@dirrm %%ETCDIR%%
-%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el
-%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.elc
-%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.el
-%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.elc
-%%EMACS_ONLY%%%%LISPDIR%%/bitmap-stipple.el
-%%EMACS_ONLY%%%%LISPDIR%%/bitmap-stipple.elc
-%%LISPDIR%%/gettext.el
-%%LISPDIR%%/gettext.elc
-%%LISPDIR%%/liece-000.el
-%%LISPDIR%%/liece-000.elc
-%%LISPDIR%%/liece-200.el
-%%LISPDIR%%/liece-200.elc
-%%LISPDIR%%/liece-300.el
-%%LISPDIR%%/liece-300.elc
-%%LISPDIR%%/liece-400.el
-%%LISPDIR%%/liece-400.elc
-%%LISPDIR%%/liece-500.el
-%%LISPDIR%%/liece-500.elc
-%%LISPDIR%%/liece-channel.el
-%%LISPDIR%%/liece-channel.elc
-%%LISPDIR%%/liece-clfns.el
-%%LISPDIR%%/liece-clfns.elc
-%%LISPDIR%%/liece-coding.el
-%%LISPDIR%%/liece-coding.elc
-%%LISPDIR%%/liece-commands.el
-%%LISPDIR%%/liece-commands.elc
-%%LISPDIR%%/liece-compat.el
-%%LISPDIR%%/liece-compat.elc
-%%LISPDIR%%/liece-ctcp.el
-%%LISPDIR%%/liece-ctcp.elc
-%%LISPDIR%%/liece-dcc.el
-%%LISPDIR%%/liece-dcc.elc
-%%LISPDIR%%/liece-filter.el
-%%LISPDIR%%/liece-filter.elc
-%%LISPDIR%%/liece-globals.el
-%%LISPDIR%%/liece-globals.elc
-%%LISPDIR%%/liece-handle.el
-%%LISPDIR%%/liece-handle.elc
-%%LISPDIR%%/liece-handler.el
-%%LISPDIR%%/liece-handler.elc
-%%LISPDIR%%/liece-hilit.el
-%%LISPDIR%%/liece-hilit.elc
-%%LISPDIR%%/liece-inlines.el
-%%LISPDIR%%/liece-inlines.elc
-%%LISPDIR%%/liece-intl.el
-%%LISPDIR%%/liece-intl.elc
-%%LISPDIR%%/liece-mail.el
-%%LISPDIR%%/liece-mail.elc
-%%LISPDIR%%/liece-menu.el
-%%LISPDIR%%/liece-menu.elc
-%%LISPDIR%%/liece-message.el
-%%LISPDIR%%/liece-message.elc
-%%LISPDIR%%/liece-minibuf.el
-%%LISPDIR%%/liece-minibuf.elc
-%%LISPDIR%%/liece-misc.el
-%%LISPDIR%%/liece-misc.elc
-%%LISPDIR%%/liece-nick.el
-%%LISPDIR%%/liece-nick.elc
-%%LISPDIR%%/liece-q-ccl.el
-%%LISPDIR%%/liece-q-ccl.elc
-%%LISPDIR%%/liece-q-el.el
-%%LISPDIR%%/liece-q-el.elc
-%%LISPDIR%%/liece-setup.el
-%%LISPDIR%%/liece-tcp.el
-%%LISPDIR%%/liece-tcp.elc
-%%LISPDIR%%/liece-url.el
-%%LISPDIR%%/liece-url.elc
-%%LISPDIR%%/liece-vars.el
-%%LISPDIR%%/liece-vars.elc
-%%LISPDIR%%/liece-version.el
-%%LISPDIR%%/liece-version.elc
-%%LISPDIR%%/liece-window.el
-%%LISPDIR%%/liece-window.elc
-%%LISPDIR%%/liece-x-face.el
-%%LISPDIR%%/liece-x-face.elc
-%%LISPDIR%%/liece-%%EMACS_NAME%%.el
-%%LISPDIR%%/liece-%%EMACS_NAME%%.elc
-%%LISPDIR%%/liece.el
-%%LISPDIR%%/liece.elc
-@dirrm %%LISPDIR%%
diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile
index 27d6f51343bc..b4dfeb915822 100644
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	liece
+# New ports collection makefile for:	liece (for emacs21)
 # Date Created:		9 Mar 2001
 # Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 #
@@ -12,65 +12,68 @@ CATEGORIES=	irc elisp
 MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
+MAINTAINER=	yoichi@FreeBSD.org
 
 BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
 		${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
 RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
 		${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
 
-EMACS_PORT_NAME?=	emacs20
-LISPDIR?=		${EMACS_LIBDIR}/site-lisp/${PORTNAME}
-ETCDIR?=		share/${PORTNAME}
-PKGINFODIR?=		"@comment "
-
-# INFODIR is system reserved
-EMACS_INFODIR?=		info
-DIRSECTION?=		"The Emacs editor and associated tools"
-INFOENTRY?=		"* Liece: (liece).		IRC client on Emacsen."
-
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS+=	--with-emacs="${EMACS_CMD}"
-ALL_TARGET=	all sample.dot.emacs
-PLIST_SUB=	EMACS_NAME=${EMACS_NAME} \
-		XEMACS_ONLY=${XEMACS_ONLY} \
-		EMACS_ONLY=${EMACS_ONLY} \
-		LISPDIR=${LISPDIR} \
-		ETCDIR=${ETCDIR} \
-		EMACS_INFODIR=${EMACS_INFODIR} \
-		PKGINFODIR=${PKGINFODIR} \
-		DIRSECTION=${DIRSECTION} \
-		INFOENTRY=${INFOENTRY}
-
-DOCS=		AUTHORS lisp/ChangeLog
 
 FLIM_BRANCH=	1.13
 FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
 
-.include <bsd.port.pre.mk>
+EMACS_PORT_NAME?=	emacs21
+CONFIGURE_ARGS+=	--with-emacs=${EMACS_CMD} --datadir=${PREFIX}/${EMACS_ETCDIR}
 
-.if ${EMACS_NAME} == xemacs
-XEMACS_ONLY?=		""
-EMACS_ONLY?=		"@comment "
+DIRSECTION?=		"The Emacs editor and associated tools"
+INFOENTRY?=		"* Liece: (liece).		IRC client on Emacsen."
+
+.if ${EMACS_PORT_NAME} == xemacs21-mule
+EMACS_PACKAGESDIR=	${EMACS_LIBDIR}/site-packages
+LISPDIR=		${EMACS_PACKAGESDIR}/lisp
+EMACS_ETCDIR=		${EMACS_PACKAGESDIR}/etc
+EMACS_INFODIR=		${EMACS_PACKAGESDIR}/info
+PKGINFODIR=		${EMACS_PACKAGESDIR}/pkginfo
+CONFIGURE_ARGS+=	--enable-package
+XEMACS_ONLY=		""
+EMACS_ONLY=		"@comment "
 .else
-XEMACS_ONLY?=		"@comment "
-EMACS_ONLY?=		""
+LISPDIR=		${EMACS_VERSION_SITE_LISPDIR}
+EMACS_ETCDIR=		share
+EMACS_INFODIR=		info
+PKGINFODIR=		"@comment "
+MAKE_ARGS+=		LISPDIR=${PREFIX}/${LISPDIR}
+XEMACS_ONLY=		"@comment "
+EMACS_ONLY=		""
 .endif
+LIECE_ETCDIR=	${EMACS_ETCDIR}/${PORTNAME}
+
+ALL_TARGET=	all sample.dot.emacs
+PLIST_SUB=	EMACS_NAME=${EMACS_NAME} \
+		XEMACS_ONLY=${XEMACS_ONLY} EMACS_ONLY=${EMACS_ONLY} \
+		LISPDIR=${LISPDIR}/${PORTNAME} LIECE_ETCDIR=${LIECE_ETCDIR} \
+		PKGINFODIR=${PKGINFODIR} \
+		EMACS_INFODIR=${EMACS_INFODIR} \
+		DIRSECTION=${DIRSECTION} INFOENTRY=${INFOENTRY}
+
+DOCS=		AUTHORS lisp/ChangeLog
 
 post-install:
-	${MKDIR} ${PREFIX}/${ETCDIR}/po/ja_JP.EUC/LC_MESSAGES
-	${LN} -sf ja_JP.EUC ${PREFIX}/${ETCDIR}/po/ja
-	msgfmt -o ${PREFIX}/${ETCDIR}/po/ja_JP.EUC/LC_MESSAGES/liece.mo ${WRKSRC}/etc/po/ja.po	
+	${MKDIR} ${PREFIX}/${LIECE_ETCDIR}/po/ja_JP.EUC/LC_MESSAGES
+	${LN} -sf ja_JP.EUC ${PREFIX}/${LIECE_ETCDIR}/po/ja
+	msgfmt -o ${PREFIX}/${LIECE_ETCDIR}/po/ja_JP.EUC/LC_MESSAGES/liece.mo ${WRKSRC}/etc/po/ja.po
 .if !defined(NOPORTDOCS)
-	${INSTALL_DATA} ${WRKSRC}/sample.dot.emacs ${PREFIX}/${ETCDIR}/
-	${MKDIR} ${PREFIX}/${ETCDIR}/doc
+	${INSTALL_DATA} ${WRKSRC}/sample.dot.emacs ${PREFIX}/${LIECE_ETCDIR}/
+	${MKDIR} ${PREFIX}/${LIECE_ETCDIR}/doc
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${ETCDIR}/doc/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${LIECE_ETCDIR}/doc/
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/liece.info ${PREFIX}/${EMACS_INFODIR}/
 	install-info --section=${DIRSECTION} --entry=${INFOENTRY} \
 		${PREFIX}/${EMACS_INFODIR}/liece.info ${PREFIX}/${EMACS_INFODIR}/dir
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/riece-emacs21/pkg-plist b/irc/riece-emacs21/pkg-plist
index ec9354368363..a08c4228b73a 100644
--- a/irc/riece-emacs21/pkg-plist
+++ b/irc/riece-emacs21/pkg-plist
@@ -1,46 +1,47 @@
 %%PKGINFODIR%%/MANIFEST.liece
-%%ETCDIR%%/icons/back.xpm
-%%ETCDIR%%/icons/ball.blank.xpm
-%%ETCDIR%%/icons/ball.gray.xpm
-%%ETCDIR%%/icons/ball.red.xpm
-%%ETCDIR%%/icons/balloon.xpm
-%%ETCDIR%%/icons/crypt.xpm
-%%ETCDIR%%/icons/encrypt.xpm
-%%ETCDIR%%/icons/forward.xpm
-%%ETCDIR%%/icons/home.xpm
-%%ETCDIR%%/icons/icons.gif
-%%ETCDIR%%/icons/icons.xpm
-%%ETCDIR%%/icons/key.xpm
-%%ETCDIR%%/icons/liece-pointer.xbm
-%%ETCDIR%%/icons/liece-pointer.xpm
-%%ETCDIR%%/icons/location.xpm
-%%ETCDIR%%/icons/naruto.blank.xpm
-%%ETCDIR%%/icons/naruto.gray.xpm
-%%ETCDIR%%/icons/naruto.red.xpm
-%%ETCDIR%%/icons/pindown.xpm
-%%ETCDIR%%/icons/print.xpm
-%%ETCDIR%%/icons/reload.xpm
-%%ETCDIR%%/icons/search.xpm
-%%ETCDIR%%/icons/stop.xpm
-%%ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES/liece.mo
-%%ETCDIR%%/po/ja.po
-%%ETCDIR%%/po/ja
-%%ETCDIR%%/styles/bottom
-%%ETCDIR%%/styles/middle
-%%ETCDIR%%/styles/top
+%%LIECE_ETCDIR%%/icons/back.xpm
+%%LIECE_ETCDIR%%/icons/ball.blank.xpm
+%%LIECE_ETCDIR%%/icons/ball.gray.xpm
+%%LIECE_ETCDIR%%/icons/ball.red.xpm
+%%LIECE_ETCDIR%%/icons/balloon.xpm
+%%LIECE_ETCDIR%%/icons/crypt.xpm
+%%LIECE_ETCDIR%%/icons/encrypt.xpm
+%%LIECE_ETCDIR%%/icons/forward.xpm
+%%LIECE_ETCDIR%%/icons/home.xpm
+%%LIECE_ETCDIR%%/icons/icons.gif
+%%LIECE_ETCDIR%%/icons/icons.xpm
+%%LIECE_ETCDIR%%/icons/key.xpm
+%%LIECE_ETCDIR%%/icons/liece-pointer.xbm
+%%LIECE_ETCDIR%%/icons/liece-pointer.xpm
+%%LIECE_ETCDIR%%/icons/location.xpm
+%%LIECE_ETCDIR%%/icons/naruto.blank.xpm
+%%LIECE_ETCDIR%%/icons/naruto.gray.xpm
+%%LIECE_ETCDIR%%/icons/naruto.red.xpm
+%%LIECE_ETCDIR%%/icons/pindown.xpm
+%%LIECE_ETCDIR%%/icons/print.xpm
+%%LIECE_ETCDIR%%/icons/reload.xpm
+%%LIECE_ETCDIR%%/icons/search.xpm
+%%LIECE_ETCDIR%%/icons/stop.xpm
+%%LIECE_ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES/liece.mo
+@exec ln -sf ja_JP.EUC %D/%%LIECE_ETCDIR%%/po/ja
+%%LIECE_ETCDIR%%/po/ja.po
+%%LIECE_ETCDIR%%/styles/bottom
+%%LIECE_ETCDIR%%/styles/middle
+%%LIECE_ETCDIR%%/styles/top
 %%PORTDOCS%%@unexec install-info --delete --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/%%EMACS_INFODIR%%/liece.info %D/%%EMACS_INFODIR%%/dir
 %%PORTDOCS%%%%EMACS_INFODIR%%/liece.info
 %%PORTDOCS%%@exec install-info --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/%%EMACS_INFODIR%%/liece.info %D/%%EMACS_INFODIR%%/dir
-%%PORTDOCS%%%%ETCDIR%%/doc/AUTHORS
-%%PORTDOCS%%%%ETCDIR%%/doc/ChangeLog
-%%PORTDOCS%%@dirrm %%ETCDIR%%/doc
-%%PORTDOCS%%%%ETCDIR%%/sample.dot.emacs
-@dirrm %%ETCDIR%%/icons
-@dirrm %%ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES
-@dirrm %%ETCDIR%%/po/ja_JP.EUC
-@dirrm %%ETCDIR%%/po
-@dirrm %%ETCDIR%%/styles
-@dirrm %%ETCDIR%%
+%%PORTDOCS%%%%LIECE_ETCDIR%%/doc/AUTHORS
+%%PORTDOCS%%%%LIECE_ETCDIR%%/doc/ChangeLog
+%%PORTDOCS%%@dirrm %%LIECE_ETCDIR%%/doc
+%%PORTDOCS%%%%LIECE_ETCDIR%%/sample.dot.emacs
+@dirrm %%LIECE_ETCDIR%%/icons
+@dirrm %%LIECE_ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES
+@dirrm %%LIECE_ETCDIR%%/po/ja_JP.EUC
+@unexec test -h %D/%%LIECE_ETCDIR%%/po/ja && rm -f %D/%%LIECE_ETCDIR%%/po/ja
+@dirrm %%LIECE_ETCDIR%%/po
+@dirrm %%LIECE_ETCDIR%%/styles
+@dirrm %%LIECE_ETCDIR%%
 %%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el
 %%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.elc
 %%XEMACS_ONLY%%%%LISPDIR%%/custom-load.el
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 27d6f51343bc..b4dfeb915822 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	liece
+# New ports collection makefile for:	liece (for emacs21)
 # Date Created:		9 Mar 2001
 # Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 #
@@ -12,65 +12,68 @@ CATEGORIES=	irc elisp
 MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
+MAINTAINER=	yoichi@FreeBSD.org
 
 BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
 		${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
 RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_BRANCH:S/.//}-${EMACS_PORT_NAME} \
 		${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
 
-EMACS_PORT_NAME?=	emacs20
-LISPDIR?=		${EMACS_LIBDIR}/site-lisp/${PORTNAME}
-ETCDIR?=		share/${PORTNAME}
-PKGINFODIR?=		"@comment "
-
-# INFODIR is system reserved
-EMACS_INFODIR?=		info
-DIRSECTION?=		"The Emacs editor and associated tools"
-INFOENTRY?=		"* Liece: (liece).		IRC client on Emacsen."
-
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS+=	--with-emacs="${EMACS_CMD}"
-ALL_TARGET=	all sample.dot.emacs
-PLIST_SUB=	EMACS_NAME=${EMACS_NAME} \
-		XEMACS_ONLY=${XEMACS_ONLY} \
-		EMACS_ONLY=${EMACS_ONLY} \
-		LISPDIR=${LISPDIR} \
-		ETCDIR=${ETCDIR} \
-		EMACS_INFODIR=${EMACS_INFODIR} \
-		PKGINFODIR=${PKGINFODIR} \
-		DIRSECTION=${DIRSECTION} \
-		INFOENTRY=${INFOENTRY}
-
-DOCS=		AUTHORS lisp/ChangeLog
 
 FLIM_BRANCH=	1.13
 FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_BRANCH}.FreeBSD-packages
 
-.include <bsd.port.pre.mk>
+EMACS_PORT_NAME?=	emacs21
+CONFIGURE_ARGS+=	--with-emacs=${EMACS_CMD} --datadir=${PREFIX}/${EMACS_ETCDIR}
 
-.if ${EMACS_NAME} == xemacs
-XEMACS_ONLY?=		""
-EMACS_ONLY?=		"@comment "
+DIRSECTION?=		"The Emacs editor and associated tools"
+INFOENTRY?=		"* Liece: (liece).		IRC client on Emacsen."
+
+.if ${EMACS_PORT_NAME} == xemacs21-mule
+EMACS_PACKAGESDIR=	${EMACS_LIBDIR}/site-packages
+LISPDIR=		${EMACS_PACKAGESDIR}/lisp
+EMACS_ETCDIR=		${EMACS_PACKAGESDIR}/etc
+EMACS_INFODIR=		${EMACS_PACKAGESDIR}/info
+PKGINFODIR=		${EMACS_PACKAGESDIR}/pkginfo
+CONFIGURE_ARGS+=	--enable-package
+XEMACS_ONLY=		""
+EMACS_ONLY=		"@comment "
 .else
-XEMACS_ONLY?=		"@comment "
-EMACS_ONLY?=		""
+LISPDIR=		${EMACS_VERSION_SITE_LISPDIR}
+EMACS_ETCDIR=		share
+EMACS_INFODIR=		info
+PKGINFODIR=		"@comment "
+MAKE_ARGS+=		LISPDIR=${PREFIX}/${LISPDIR}
+XEMACS_ONLY=		"@comment "
+EMACS_ONLY=		""
 .endif
+LIECE_ETCDIR=	${EMACS_ETCDIR}/${PORTNAME}
+
+ALL_TARGET=	all sample.dot.emacs
+PLIST_SUB=	EMACS_NAME=${EMACS_NAME} \
+		XEMACS_ONLY=${XEMACS_ONLY} EMACS_ONLY=${EMACS_ONLY} \
+		LISPDIR=${LISPDIR}/${PORTNAME} LIECE_ETCDIR=${LIECE_ETCDIR} \
+		PKGINFODIR=${PKGINFODIR} \
+		EMACS_INFODIR=${EMACS_INFODIR} \
+		DIRSECTION=${DIRSECTION} INFOENTRY=${INFOENTRY}
+
+DOCS=		AUTHORS lisp/ChangeLog
 
 post-install:
-	${MKDIR} ${PREFIX}/${ETCDIR}/po/ja_JP.EUC/LC_MESSAGES
-	${LN} -sf ja_JP.EUC ${PREFIX}/${ETCDIR}/po/ja
-	msgfmt -o ${PREFIX}/${ETCDIR}/po/ja_JP.EUC/LC_MESSAGES/liece.mo ${WRKSRC}/etc/po/ja.po	
+	${MKDIR} ${PREFIX}/${LIECE_ETCDIR}/po/ja_JP.EUC/LC_MESSAGES
+	${LN} -sf ja_JP.EUC ${PREFIX}/${LIECE_ETCDIR}/po/ja
+	msgfmt -o ${PREFIX}/${LIECE_ETCDIR}/po/ja_JP.EUC/LC_MESSAGES/liece.mo ${WRKSRC}/etc/po/ja.po
 .if !defined(NOPORTDOCS)
-	${INSTALL_DATA} ${WRKSRC}/sample.dot.emacs ${PREFIX}/${ETCDIR}/
-	${MKDIR} ${PREFIX}/${ETCDIR}/doc
+	${INSTALL_DATA} ${WRKSRC}/sample.dot.emacs ${PREFIX}/${LIECE_ETCDIR}/
+	${MKDIR} ${PREFIX}/${LIECE_ETCDIR}/doc
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${ETCDIR}/doc/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${LIECE_ETCDIR}/doc/
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/liece.info ${PREFIX}/${EMACS_INFODIR}/
 	install-info --section=${DIRSECTION} --entry=${INFOENTRY} \
 		${PREFIX}/${EMACS_INFODIR}/liece.info ${PREFIX}/${EMACS_INFODIR}/dir
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/riece/pkg-plist b/irc/riece/pkg-plist
index ec9354368363..a08c4228b73a 100644
--- a/irc/riece/pkg-plist
+++ b/irc/riece/pkg-plist
@@ -1,46 +1,47 @@
 %%PKGINFODIR%%/MANIFEST.liece
-%%ETCDIR%%/icons/back.xpm
-%%ETCDIR%%/icons/ball.blank.xpm
-%%ETCDIR%%/icons/ball.gray.xpm
-%%ETCDIR%%/icons/ball.red.xpm
-%%ETCDIR%%/icons/balloon.xpm
-%%ETCDIR%%/icons/crypt.xpm
-%%ETCDIR%%/icons/encrypt.xpm
-%%ETCDIR%%/icons/forward.xpm
-%%ETCDIR%%/icons/home.xpm
-%%ETCDIR%%/icons/icons.gif
-%%ETCDIR%%/icons/icons.xpm
-%%ETCDIR%%/icons/key.xpm
-%%ETCDIR%%/icons/liece-pointer.xbm
-%%ETCDIR%%/icons/liece-pointer.xpm
-%%ETCDIR%%/icons/location.xpm
-%%ETCDIR%%/icons/naruto.blank.xpm
-%%ETCDIR%%/icons/naruto.gray.xpm
-%%ETCDIR%%/icons/naruto.red.xpm
-%%ETCDIR%%/icons/pindown.xpm
-%%ETCDIR%%/icons/print.xpm
-%%ETCDIR%%/icons/reload.xpm
-%%ETCDIR%%/icons/search.xpm
-%%ETCDIR%%/icons/stop.xpm
-%%ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES/liece.mo
-%%ETCDIR%%/po/ja.po
-%%ETCDIR%%/po/ja
-%%ETCDIR%%/styles/bottom
-%%ETCDIR%%/styles/middle
-%%ETCDIR%%/styles/top
+%%LIECE_ETCDIR%%/icons/back.xpm
+%%LIECE_ETCDIR%%/icons/ball.blank.xpm
+%%LIECE_ETCDIR%%/icons/ball.gray.xpm
+%%LIECE_ETCDIR%%/icons/ball.red.xpm
+%%LIECE_ETCDIR%%/icons/balloon.xpm
+%%LIECE_ETCDIR%%/icons/crypt.xpm
+%%LIECE_ETCDIR%%/icons/encrypt.xpm
+%%LIECE_ETCDIR%%/icons/forward.xpm
+%%LIECE_ETCDIR%%/icons/home.xpm
+%%LIECE_ETCDIR%%/icons/icons.gif
+%%LIECE_ETCDIR%%/icons/icons.xpm
+%%LIECE_ETCDIR%%/icons/key.xpm
+%%LIECE_ETCDIR%%/icons/liece-pointer.xbm
+%%LIECE_ETCDIR%%/icons/liece-pointer.xpm
+%%LIECE_ETCDIR%%/icons/location.xpm
+%%LIECE_ETCDIR%%/icons/naruto.blank.xpm
+%%LIECE_ETCDIR%%/icons/naruto.gray.xpm
+%%LIECE_ETCDIR%%/icons/naruto.red.xpm
+%%LIECE_ETCDIR%%/icons/pindown.xpm
+%%LIECE_ETCDIR%%/icons/print.xpm
+%%LIECE_ETCDIR%%/icons/reload.xpm
+%%LIECE_ETCDIR%%/icons/search.xpm
+%%LIECE_ETCDIR%%/icons/stop.xpm
+%%LIECE_ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES/liece.mo
+@exec ln -sf ja_JP.EUC %D/%%LIECE_ETCDIR%%/po/ja
+%%LIECE_ETCDIR%%/po/ja.po
+%%LIECE_ETCDIR%%/styles/bottom
+%%LIECE_ETCDIR%%/styles/middle
+%%LIECE_ETCDIR%%/styles/top
 %%PORTDOCS%%@unexec install-info --delete --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/%%EMACS_INFODIR%%/liece.info %D/%%EMACS_INFODIR%%/dir
 %%PORTDOCS%%%%EMACS_INFODIR%%/liece.info
 %%PORTDOCS%%@exec install-info --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/%%EMACS_INFODIR%%/liece.info %D/%%EMACS_INFODIR%%/dir
-%%PORTDOCS%%%%ETCDIR%%/doc/AUTHORS
-%%PORTDOCS%%%%ETCDIR%%/doc/ChangeLog
-%%PORTDOCS%%@dirrm %%ETCDIR%%/doc
-%%PORTDOCS%%%%ETCDIR%%/sample.dot.emacs
-@dirrm %%ETCDIR%%/icons
-@dirrm %%ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES
-@dirrm %%ETCDIR%%/po/ja_JP.EUC
-@dirrm %%ETCDIR%%/po
-@dirrm %%ETCDIR%%/styles
-@dirrm %%ETCDIR%%
+%%PORTDOCS%%%%LIECE_ETCDIR%%/doc/AUTHORS
+%%PORTDOCS%%%%LIECE_ETCDIR%%/doc/ChangeLog
+%%PORTDOCS%%@dirrm %%LIECE_ETCDIR%%/doc
+%%PORTDOCS%%%%LIECE_ETCDIR%%/sample.dot.emacs
+@dirrm %%LIECE_ETCDIR%%/icons
+@dirrm %%LIECE_ETCDIR%%/po/ja_JP.EUC/LC_MESSAGES
+@dirrm %%LIECE_ETCDIR%%/po/ja_JP.EUC
+@unexec test -h %D/%%LIECE_ETCDIR%%/po/ja && rm -f %D/%%LIECE_ETCDIR%%/po/ja
+@dirrm %%LIECE_ETCDIR%%/po
+@dirrm %%LIECE_ETCDIR%%/styles
+@dirrm %%LIECE_ETCDIR%%
 %%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el
 %%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.elc
 %%XEMACS_ONLY%%%%LISPDIR%%/custom-load.el