Update sysutils/pv to 0.9.6. Changes from version 0.8.6 include:

  - decimal values now accepted for rate and size, eg "-L 1.23M"
  - on the final update, blank out the now-zero ETA
  - use lockfiles if terminal locking fails
  - code cleanup & bug fixes

3 files changed, 20 insertions, 43 deletions

diff --git a/sysutils/pv/Makefile b/sysutils/pv/Makefile
index c7e9dbe526a..d34e5538d60 100644
--- a/sysutils/pv/Makefile
+++ b/sysutils/pv/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/04/07 19:54:17 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/11 02:28:09 jlam Exp $
 #
 
-DISTNAME=		pv-0.8.6
-PKGREVISION=		1
+DISTNAME=		pv-0.9.6
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.ivarch.com/programs/sources/
 MASTER_SITES+=		${MASTER_SITE_SOURCEFORGE:=pipeviewer/}
@@ -18,11 +17,21 @@ USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 INFO_FILES=		# PLIST
 
+# Don't gzip the installed info file and man pages.
+CONFIGURE_ENV+=		DO_GZIP=${TOOLS_CMD.true}
+
+DOCDIR=			${PREFIX}/share/doc/pv
+INSTALLATION_DIRS=	${DOCDIR}
+
+# Grab list of files to install from the PLIST.
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pv
-.for i in ../README index.html manual.html quickref.txt lsm NEWS TODO COPYING
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/pv
-.endfor
+	dir=${DOCDIR:S/^${PREFIX}\///:Q}; cd ${WRKSRC}/doc;		\
+	${GREP} "^$$dir/" ${PKGDIR}/PLIST | ${SED} "s|^$$dir/||" |	\
+	while read file; do						\
+		test ! -f "$$file" ||					\
+			${INSTALL_DATA} "$$file" ${PREFIX}/$$dir;	\
+	done
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pv/distinfo b/sysutils/pv/distinfo
index 213c02b0ea4..c5674b6e278 100644
--- a/sysutils/pv/distinfo
+++ b/sysutils/pv/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:40:56 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/04/11 02:28:09 jlam Exp $
 
-SHA1 (pv-0.8.6.tar.gz) = c87bd1522073f6f85fada95db24c3bd79bc846c1
-RMD160 (pv-0.8.6.tar.gz) = e77c2167b006ee00f41a4d0a28fe519fe5f5b863
-Size (pv-0.8.6.tar.gz) = 95396 bytes
-SHA1 (patch-ab) = 24bd26c660532b1a502afd4157d34af885d90db4
+SHA1 (pv-0.9.6.tar.gz) = 295107b15c92404095f761b45b156ac51e345e6b
+RMD160 (pv-0.9.6.tar.gz) = ecce86be892d8ff594daf95b3d3d483debbe7bfe
+Size (pv-0.9.6.tar.gz) = 99961 bytes
 SHA1 (patch-ac) = b6b08a88a11bd8f35d05ea995dafe672d19f1932
diff --git a/sysutils/pv/patches/patch-ab b/sysutils/pv/patches/patch-ab
deleted file mode 100644
index 84ece403a11..00000000000
--- a/sysutils/pv/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/10/27 22:45:43 wiz Exp $
-
---- autoconf/make/unreal.mk.orig	2004-04-25 00:26:08.000000000 +0200
-+++ autoconf/make/unreal.mk
-@@ -72,7 +72,7 @@ cvsclean: distclean
- 	echo > $(srcdir)/autoconf/make/filelist.mk~
- 	echo > $(srcdir)/autoconf/make/modules.mk~
- 
--doc: doc/$(package).info doc/manual.html doc/quickref.txt
-+doc: doc/$(package).info doc/quickref.txt
- 
- index:
- 	(cd $(srcdir); sh autoconf/scripts/index.sh $(srcdir)) > index.html
-@@ -133,8 +133,6 @@ install: all doc
- 	                  "$(DESTDIR)/$(mandir)/man1/$(package).1"
- 	-$(INSTALL) -m 644 doc/$(package).info \
- 	                   "$(DESTDIR)/$(infodir)/$(package).info"
--	-$(DO_GZIP) "$(DESTDIR)/$(mandir)/man1/$(package).1"
--	-$(DO_GZIP) "$(DESTDIR)/$(infodir)/$(package).info"
- 	if test -n "$(CATALOGS)"; then \
- 	  catalogs='$(CATALOGS)'; \
- 	  for cat in $$catalogs; do \
-@@ -154,8 +152,6 @@ install: all doc
- uninstall:
- 	$(UNINSTALL) "$(DESTDIR)/$(mandir)/man1/$(package).1"
- 	$(UNINSTALL) "$(DESTDIR)/$(infodir)/$(package).info"
--	$(UNINSTALL) "$(DESTDIR)/$(mandir)/man1/$(package).1.gz"
--	$(UNINSTALL) "$(DESTDIR)/$(infodir)/$(package).info.gz"
- 	if test -n "$(CATALOGS)"; then \
- 	  catalogs='$(CATALOGS)'; \
- 	  for cat in $$catalogs; do \