[csw-devel] SF.net SVN: gar:[8765] csw/mgar/pkg/zutils/trunk

[dmichelsen at users.sourceforge.net]

Revision: 8765
          http://gar.svn.sourceforge.net/gar/?rev=8765&view=rev
Author:   dmichelsen
Date:     2010-02-23 14:57:38 +0000 (Tue, 23 Feb 2010)

Log Message:
-----------
zutils: Use Zutils instead of zutils

Modified Paths:
--------------
    csw/mgar/pkg/zutils/trunk/Makefile
    csw/mgar/pkg/zutils/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch

Modified: csw/mgar/pkg/zutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zutils/trunk/Makefile	2010-02-23 14:27:48 UTC (rev 8764)
+++ csw/mgar/pkg/zutils/trunk/Makefile	2010-02-23 14:57:38 UTC (rev 8765)
@@ -16,6 +16,7 @@
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES  = 0001-Use-inttypes-instead-of-stdint.patch
 PATCHFILES += 0002-Use-correct-path-on-testsuite.patch
+PATCHFILES += 0003-Use-Zutils-instead-of-zutils.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/zutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/zutils/trunk/checksums	2010-02-23 14:27:48 UTC (rev 8764)
+++ csw/mgar/pkg/zutils/trunk/checksums	2010-02-23 14:57:38 UTC (rev 8765)
@@ -1,3 +1,4 @@
 649455382564a2724f207badf40a26eb  0001-Use-inttypes-instead-of-stdint.patch
 fce5a15a5f23bb5e3e44009823031c5f  0002-Use-correct-path-on-testsuite.patch
+b6d252ee0235190dac20876097d451d0  0003-Use-Zutils-instead-of-zutils.patch
 c9163bbaf3c6e84044b86b58fa9fe3ff  zutils-0.7.tar.gz

Added: csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch	                        (rev 0)
+++ csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch	2010-02-23 14:57:38 UTC (rev 8765)
@@ -0,0 +1,124 @@
+From 594dfe11efc4dd32d988e96e74b7c164e1ac9718 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 23 Feb 2010 15:55:20 +0100
+Subject: [PATCH] Use Zutils instead of zutils
+
+---
+ zcat.in  |    6 +++---
+ zdiff.in |    4 ++--
+ zgrep.in |    6 +++---
+ ztest.in |    6 +++---
+ 4 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/zcat.in b/zcat.in
+index 010b7bb..3d133a9 100644
+--- a/zcat.in
++++ b/zcat.in
+@@ -67,7 +67,7 @@ done
+ 
+ if [ $# = 0 ] ; then
+ 	bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
+-	prog_name=`"${bindir}"zutils -t`
++	prog_name=`"${bindir}"Zutils -t`
+ 	case "${prog_name}" in
+ 	bzip2)	prog="bzip2 -cdfq" ;;
+ 	gzip)	prog="gzip -cdfq ${gz_args}" ;;
+@@ -75,7 +75,7 @@ if [ $# = 0 ] ; then
+ 	xz)	prog="xz -cdfq ${xz_args}" ;;
+ 	*)	prog=cat ;;
+ 	esac
+-	{ "${bindir}"zutils -m ${prog_name} ; cat ; } | ${prog} | cat ${args}
++	{ "${bindir}"Zutils -m ${prog_name} ; cat ; } | ${prog} | cat ${args}
+ 	exit $?
+ fi
+ 
+@@ -98,7 +98,7 @@ for i in "$@" ; do
+ 			fi
+ 		fi
+ 		bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
+-		prog_name=`"${bindir}"zutils -t -- "$i"`
++		prog_name=`"${bindir}"Zutils -t -- "$i"`
+ 		case "${prog_name}" in
+ 		bzip2)	prog="bzip2 -cdfq" ;;
+ 		gzip)	prog="gzip -cdfq ${gz_args}" ;;
+diff --git a/zdiff.in b/zdiff.in
+index 0ece51f..fc1d4e1 100644
+--- a/zdiff.in
++++ b/zdiff.in
+@@ -120,13 +120,13 @@ prog1=
+ prog2=
+ bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
+ if [ -f "${file1}" ] ; then
+-	prog_name=`"${bindir}"zutils -t -- "${file1}"`
++	prog_name=`"${bindir}"Zutils -t -- "${file1}"`
+ 	case "${prog_name}" in
+ 	bzip2 | gzip | lzip | xz) prog1=${prog_name} ;;
+ 	esac
+ fi
+ if [ -f "${file2}" ] ; then
+-	prog_name=`"${bindir}"zutils -t -- "${file2}"`
++	prog_name=`"${bindir}"Zutils -t -- "${file2}"`
+ 	case "${prog_name}" in
+ 	bzip2 | gzip | lzip | xz) prog2=${prog_name} ;;
+ 	esac
+diff --git a/zgrep.in b/zgrep.in
+index 3298646..1d9b34a 100644
+--- a/zgrep.in
++++ b/zgrep.in
+@@ -85,12 +85,12 @@ fi
+ 
+ if [ $# = 0 ] ; then
+ 	bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
+-	prog_name=`"${bindir}"zutils -t`
++	prog_name=`"${bindir}"Zutils -t`
+ 	case "${prog_name}" in
+ 	bzip2 | gzip | lzip | xz) prog="${prog_name} -cdfq" ;;
+ 	*)	prog=cat ;;
+ 	esac
+-	{ "${bindir}"zutils -m ${prog_name} ; cat ; } | ${prog} | grep ${args}
++	{ "${bindir}"Zutils -m ${prog_name} ; cat ; } | ${prog} | grep ${args}
+ 	exit $?
+ fi
+ 
+@@ -110,7 +110,7 @@ for i in "$@" ; do
+ 			fi
+ 		fi
+ 		bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
+-		prog_name=`"${bindir}"zutils -t -- "$i"`
++		prog_name=`"${bindir}"Zutils -t -- "$i"`
+ 		case "${prog_name}" in
+ 		bzip2 | gzip | lzip | xz) prog="${prog_name} -cdfq" ;;
+ 		*)	prog=cat ;;
+diff --git a/ztest.in b/ztest.in
+index f56c853..a9973d7 100644
+--- a/ztest.in
++++ b/ztest.in
+@@ -60,14 +60,14 @@ done
+ 
+ if [ $# = 0 ] ; then
+ 	bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
+-	prog=`"${bindir}"zutils -t`
++	prog=`"${bindir}"Zutils -t`
+ 	case "${prog}" in
+ 	bzip2 | gzip | lzip | xz)
+ 		;;
+ 	*)	echo "$0: Unknown data format read from stdin" 1>&2
+ 		exit 1 ;;
+ 	esac
+-	{ "${bindir}"zutils -m ${prog} ; cat ; } | ${prog} -t ${args}
++	{ "${bindir}"Zutils -m ${prog} ; cat ; } | ${prog} -t ${args}
+ 	exit $?
+ fi
+ 
+@@ -87,7 +87,7 @@ for i in "$@" ; do
+ 			fi
+ 		fi
+ 		bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
+-		prog=`"${bindir}"zutils -t -- "$i"`
++		prog=`"${bindir}"Zutils -t -- "$i"`
+ 		case "${prog}" in
+ 		bzip2 | gzip | lzip | xz)
+ 			;;
+-- 
+1.6.6
+


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