[csw-devel] SF.net SVN: gar:[2450] csw/mgar/pkg/pv/trunk

skayser at users.sourceforge.net skayser at users.sourceforge.net
Tue Dec 2 23:37:48 CET 2008


Revision: 2450
          http://gar.svn.sourceforge.net/gar/?rev=2450&view=rev
Author:   skayser
Date:     2008-12-02 22:37:48 +0000 (Tue, 02 Dec 2008)

Log Message:
-----------
pv: Updated to 1.1.4

Modified Paths:
--------------
    csw/mgar/pkg/pv/trunk/Makefile
    csw/mgar/pkg/pv/trunk/checksums
    csw/mgar/pkg/pv/trunk/files/CSWpv.gspec

Added Paths:
-----------
    csw/mgar/pkg/pv/trunk/files/fix-test-010.diff

Removed Paths:
-------------
    csw/mgar/pkg/pv/trunk/files/CSWpv.depend
    csw/mgar/pkg/pv/trunk/files/CSWpv.prototype

Modified: csw/mgar/pkg/pv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pv/trunk/Makefile	2008-12-02 22:25:06 UTC (rev 2449)
+++ csw/mgar/pkg/pv/trunk/Makefile	2008-12-02 22:37:48 UTC (rev 2450)
@@ -1,8 +1,8 @@
 GARNAME = pv
-GARVERSION = 0.9.2
+GARVERSION = 1.1.4
 CATEGORIES = utils
 
-DESCRIPTION = pipeviewer, like cat with progress indications
+DESCRIPTION =  Monitor the progress of data through a pipe
 define BLURB
   Pipe Viewer is a terminal-based tool for monitoring the progress
   of data through a pipeline. It can be inserted into any normal
@@ -16,17 +16,23 @@
 SPKG_SOURCEURL = http://www.ivarch.com/programs/pv.shtml
 
 # Source files
-MASTER_SITES = http://unc.dl.sourceforge.net/sourceforge/pipeviewer/
+MASTER_SITES = http://pipeviewer.googlecode.com/files/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += CSWpv.gspec CSWpv.depend CSWpv.prototype
+DISTFILES += $(call admfiles,CSWpv)
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+# Trim extra whitespaces from Solaris wc
+PATCHFILES = fix-test-010.diff
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk
 
 post-install:
-	@gunzip $(DESTDIR)$(infodir)/pv.info.gz $(DESTDIR)$(mandir)/man1/pv.1.gz
-
+	@gunzip $(DESTDIR)$(mandir)/man1/pv.1.gz
+	@ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME)
+	@ginstall -m 644 \
+		$(WORKSRC)/doc/NEWS \
+		$(DESTDIR)$(docdir)/$(GARNAME)

Modified: csw/mgar/pkg/pv/trunk/checksums
===================================================================
--- csw/mgar/pkg/pv/trunk/checksums	2008-12-02 22:25:06 UTC (rev 2449)
+++ csw/mgar/pkg/pv/trunk/checksums	2008-12-02 22:37:48 UTC (rev 2450)
@@ -1,4 +1,3 @@
-a8e31f4e38088b905f5d4f13c670315c  download/pv-0.9.2.tar.gz
-21a2120662bb32256fe233ba6a982168  download/CSWpv.gspec
-573b8784f4f5f70bb86196a72b0979b6  download/CSWpv.depend
-c4ee27ed85a7e450a84757e5cf6fd617  download/CSWpv.prototype
+8d0eda2182640919daaf6186cd816a13  download/pv-1.1.4.tar.gz
+6e307b98bc517acb6353981bee5e686c  download/CSWpv.gspec
+0ea366b818f877857288b2a9a732a6d4  download/fix-test-010.diff

Deleted: csw/mgar/pkg/pv/trunk/files/CSWpv.depend
===================================================================
--- csw/mgar/pkg/pv/trunk/files/CSWpv.depend	2008-12-02 22:25:06 UTC (rev 2449)
+++ csw/mgar/pkg/pv/trunk/files/CSWpv.depend	2008-12-02 22:37:48 UTC (rev 2450)
@@ -1,2 +0,0 @@
-P CSWggettext ggettext - GNU gettext
-P CSWiconv libiconv - GNU iconv library

Modified: csw/mgar/pkg/pv/trunk/files/CSWpv.gspec
===================================================================
--- csw/mgar/pkg/pv/trunk/files/CSWpv.gspec	2008-12-02 22:25:06 UTC (rev 2449)
+++ csw/mgar/pkg/pv/trunk/files/CSWpv.gspec	2008-12-02 22:37:48 UTC (rev 2450)
@@ -1,6 +1,4 @@
 %var            bitname pv
 %var            pkgname CSWpv
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%postinstall    url file://%{PKGLIB}/csw/geninfodir
-%postremove     url file://%{PKGLIB}/csw/geninfodir
 %copyright      url file://%{WORKSRC}/doc/COPYING

Deleted: csw/mgar/pkg/pv/trunk/files/CSWpv.prototype
===================================================================
--- csw/mgar/pkg/pv/trunk/files/CSWpv.prototype	2008-12-02 22:25:06 UTC (rev 2449)
+++ csw/mgar/pkg/pv/trunk/files/CSWpv.prototype	2008-12-02 22:37:48 UTC (rev 2450)
@@ -1,21 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/pv 0755 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/info 0755 root bin
-f none /opt/csw/share/info/pv.info 0644 root bin
-d none /opt/csw/share/locale 0755 root bin
-d none /opt/csw/share/locale/de 0755 root bin
-d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/de/LC_MESSAGES/pv.mo 0644 root bin
-d none /opt/csw/share/locale/fr 0755 root bin
-d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/fr/LC_MESSAGES/pv.mo 0644 root bin
-d none /opt/csw/share/locale/pl 0755 root bin
-d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/pl/LC_MESSAGES/pv.mo 0644 root bin
-d none /opt/csw/share/locale/pt 0755 root bin
-d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/pt/LC_MESSAGES/pv.mo 0644 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man1 0755 root bin
-f none /opt/csw/share/man/man1/pv.1 0644 root bin

Added: csw/mgar/pkg/pv/trunk/files/fix-test-010.diff
===================================================================
--- csw/mgar/pkg/pv/trunk/files/fix-test-010.diff	                        (rev 0)
+++ csw/mgar/pkg/pv/trunk/files/fix-test-010.diff	2008-12-02 22:37:48 UTC (rev 2450)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru pv-1.1.4.orig/tests/010-dd pv-1.1.4/tests/010-dd
+--- pv-1.1.4.orig/tests/010-dd	2007-02-19 15:00:45.000000000 +0100
++++ pv-1.1.4/tests/010-dd	2008-12-01 15:02:00.375332231 +0100
+@@ -5,7 +5,7 @@
+ #COUNT1=`cat /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c`
+ # NB cat gets it wrong sometimes too!
+ COUNT1=100000000
+-COUNT2=`$PROG -B 100000 -q /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c`
++COUNT2=`$PROG -B 100000 -q /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c | tr -d ' '`
+ 
+ #echo "[$COUNT1] [$COUNT2]"
+ 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list