- Update to 3.2.1

PR:		122500
Submitted by:	Ports Fury

3 files changed, 66 insertions, 28 deletions

diff --git a/japanese/bookview/Makefile b/japanese/bookview/Makefile
index 1a4f2265cac5..42224746257e 100644
--- a/japanese/bookview/Makefile
+++ b/japanese/bookview/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bookview
-PORTVERSION=	3.2
-PORTREVISION=	1
+PORTVERSION=	3.2.1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/bookview/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/net/ndtp/bookview/
@@ -15,12 +14,27 @@ MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/bookview/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NDTP client written in Tcl/Tk
 
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+USE_TK_WRAPPER=		yes
 
-INFO=		bookview-ja bookview
+do-build:
+.for i in bookview/bookview doc/bookview.html
+	cd ${WRKSRC} && ${SED} -e \
+		's|@WISH@|${WISH}|g ; \
+		 s|@VERSION@|${PORTVERSION}|g ; \
+		 s|@sysconfdir@|${PREFIX}/etc|g ; \
+		 s|@pkgdatadir@|${DATADIR}|g' < ${i}.in > ${i}
+.endfor
 
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	WISH=${LOCALBASE}/bin/wish8.4
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/bookview/bookview ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/bitmap/*.gif ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/bitmap/*.xbm ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/bookview/*.tcl ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/bookview/*.mo ${DATADIR}
+	@${MKDIR} ${DATADIR}/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/*.css ${DATADIR}/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DATADIR}/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DATADIR}/doc
 
 .include <bsd.port.mk>
diff --git a/japanese/bookview/distinfo b/japanese/bookview/distinfo
index 60080098d736..40cee4c312e1 100644
--- a/japanese/bookview/distinfo
+++ b/japanese/bookview/distinfo
@@ -1,3 +1,3 @@
-MD5 (bookview-3.2.tar.gz) = dfd95f77d5df8ad65cf12b6e7dd1b9b4
-SHA256 (bookview-3.2.tar.gz) = 77fb8d253dae5772c2182da65a2dbd11ea2b8aad9035b1fa0dbd3388219e0051
-SIZE (bookview-3.2.tar.gz) = 244807
+MD5 (bookview-3.2.1.tar.gz) = 98d80dc91322b7004207cfe4ad45eeea
+SHA256 (bookview-3.2.1.tar.gz) = c579fb02b0f52618b0a881aa47ea4f2fd9deda92672c35a0099889eaf842c42a
+SIZE (bookview-3.2.1.tar.gz) = 311798
diff --git a/japanese/bookview/pkg-plist b/japanese/bookview/pkg-plist
index 193754105d61..8b3b8d296d55 100644
--- a/japanese/bookview/pkg-plist
+++ b/japanese/bookview/pkg-plist
@@ -1,19 +1,43 @@
 bin/bookview
-share/bookview/arrow.xbm
-share/bookview/backward.xbm
-share/bookview/copyright.gif
-share/bookview/find.gif
-share/bookview/finder.tcl
-share/bookview/forward.xbm
-share/bookview/help-ja.txt
-share/bookview/help.tcl
-share/bookview/help.txt
-share/bookview/ja.mo
-share/bookview/menu.gif
-share/bookview/message.tcl
-share/bookview/ndtp.tcl
-share/bookview/next.gif
-share/bookview/prev.gif
-share/bookview/setup.tcl
-share/bookview/space.xbm
-@dirrm share/bookview
+%%DATADIR%%/arrow.xbm
+%%DATADIR%%/backward.xbm
+%%DATADIR%%/copyright.gif
+%%DATADIR%%/doc/backward.png
+%%DATADIR%%/doc/bitmap.png
+%%DATADIR%%/doc/book.png
+%%DATADIR%%/doc/booklist.png
+%%DATADIR%%/doc/bookview.css
+%%DATADIR%%/doc/bookview.html
+%%DATADIR%%/doc/copyright.png
+%%DATADIR%%/doc/find.png
+%%DATADIR%%/doc/find2.png
+%%DATADIR%%/doc/forward.png
+%%DATADIR%%/doc/history.png
+%%DATADIR%%/doc/history2.png
+%%DATADIR%%/doc/main.png
+%%DATADIR%%/doc/menu.png
+%%DATADIR%%/doc/method.png
+%%DATADIR%%/doc/padding.png
+%%DATADIR%%/doc/quit.png
+%%DATADIR%%/doc/reference.png
+%%DATADIR%%/doc/search.png
+%%DATADIR%%/doc/search2.png
+%%DATADIR%%/doc/selection.png
+%%DATADIR%%/doc/selection2.png
+%%DATADIR%%/doc/server.png
+%%DATADIR%%/doc/setup.png
+%%DATADIR%%/doc/setup2.png
+%%DATADIR%%/doc/toolbar.png
+%%DATADIR%%/find.gif
+%%DATADIR%%/finder.tcl
+%%DATADIR%%/forward.xbm
+%%DATADIR%%/ja.mo
+%%DATADIR%%/menu.gif
+%%DATADIR%%/message.tcl
+%%DATADIR%%/ndtp.tcl
+%%DATADIR%%/next.gif
+%%DATADIR%%/prev.gif
+%%DATADIR%%/setup.tcl
+%%DATADIR%%/space.xbm
+@dirrm %%DATADIR%%/doc
+@dirrm %%DATADIR%%