Update to 1.4.7.

It does not need flim any more.

11 files changed, 32 insertions, 53 deletions

diff --git a/irc/liece-dcc/Makefile b/irc/liece-dcc/Makefile
index 8560148..8d2a01f 100644
--- a/irc/liece-dcc/Makefile
+++ b/irc/liece-dcc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	liece-dcc
-PORTVERSION=	1.4.6
+PORTVERSION=	1.4.7
 CATEGORIES=	irc
 MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
 DISTNAME=	liece-${PORTVERSION}
diff --git a/irc/liece-dcc/distinfo b/irc/liece-dcc/distinfo
index a919304..7f8462a 100644
--- a/irc/liece-dcc/distinfo
+++ b/irc/liece-dcc/distinfo
@@ -1 +1 @@
-MD5 (liece-1.4.6.tar.gz) = f7a52a6ffc6a18fd26035cf201a2dc49
+MD5 (liece-1.4.7.tar.gz) = ed4f6fa2171031883ff6202fda7fbbb4
diff --git a/irc/liece/Makefile b/irc/liece/Makefile
index 5f11982..2096c17 100644
--- a/irc/liece/Makefile
+++ b/irc/liece/Makefile
@@ -6,24 +6,21 @@
 #
 
 PORTNAME=	liece
-PORTVERSION=	1.4.6
+PORTVERSION=	1.4.7
 CATEGORIES=	irc elisp
 MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	yoichi@FreeBSD.org
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
+BUILD_DEPENDS+=	${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
 		${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
-RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
+RUN_DEPENDS+=	${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
 		${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
 
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-FLIM_TRUNK=	1.14
-FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
-
 EMACS_PORT_NAME?=	emacs21
 
 DIRSECTION?=		"The Emacs editor and associated tools"
@@ -80,9 +77,7 @@ 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
-	${INSTALL_DATA} ${WRKSRC}/etc/po/liece.mo ${PREFIX}/${LIECE_ETCDIR}/po/ja_JP.EUC/LC_MESSAGES
+	${LN} -sf ja ${PREFIX}/${LIECE_ETCDIR}/locale/ja_JP.EUC
 .if !defined(NOPORTDOCS)
 #	${INSTALL_DATA} ${WRKSRC}/etc/sample.dot.emacs ${PREFIX}/${LIECE_ETCDIR}/
 	${MKDIR} ${PREFIX}/${LIECE_ETCDIR}/doc
diff --git a/irc/liece/distinfo b/irc/liece/distinfo
index a919304..7f8462a 100644
--- a/irc/liece/distinfo
+++ b/irc/liece/distinfo
@@ -1 +1 @@
-MD5 (liece-1.4.6.tar.gz) = f7a52a6ffc6a18fd26035cf201a2dc49
+MD5 (liece-1.4.7.tar.gz) = ed4f6fa2171031883ff6202fda7fbbb4
diff --git a/irc/liece/pkg-plist b/irc/liece/pkg-plist
index 9282d7b..25e4289 100644
--- a/irc/liece/pkg-plist
+++ b/irc/liece/pkg-plist
@@ -20,9 +20,8 @@
 %%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
-%%LIECE_ETCDIR%%/po/ja.po
-@exec ln -sf ja_JP.EUC %D/%%LIECE_ETCDIR%%/po/ja
+%%LIECE_ETCDIR%%/locale/ja/LC_MESSAGES/liece.mo
+%%LIECE_ETCDIR%%/locale/ja_JP.EUC
 %%LIECE_ETCDIR%%/styles/bottom
 %%LIECE_ETCDIR%%/styles/middle
 %%LIECE_ETCDIR%%/styles/top
@@ -34,10 +33,9 @@
 %%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%%/locale/ja/LC_MESSAGES
+@dirrm %%LIECE_ETCDIR%%/locale/ja
+@dirrm %%LIECE_ETCDIR%%/locale
 @dirrm %%LIECE_ETCDIR%%/styles
 @dirrm %%LIECE_ETCDIR%%
 %%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el
diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile
index 5f11982..2096c17 100644
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@@ -6,24 +6,21 @@
 #
 
 PORTNAME=	liece
-PORTVERSION=	1.4.6
+PORTVERSION=	1.4.7
 CATEGORIES=	irc elisp
 MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	yoichi@FreeBSD.org
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
+BUILD_DEPENDS+=	${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
 		${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
-RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
+RUN_DEPENDS+=	${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
 		${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
 
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-FLIM_TRUNK=	1.14
-FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
-
 EMACS_PORT_NAME?=	emacs21
 
 DIRSECTION?=		"The Emacs editor and associated tools"
@@ -80,9 +77,7 @@ 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
-	${INSTALL_DATA} ${WRKSRC}/etc/po/liece.mo ${PREFIX}/${LIECE_ETCDIR}/po/ja_JP.EUC/LC_MESSAGES
+	${LN} -sf ja ${PREFIX}/${LIECE_ETCDIR}/locale/ja_JP.EUC
 .if !defined(NOPORTDOCS)
 #	${INSTALL_DATA} ${WRKSRC}/etc/sample.dot.emacs ${PREFIX}/${LIECE_ETCDIR}/
 	${MKDIR} ${PREFIX}/${LIECE_ETCDIR}/doc
diff --git a/irc/riece-emacs21/distinfo b/irc/riece-emacs21/distinfo
index a919304..7f8462a 100644
--- a/irc/riece-emacs21/distinfo
+++ b/irc/riece-emacs21/distinfo
@@ -1 +1 @@
-MD5 (liece-1.4.6.tar.gz) = f7a52a6ffc6a18fd26035cf201a2dc49
+MD5 (liece-1.4.7.tar.gz) = ed4f6fa2171031883ff6202fda7fbbb4
diff --git a/irc/riece-emacs21/pkg-plist b/irc/riece-emacs21/pkg-plist
index 9282d7b..25e4289 100644
--- a/irc/riece-emacs21/pkg-plist
+++ b/irc/riece-emacs21/pkg-plist
@@ -20,9 +20,8 @@
 %%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
-%%LIECE_ETCDIR%%/po/ja.po
-@exec ln -sf ja_JP.EUC %D/%%LIECE_ETCDIR%%/po/ja
+%%LIECE_ETCDIR%%/locale/ja/LC_MESSAGES/liece.mo
+%%LIECE_ETCDIR%%/locale/ja_JP.EUC
 %%LIECE_ETCDIR%%/styles/bottom
 %%LIECE_ETCDIR%%/styles/middle
 %%LIECE_ETCDIR%%/styles/top
@@ -34,10 +33,9 @@
 %%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%%/locale/ja/LC_MESSAGES
+@dirrm %%LIECE_ETCDIR%%/locale/ja
+@dirrm %%LIECE_ETCDIR%%/locale
 @dirrm %%LIECE_ETCDIR%%/styles
 @dirrm %%LIECE_ETCDIR%%
 %%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 5f11982..2096c17 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -6,24 +6,21 @@
 #
 
 PORTNAME=	liece
-PORTVERSION=	1.4.6
+PORTVERSION=	1.4.7
 CATEGORIES=	irc elisp
 MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	yoichi@FreeBSD.org
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
+BUILD_DEPENDS+=	${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
 		${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
-RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
+RUN_DEPENDS+=	${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
 		${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
 
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-FLIM_TRUNK=	1.14
-FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
-
 EMACS_PORT_NAME?=	emacs21
 
 DIRSECTION?=		"The Emacs editor and associated tools"
@@ -80,9 +77,7 @@ 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
-	${INSTALL_DATA} ${WRKSRC}/etc/po/liece.mo ${PREFIX}/${LIECE_ETCDIR}/po/ja_JP.EUC/LC_MESSAGES
+	${LN} -sf ja ${PREFIX}/${LIECE_ETCDIR}/locale/ja_JP.EUC
 .if !defined(NOPORTDOCS)
 #	${INSTALL_DATA} ${WRKSRC}/etc/sample.dot.emacs ${PREFIX}/${LIECE_ETCDIR}/
 	${MKDIR} ${PREFIX}/${LIECE_ETCDIR}/doc
diff --git a/irc/riece/distinfo b/irc/riece/distinfo
index a919304..7f8462a 100644
--- a/irc/riece/distinfo
+++ b/irc/riece/distinfo
@@ -1 +1 @@
-MD5 (liece-1.4.6.tar.gz) = f7a52a6ffc6a18fd26035cf201a2dc49
+MD5 (liece-1.4.7.tar.gz) = ed4f6fa2171031883ff6202fda7fbbb4
diff --git a/irc/riece/pkg-plist b/irc/riece/pkg-plist
index 9282d7b..25e4289 100644
--- a/irc/riece/pkg-plist
+++ b/irc/riece/pkg-plist
@@ -20,9 +20,8 @@
 %%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
-%%LIECE_ETCDIR%%/po/ja.po
-@exec ln -sf ja_JP.EUC %D/%%LIECE_ETCDIR%%/po/ja
+%%LIECE_ETCDIR%%/locale/ja/LC_MESSAGES/liece.mo
+%%LIECE_ETCDIR%%/locale/ja_JP.EUC
 %%LIECE_ETCDIR%%/styles/bottom
 %%LIECE_ETCDIR%%/styles/middle
 %%LIECE_ETCDIR%%/styles/top
@@ -34,10 +33,9 @@
 %%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%%/locale/ja/LC_MESSAGES
+@dirrm %%LIECE_ETCDIR%%/locale/ja
+@dirrm %%LIECE_ETCDIR%%/locale
 @dirrm %%LIECE_ETCDIR%%/styles
 @dirrm %%LIECE_ETCDIR%%
 %%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el