Update to version 2.4.1

PR:		11128
Submitted by:	maintainer

4 files changed, 41 insertions, 33 deletions

diff --git a/japanese/bookview/Makefile b/japanese/bookview/Makefile
index 77a2123afeb7..de14c8f72a31 100644
--- a/japanese/bookview/Makefile
+++ b/japanese/bookview/Makefile
@@ -1,32 +1,32 @@
 # New ports collection makefile for:	bookview
-# Version required:		2.2
+# Version required:		2.4.1
 # Date created:			2 Oct 1997
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/26 02:33:01 steve Exp $
+# $Id: Makefile,v 1.3 1999/03/13 07:30:16 taoka Exp $
 #
 
-DISTNAME=	bookview-2.2.1
-PKGNAME=	ja-bookview-2.2.1
+DISTNAME=	bookview-2.4.1
+PKGNAME=	ja-bookview-2.4.1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/bookview/ \
-		ftp://ftp.sra.co.jp/pub/net/ndtp/bookview/old/
+		ftp://ftp.sra.co.jp/pub/net/ndtp/bookview/old/ \
+		ftp://ftp.mei.co.jp/free/others/Dictionary/ndtp/bookview/
 
 MAINTAINER=	takamune@avrl.mei.co.jp
 
-RUN_DEPENDS=	${PREFIX}/bin/wish8.0jp:${PORTSDIR}/japanese/tk80
+RUN_DEPENDS=	wish8.0jp:${PORTSDIR}/japanese/tk80
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	WISH=${PREFIX}/bin/wish8.0jp \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}"
 
-post-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-.for info in bookview bookview-ja
-	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-.endfor
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+pre-install:
+.if !exists(${PREFIX}/info/dir)
+	${CP} -p ${INFODIR}/dir-tmpl ${PREFIX}/info/dir
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/japanese/bookview/distinfo b/japanese/bookview/distinfo
index bc1e2d9675cc..f126a6a62bc7 100644
--- a/japanese/bookview/distinfo
+++ b/japanese/bookview/distinfo
@@ -1 +1 @@
-MD5 (bookview-2.2.1.tar.gz) = 712f02b9f1eab7821faafdc93377c3fa
+MD5 (bookview-2.4.1.tar.gz) = 132b30dd4adfb473051363b3cc649f47
diff --git a/japanese/bookview/pkg-descr b/japanese/bookview/pkg-descr
index 08d3cf50c053..95bc7cb36dfa 100644
--- a/japanese/bookview/pkg-descr
+++ b/japanese/bookview/pkg-descr
@@ -1,8 +1,11 @@
 BookView is a NDTP (Network Dictionary Transfer Protocol) client
-written in Tcl/Tk.  It requires Tcl7.6jp and Tk4.2jp (Japanized
-version).  BookView can talk to the following servers:
-
-	NDTPD version 1.0beta2 and later
-	dserver version 2.2betapl2
+written in Tcl/Tk.  It requires Tcl8.0jp and Tk8.0jp (Japanized
+version).  BookView can talk to NDTPD and dserver.
 
 -- Motoyuki Kasahara <m-kasahr@sra.co.jp>
+
+
+You can get information about BookView from
+	http://www.sra.co.jp/people/m-kasahr/bookview/
+
+-- Kazutoki TAKAMUNE <takamune@avrl.mei.co.jp>
diff --git a/japanese/bookview/pkg-plist b/japanese/bookview/pkg-plist
index 55a2a0eec414..8c437ab1687d 100644
--- a/japanese/bookview/pkg-plist
+++ b/japanese/bookview/pkg-plist
@@ -1,17 +1,22 @@
 bin/bookview
+@unexec install-info --delete %D/info/bookview-ja.info %D/info/dir
+@unexec install-info --delete %D/info/bookview.info %D/info/dir
+info/bookview-ja.info
+info/bookview.info
+@exec [ -f %B/dir ] || cp -p /usr/share/info/dir-tmpl %B/dir
+@exec install-info %B/bookview-ja.info %B/dir
+@exec install-info %B/bookview.info %B/dir
 share/bookview/arrow.xbm
-share/bookview/back.xbm
-share/bookview/copyright.xbm
-share/bookview/menu.xbm
-share/bookview/next.xbm
-share/bookview/space.xbm
-share/bookview/help.txt
+share/bookview/copyright.gif
+share/bookview/find.gif
+share/bookview/finder.tcl
 share/bookview/help-ja.txt
+share/bookview/help.tcl
+share/bookview/help.txt
+share/bookview/menu.gif
+share/bookview/ndtp.tcl
+share/bookview/next.gif
+share/bookview/prev.gif
+share/bookview/setup.tcl
+share/bookview/space.xbm
 @dirrm share/bookview
-@unexec install-info --delete %D/info/bookview.info    %D/info/dir
-@unexec install-info --delete %D/info/bookview-ja.info %D/info/dir
-info/bookview.info
-info/bookview-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/bookview.info    %D/info/dir
-@exec install-info %D/info/bookview-ja.info %D/info/dir