3 files changed, 23 insertions, 14 deletions

diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile
index f91e53d05739..51fa8ac1a8d0 100644
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	liece
-PORTVERSION=	1.4.4
-PORTREVISION=	2
+PORTVERSION=	1.4.6
 CATEGORIES=	irc elisp
 MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -26,7 +25,6 @@ FLIM_TRUNK=	1.14
 FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
 
 EMACS_PORT_NAME?=	emacs21
-CONFIGURE_ARGS+=	--with-emacs=${EMACS_CMD} --datadir=${PREFIX}/${EMACS_ETCDIR}
 
 DIRSECTION?=		"The Emacs editor and associated tools"
 INFOENTRY?=		"* Liece: (liece).		IRC client on Emacsen."
@@ -43,7 +41,11 @@ LISPDIR=		${EMACS_PACKAGESDIR}/lisp
 EMACS_ETCDIR=		${EMACS_PACKAGESDIR}/etc
 EMACS_INFODIR=		${EMACS_PACKAGESDIR}/info
 PKGINFODIR=		${EMACS_PACKAGESDIR}/pkginfo
-CONFIGURE_ARGS+=	--enable-package
+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
@@ -51,13 +53,17 @@ 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}
 
-ALL_TARGET=	all sample.dot.emacs
+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} \
@@ -67,12 +73,18 @@ PLIST_SUB=	EMACS_NAME=${EMACS_NAME} \
 
 DOCS=		AUTHORS lisp/ChangeLog
 
+post-build:
+	(cd ${WRKSRC}/etc/po ; msgfmt -o liece.mo ja.po)
+	(cd ${WRKSRC}/etc ; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} sample.dot.emacs)
 post-install:
+	(cd ${WRKSRC}/etc ; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install)
+	${MKDIR} ${PREFIX}/${LIECE_ETCDIR}/icons
+	${INSTALL_DATA} ${WRKSRC}/etc/icons/*.xpm ${PREFIX}/${LIECE_ETCDIR}/icons
 	${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
+	${INSTALL_DATA} ${WRKSRC}/etc/po/liece.mo ${PREFIX}/${LIECE_ETCDIR}/po/ja_JP.EUC/LC_MESSAGES
 .if !defined(NOPORTDOCS)
-	${INSTALL_DATA} ${WRKSRC}/sample.dot.emacs ${PREFIX}/${LIECE_ETCDIR}/
+#	${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/
diff --git a/irc/riece-emacs21/distinfo b/irc/riece-emacs21/distinfo
index e78ea16f3ae5..a91930474240 100644
--- a/irc/riece-emacs21/distinfo
+++ b/irc/riece-emacs21/distinfo
@@ -1,2 +1 @@
-MD5 (liece-1.4.4.tar.gz) = e2ad08e4c80c4a5a9d323f736a54e91e
-MD5 (liece-1.4.4-1.4.5.p2001.02.12.gz) = 3ef95c08f9631c61c8fda17469136fa8
+MD5 (liece-1.4.6.tar.gz) = f7a52a6ffc6a18fd26035cf201a2dc49
diff --git a/irc/riece-emacs21/pkg-plist b/irc/riece-emacs21/pkg-plist
index a08c4228b73a..9282d7b35dd9 100644
--- a/irc/riece-emacs21/pkg-plist
+++ b/irc/riece-emacs21/pkg-plist
@@ -8,10 +8,8 @@
 %%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
@@ -23,8 +21,8 @@
 %%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
+@exec ln -sf ja_JP.EUC %D/%%LIECE_ETCDIR%%/po/ja
 %%LIECE_ETCDIR%%/styles/bottom
 %%LIECE_ETCDIR%%/styles/middle
 %%LIECE_ETCDIR%%/styles/top
@@ -46,8 +44,8 @@
 %%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%%/bitmap-stipple.el
+%%LISPDIR%%/bitmap-stipple.elc
 %%LISPDIR%%/gettext.el
 %%LISPDIR%%/gettext.elc
 %%LISPDIR%%/liece-000.el