2 files changed, 94 insertions, 121 deletions

diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 7204b96500ee..bda6e67256a5 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -7,16 +7,16 @@
 
 PORTNAME=	liece
 PORTVERSION=	1.4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc elisp
 MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	yoichi@FreeBSD.org
 
-BUILD_DEPENDS+=	${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
 		msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS+=	${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
 		ldcc:${PORTSDIR}/irc/liece-dcc
 
 HAS_CONFIGURE=	yes
@@ -30,43 +30,19 @@ INFOENTRY?=		"* Liece: (liece).		IRC client on Emacsen."
 .if ${EMACS_PORT_NAME} == "emacs21"
 DEPPORT_SUFFIX=		
 .else
-DEPPORT_SUFFIX=		-${EMACS_PORT_NAME}
+DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
 .endif
 
-.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=		--with-xemacs=${EMACS_CMD} \
-			--with-packagedir=${EMACS_PACKAGESDIR} \
-			--datadir=${PREFIX}/${EMACS_ETCDIR}
-ALL_TARGET=		package
-INSTALL_TARGET=		install-package
-XEMACS_ONLY=		""
-EMACS_ONLY=		"@comment "
-.else
-LISPDIR=		${EMACS_VERSION_SITE_LISPDIR}
-EMACS_ETCDIR=		share
-EMACS_INFODIR=		info
-PKGINFODIR=		"@comment "
-CONFIGURE_ARGS=		--with-emacs=${EMACS_CMD} \
-			--with-lispdir=${PREFIX}/${LISPDIR} \
-			--datadir=${PREFIX}/${EMACS_ETCDIR}
-MAKE_ARGS+=		LISPDIR=${PREFIX}/${LISPDIR}
-XEMACS_ONLY=		"@comment "
-EMACS_ONLY=		""
-.endif
-LIECE_ETCDIR=	${EMACS_ETCDIR}/${PORTNAME}
+CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
+		--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \
+		--datadir=${PREFIX}/share
+MAKE_ARGS+=	LISPDIR=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
+LIECE_ETCDIR=	share/${PORTNAME}
 
 BUILD_WRKSRC=	${WRKSRC}/lisp
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
-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} \
+PLIST_SUB=	LIECE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} \
+		LIECE_ETCDIR=${LIECE_ETCDIR} \
 		DIRSECTION=${DIRSECTION} INFOENTRY=${INFOENTRY}
 
 DOCS=		AUTHORS lisp/ChangeLog
@@ -79,15 +55,16 @@ post-install:
 	${MKDIR} ${PREFIX}/${LIECE_ETCDIR}/icons
 	${INSTALL_DATA} ${WRKSRC}/etc/icons/*.xpm ${PREFIX}/${LIECE_ETCDIR}/icons
 	${LN} -sf ja ${PREFIX}/${LIECE_ETCDIR}/locale/ja_JP.EUC
+	${LN} -sf ja ${PREFIX}/${LIECE_ETCDIR}/locale/ja_JP.eucJP
 .if !defined(NOPORTDOCS)
 #	${INSTALL_DATA} ${WRKSRC}/etc/sample.dot.emacs ${PREFIX}/${LIECE_ETCDIR}/
 	${MKDIR} ${PREFIX}/${LIECE_ETCDIR}/doc
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${LIECE_ETCDIR}/doc/
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/doc/liece.info ${PREFIX}/${EMACS_INFODIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/liece.info ${PREFIX}/info/
 	install-info --section=${DIRSECTION} --entry=${INFOENTRY} \
-		${PREFIX}/${EMACS_INFODIR}/liece.info ${PREFIX}/${EMACS_INFODIR}/dir
+		${PREFIX}/info/liece.info ${PREFIX}/info/dir
 .endif
 
 .include <bsd.port.mk>
diff --git a/irc/riece/pkg-plist b/irc/riece/pkg-plist
index 25e428975f0d..299addbbcfff 100644
--- a/irc/riece/pkg-plist
+++ b/irc/riece/pkg-plist
@@ -1,4 +1,3 @@
-%%PKGINFODIR%%/MANIFEST.liece
 %%LIECE_ETCDIR%%/icons/back.xpm
 %%LIECE_ETCDIR%%/icons/ball.blank.xpm
 %%LIECE_ETCDIR%%/icons/ball.gray.xpm
@@ -22,12 +21,13 @@
 %%LIECE_ETCDIR%%/icons/stop.xpm
 %%LIECE_ETCDIR%%/locale/ja/LC_MESSAGES/liece.mo
 %%LIECE_ETCDIR%%/locale/ja_JP.EUC
+%%LIECE_ETCDIR%%/locale/ja_JP.eucJP
 %%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%%@unexec install-info --delete --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/info/liece.info %D/info/dir
+%%PORTDOCS%%info/liece.info
+%%PORTDOCS%%@exec install-info --section="%%DIRSECTION%%" --entry="%%INFOENTRY%%" %D/info/liece.info %D/info/dir
 %%PORTDOCS%%%%LIECE_ETCDIR%%/doc/AUTHORS
 %%PORTDOCS%%%%LIECE_ETCDIR%%/doc/ChangeLog
 %%PORTDOCS%%@dirrm %%LIECE_ETCDIR%%/doc
@@ -38,83 +38,79 @@
 @dirrm %%LIECE_ETCDIR%%/locale
 @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
-%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.elc
-%%LISPDIR%%/bitmap-stipple.el
-%%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%%
+%%LIECE_LISPDIR%%/bitmap-stipple.el
+%%LIECE_LISPDIR%%/bitmap-stipple.elc
+%%LIECE_LISPDIR%%/gettext.el
+%%LIECE_LISPDIR%%/gettext.elc
+%%LIECE_LISPDIR%%/liece-000.el
+%%LIECE_LISPDIR%%/liece-000.elc
+%%LIECE_LISPDIR%%/liece-200.el
+%%LIECE_LISPDIR%%/liece-200.elc
+%%LIECE_LISPDIR%%/liece-300.el
+%%LIECE_LISPDIR%%/liece-300.elc
+%%LIECE_LISPDIR%%/liece-400.el
+%%LIECE_LISPDIR%%/liece-400.elc
+%%LIECE_LISPDIR%%/liece-500.el
+%%LIECE_LISPDIR%%/liece-500.elc
+%%LIECE_LISPDIR%%/liece-channel.el
+%%LIECE_LISPDIR%%/liece-channel.elc
+%%LIECE_LISPDIR%%/liece-clfns.el
+%%LIECE_LISPDIR%%/liece-clfns.elc
+%%LIECE_LISPDIR%%/liece-coding.el
+%%LIECE_LISPDIR%%/liece-coding.elc
+%%LIECE_LISPDIR%%/liece-commands.el
+%%LIECE_LISPDIR%%/liece-commands.elc
+%%LIECE_LISPDIR%%/liece-compat.el
+%%LIECE_LISPDIR%%/liece-compat.elc
+%%LIECE_LISPDIR%%/liece-ctcp.el
+%%LIECE_LISPDIR%%/liece-ctcp.elc
+%%LIECE_LISPDIR%%/liece-dcc.el
+%%LIECE_LISPDIR%%/liece-dcc.elc
+%%LIECE_LISPDIR%%/liece-filter.el
+%%LIECE_LISPDIR%%/liece-filter.elc
+%%LIECE_LISPDIR%%/liece-globals.el
+%%LIECE_LISPDIR%%/liece-globals.elc
+%%LIECE_LISPDIR%%/liece-handle.el
+%%LIECE_LISPDIR%%/liece-handle.elc
+%%LIECE_LISPDIR%%/liece-handler.el
+%%LIECE_LISPDIR%%/liece-handler.elc
+%%LIECE_LISPDIR%%/liece-hilit.el
+%%LIECE_LISPDIR%%/liece-hilit.elc
+%%LIECE_LISPDIR%%/liece-inlines.el
+%%LIECE_LISPDIR%%/liece-inlines.elc
+%%LIECE_LISPDIR%%/liece-intl.el
+%%LIECE_LISPDIR%%/liece-intl.elc
+%%LIECE_LISPDIR%%/liece-mail.el
+%%LIECE_LISPDIR%%/liece-mail.elc
+%%LIECE_LISPDIR%%/liece-menu.el
+%%LIECE_LISPDIR%%/liece-menu.elc
+%%LIECE_LISPDIR%%/liece-message.el
+%%LIECE_LISPDIR%%/liece-message.elc
+%%LIECE_LISPDIR%%/liece-minibuf.el
+%%LIECE_LISPDIR%%/liece-minibuf.elc
+%%LIECE_LISPDIR%%/liece-misc.el
+%%LIECE_LISPDIR%%/liece-misc.elc
+%%LIECE_LISPDIR%%/liece-nick.el
+%%LIECE_LISPDIR%%/liece-nick.elc
+%%LIECE_LISPDIR%%/liece-q-ccl.el
+%%LIECE_LISPDIR%%/liece-q-ccl.elc
+%%LIECE_LISPDIR%%/liece-q-el.el
+%%LIECE_LISPDIR%%/liece-q-el.elc
+%%LIECE_LISPDIR%%/liece-setup.el
+%%LIECE_LISPDIR%%/liece-tcp.el
+%%LIECE_LISPDIR%%/liece-tcp.elc
+%%LIECE_LISPDIR%%/liece-url.el
+%%LIECE_LISPDIR%%/liece-url.elc
+%%LIECE_LISPDIR%%/liece-vars.el
+%%LIECE_LISPDIR%%/liece-vars.elc
+%%LIECE_LISPDIR%%/liece-version.el
+%%LIECE_LISPDIR%%/liece-version.elc
+%%LIECE_LISPDIR%%/liece-window.el
+%%LIECE_LISPDIR%%/liece-window.elc
+%%LIECE_LISPDIR%%/liece-x-face.el
+%%LIECE_LISPDIR%%/liece-x-face.elc
+%%LIECE_LISPDIR%%/liece-emacs.el
+%%LIECE_LISPDIR%%/liece-emacs.elc
+%%LIECE_LISPDIR%%/liece.el
+%%LIECE_LISPDIR%%/liece.elc
+@dirrm %%LIECE_LISPDIR%%