Update to 0.14.2

10 files changed, 58 insertions, 49 deletions

diff --git a/japanese/esecanna-module-vje30/Makefile b/japanese/esecanna-module-vje30/Makefile
index 98a95fe..8f617b0 100644
--- a/japanese/esecanna-module-vje30/Makefile
+++ b/japanese/esecanna-module-vje30/Makefile
@@ -1,25 +1,29 @@
 # New ports collection Makefile for: esecanna module for VJE-Delta 3.0
-# 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-module-vje30_0.13.0
-PKGNAME=	ja-esecanna-module-vje30-0.13.0
+DISTNAME=	esecanna-module-vje30_0.14.2
+PKGNAME=	ja-esecanna-module-vje30-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
 
-LIB_DEPENDS=	esecanna.1:${PORTSDIR}/japanese/esecanna
+RUN_DEPENDS=	${LOCALBASE}/sbin/esecannaserver:${PORTSDIR}/japanese/esecanna
 
+USE_AUTOCONF=	yes
+USE_GMAKE=	yes
 # VJE-Delta 3.0 is installed under /usr/local fixedly
-MAKE_ENV=	RCDIR="${PREFIX}/etc" VJECFGFILE="/usr/local/etc/vje30/vje.cfg"
+CONFIGURE_ARGS=	--with-vjecfgfile="/usr/local/etc/vje30/vje.cfg"
 
-do-configure:
+DIST_SUBDIR=    esecanna
+
+post-patch:
 	@cd ${WRKSRC} && perl -i -pe " \
 		s,!!PREFIX!!,${PREFIX},g; \
 		" \
@@ -28,7 +32,9 @@ do-configure:
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/esecanna
-	${INSTALL_DATA} ${WRKSRC}/README.jp ${PREFIX}/share/doc/esecanna/README.vje30.jp
+.for i in README CHANGES
+	${INSTALL_DATA} ${WRKSRC}/${i}.jp ${PREFIX}/share/doc/esecanna/${i}.vje30.jp
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/esecanna-module-vje30/distinfo b/japanese/esecanna-module-vje30/distinfo
index 2154494..1a5a1b0 100644
--- a/japanese/esecanna-module-vje30/distinfo
+++ b/japanese/esecanna-module-vje30/distinfo
@@ -1 +1 @@
-MD5 (esecanna-module-vje30_0.13.0.tar.gz) = 7e4f7833b6a0b946cc4828411cdad089
+MD5 (esecanna/esecanna-module-vje30_0.14.2.tar.gz) = 565ee04a21df5b7a00e02793f72e0ce2
diff --git a/japanese/esecanna-module-vje30/pkg-plist b/japanese/esecanna-module-vje30/pkg-plist
index c8fc020..caa108d 100644
--- a/japanese/esecanna-module-vje30/pkg-plist
+++ b/japanese/esecanna-module-vje30/pkg-plist
@@ -1,3 +1,4 @@
+lib/esecanna/vje30.la
 lib/esecanna/vje30.so
-@unexec rmdir %D/lib/esecanna 2>/dev/null || true
+share/doc/esecanna/CHANGES.vje30.jp
 share/doc/esecanna/README.vje30.jp
diff --git a/japanese/esecanna-module-wnn6/Makefile b/japanese/esecanna-module-wnn6/Makefile
index 478487c..9e300d0 100644
--- a/japanese/esecanna-module-wnn6/Makefile
+++ b/japanese/esecanna-module-wnn6/Makefile
@@ -1,28 +1,35 @@
 # New ports collection Makefile for: esecanna module for Wnn6
-# Version required:	0.13.0
+# Version required:	0.14.2
 # Date created:		26 February 2000
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	esecanna-module-wnn6_0.13.0
-PKGNAME=	ja-esecanna-module-wnn6-0.13.0
+DISTNAME=	esecanna-module-wnn6_0.14.2
+PKGNAME=	ja-esecanna-module-wnn6-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
 
-LIB_DEPENDS=	esecanna.1:${PORTSDIR}/japanese/esecanna \
-		wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
+LIB_DEPENDS=	wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
+RUN_DEPENDS=	${LOCALBASE}/sbin/esecannaserver:${PORTSDIR}/japanese/esecanna
 
-MAKE_ENV=	RCDIR="${PREFIX}/etc"
+USE_AUTOCONF=	yes
+USE_GMAKE=	yes
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${PREFIX}/include" \
+		LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
+
+DIST_SUBDIR=    esecanna
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/esecanna
-	${INSTALL_DATA} ${WRKSRC}/README.jp ${PREFIX}/share/doc/esecanna/README.wnn6.jp
+.for i in README CHANGES
+	${INSTALL_DATA} ${WRKSRC}/${i}.jp ${PREFIX}/share/doc/esecanna/${i}.wnn6.jp
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/esecanna-module-wnn6/distinfo b/japanese/esecanna-module-wnn6/distinfo
index 1d4688a..66a0f19 100644
--- a/japanese/esecanna-module-wnn6/distinfo
+++ b/japanese/esecanna-module-wnn6/distinfo
@@ -1 +1 @@
-MD5 (esecanna-module-wnn6_0.13.0.tar.gz) = 86bc1fc11baf0f11deb25afd1c461444
+MD5 (esecanna/esecanna-module-wnn6_0.14.2.tar.gz) = 9a78d78fbf0b2cd19c4de622f2a4e5c9
diff --git a/japanese/esecanna-module-wnn6/pkg-plist b/japanese/esecanna-module-wnn6/pkg-plist
index 14c5286..8ee6fac 100644
--- a/japanese/esecanna-module-wnn6/pkg-plist
+++ b/japanese/esecanna-module-wnn6/pkg-plist
@@ -1,3 +1,4 @@
+lib/esecanna/wnn6.la
 lib/esecanna/wnn6.so
-@unexec rmdir %D/lib/esecanna 2>/dev/null || true
+share/doc/esecanna/CHANGES.wnn6.jp
 share/doc/esecanna/README.wnn6.jp
diff --git a/japanese/esecanna/Makefile b/japanese/esecanna/Makefile
index 3893df6..6ee30d1 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 3b758b0..bcd2636 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 0adea1a..117ef4f 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 1a0a928..a15e1b4 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