2 files changed, 81 insertions, 77 deletions

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