5 files changed, 29 insertions, 45 deletions
diff --git a/sysutils/pv/Makefile b/sysutils/pv/Makefile
index 3b5fa5bc314..f7926e21bb7 100644
--- a/sysutils/pv/Makefile
+++ b/sysutils/pv/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:18:16 tv Exp $
+# $NetBSD: Makefile,v 1.10 2004/10/27 22:45:43 wiz Exp $
 #
 
-DISTNAME=		pv-0.4.5
-PKGREVISION=		2
+DISTNAME=		pv-0.8.6
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.ivarch.com/programs/sources/
 MASTER_SITES+=		${MASTER_SITE_SOURCEFORGE:=pipeviewer/}
diff --git a/sysutils/pv/PLIST b/sysutils/pv/PLIST
index e863d59d21e..e9fe9cacdb5 100644
--- a/sysutils/pv/PLIST
+++ b/sysutils/pv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/10 01:28:59 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/10/27 22:45:43 wiz Exp $
 bin/pv
 man/man1/pv.1
 share/doc/pv/COPYING
@@ -9,13 +9,8 @@ share/doc/pv/index.html
 share/doc/pv/lsm
 share/doc/pv/manual.html
 share/doc/pv/quickref.txt
-${PKGLOCALEDIR}/locale/cz/LC_MESSAGES/pv.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/pv.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/pv.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/pv.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/pv.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/pv.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/pv.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/pv.mo
-@dirrm ${PKGLOCALEDIR}/locale/cz/LC_MESSAGES
 @dirrm share/doc/pv
diff --git a/sysutils/pv/distinfo b/sysutils/pv/distinfo
index 78c204c3c09..1ccff3c7f90 100644
--- a/sysutils/pv/distinfo
+++ b/sysutils/pv/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/01/22 21:35:49 kristerw Exp $
+$NetBSD: distinfo,v 1.3 2004/10/27 22:45:43 wiz Exp $
 
-SHA1 (pv-0.4.5.tar.gz) = 67731b80f8a08c9105fcad4cddc105042d4ec860
-Size (pv-0.4.5.tar.gz) = 105632 bytes
-SHA1 (patch-aa) = 9a822d58ef94261306d023ac964e843fd16028f0
-SHA1 (patch-ab) = 4191c14b5ea4e33ea9aa2af19e0e9b4e62a2508e
+SHA1 (pv-0.8.6.tar.gz) = c87bd1522073f6f85fada95db24c3bd79bc846c1
+Size (pv-0.8.6.tar.gz) = 95396 bytes
+SHA1 (patch-ab) = 24bd26c660532b1a502afd4157d34af885d90db4
 SHA1 (patch-ac) = b6b08a88a11bd8f35d05ea995dafe672d19f1932
diff --git a/sysutils/pv/patches/patch-aa b/sysutils/pv/patches/patch-aa
deleted file mode 100644
index 001339cc943..00000000000
--- a/sysutils/pv/patches/patch-aa
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/04 11:56:35 agc Exp $
-
---- autoconf/make/link.mk.orig	Tue Dec  3 11:31:11 2002
-+++ autoconf/make/link.mk
-@@ -10,3 +10,3 @@ intlobjs = @INTLOBJS@
- $(package): src/main.o $(intldeps) $(intlobjs) $(objgetopt)
--	$(CC) $(FINALFLAGS) -o $@ src/main.o $(intldeps) $(intlobjs) $(objgetopt)
-+	$(CC) $(LIBS) $(FINALFLAGS) -o $@ src/main.o $(intldeps) $(intlobjs) $(objgetopt)
- 
diff --git a/sysutils/pv/patches/patch-ab b/sysutils/pv/patches/patch-ab
index 76946faeb3c..84ece403a11 100644
--- a/sysutils/pv/patches/patch-ab
+++ b/sysutils/pv/patches/patch-ab
@@ -1,31 +1,31 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/12/04 11:56:35 agc Exp $
+$NetBSD: patch-ab,v 1.2 2004/10/27 22:45:43 wiz Exp $
 
---- autoconf/make/unreal.mk.orig	Tue Nov 26 13:04:51 2002
+--- autoconf/make/unreal.mk.orig	2004-04-25 00:26:08.000000000 +0200
 +++ autoconf/make/unreal.mk
-@@ -65,7 +65,7 @@ cvsclean: distclean
- 	echo -n > $(srcdir)/autoconf/make/filelist.mk~
- 	echo -n > $(srcdir)/autoconf/make/modules.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
-@@ -117,8 +117,6 @@ install: all doc
- 	                  "$(RPM_BUILD_ROOT)/$(mandir)/man1/$(package).1"
- 	$(INSTALL) -m 644 doc/$(package).info \
- 	                  "$(RPM_BUILD_ROOT)/$(infodir)/$(package).info"
--	$(DO_GZIP) "$(RPM_BUILD_ROOT)/$(mandir)/man1/$(package).1"      || :
--	$(DO_GZIP) "$(RPM_BUILD_ROOT)/$(infodir)/$(package).info"       || :
- 	catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  name=`echo $$cat | sed 's,^.*/,,g'`; \
-@@ -136,8 +134,6 @@ install: all doc
+@@ -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) "$(RPM_BUILD_ROOT)/$(mandir)/man1/$(package).1"
- 	$(UNINSTALL) "$(RPM_BUILD_ROOT)/$(infodir)/$(package).info"
--	$(UNINSTALL) "$(RPM_BUILD_ROOT)/$(mandir)/man1/$(package).1.gz"
--	$(UNINSTALL) "$(RPM_BUILD_ROOT)/$(infodir)/$(package).info.gz"
- 	catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  name=`echo $$cat | sed 's,^.*/,,g'`; \
+ 	$(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 \