4 files changed, 21 insertions, 27 deletions

diff --git a/japanese/esecanna/Makefile b/japanese/esecanna/Makefile
index 3893df639fd3..6ee30d1e37f6 100644
--- a/japanese/esecanna/Makefile
+++ b/japanese/esecanna/Makefile
@@ -1,43 +1,38 @@
 # New ports collection Makefile for: esecanna
-# Version required:	0.13.0
+# Version required:	0.14.2
 # Date created:		24 February 2000
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	esecanna_0.13.0
-PKGNAME=	ja-esecanna-0.13.0
+DISTNAME=	esecanna_0.14.2
+PKGNAME=	ja-esecanna-0.14.2
 CATEGORIES=	japanese
-MASTER_SITES=	http://people.FreeBSD.org/~knu/ports/distfiles/ \
-		http://esecanna.netfort.gr.jp/
+MASTER_SITES=	http://esecanna.netfort.gr.jp/ \
+		http://people.FreeBSD.org/~knu/ports/distfiles/
 
 MAINTAINER=	knu@idaemons.org
 
-.include <bsd.port.pre.mk>
+USE_AUTOCONF=	yes
+USE_GMAKE=	yes
 
-.if ${PORTOBJFORMAT} == "elf"
-SHLIB_VER=	1
-.else
-SHLIB_VER=	1.0
-.endif
+DIST_SUBDIR=	esecanna
 
 STARTER=	esecanna.sh
+DOCS=		CHANGES.jp README.First.jp README.jp
 
-MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
-
-PLIST_SUB=	SHLIB_VER="${SHLIB_VER}" \
-		STARTER="${STARTER}"
+PLIST_SUB=	STARTER="${STARTER}"
 
 post-extract:
-	@perl -pe " \
+	${PERL} -pe " \
 		s,!!PREFIX!!,${PREFIX},g; \
 		s,!!STARTER!!,${STARTER},g; \
 		" \
 		${FILESDIR}/esecanna.sh > ${WRKSRC}/${STARTER}
 
-do-configure:
-	@cd ${WRKSRC} && perl -i -pe " \
+post-patch:
+	cd ${WRKSRC} && ${PERL} -i -pe " \
 		s,!!PREFIX!!,${PREFIX},g; \
 		" \
 		README.jp \
@@ -45,13 +40,13 @@ do-configure:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${STARTER} ${PREFIX}/etc/rc.d/
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	${MKDIR} ${PREFIX}/lib/esecanna
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/esecanna
-	cd ${WRKSRC} && ${INSTALL_DATA} README.First.jp README.jp ${PREFIX}/share/doc/esecanna/
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/esecanna/
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/esecanna/distinfo b/japanese/esecanna/distinfo
index 3b758b0acd69..bcd26368fabc 100644
--- a/japanese/esecanna/distinfo
+++ b/japanese/esecanna/distinfo
@@ -1 +1 @@
-MD5 (esecanna_0.13.0.tar.gz) = 7a7e8802c155da4e1a11203997834b34
+MD5 (esecanna/esecanna_0.14.2.tar.gz) = cbeac7f89d7ed0c41e192866c47e9c47
diff --git a/japanese/esecanna/pkg-message b/japanese/esecanna/pkg-message
index 0adea1a5bf4f..117ef4f9c710 100644
--- a/japanese/esecanna/pkg-message
+++ b/japanese/esecanna/pkg-message
@@ -3,7 +3,7 @@ Quick Setup:
   Take the following step all as root.
     1) Install one of the esecanna-module ports
     2) Edit `/usr/local/etc/esecannarc'
-    3) Run `/usr/local/etc/rc.d/zz.esecanna.sh'
+    3) Run `/usr/local/etc/rc.d/esecanna.sh'
 
   Each user may want to configure the behavior by editing
 `~/.esecannarc', copied after `/usr/local/etc/esecannarc'.
diff --git a/japanese/esecanna/pkg-plist b/japanese/esecanna/pkg-plist
index 1a0a92806f9b..a15e1b49bfc0 100644
--- a/japanese/esecanna/pkg-plist
+++ b/japanese/esecanna/pkg-plist
@@ -1,10 +1,9 @@
 etc/esecannarc
 etc/rc.d/%%STARTER%%
-lib/libesecanna.so
-lib/libesecanna.so.%%SHLIB_VER%%
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec mkdir -p %D/lib/esecanna
+@dirrm lib/esecanna
 sbin/esecannaserver
+share/doc/esecanna/CHANGES.jp
 share/doc/esecanna/README.First.jp
 share/doc/esecanna/README.jp
 @dirrm share/doc/esecanna