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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Mar 31 16:10:44 CEST 2011 

Revision: 14030
          http://gar.svn.sourceforge.net/gar/?rev=14030&view=rev
Author:   dmichelsen
Date:     2011-03-31 14:10:44 +0000 (Thu, 31 Mar 2011)

Log Message:
-----------
zutils: Update to 0.9 and general cleanup

Modified Paths:
--------------
    csw/mgar/pkg/zutils/trunk/Makefile
    csw/mgar/pkg/zutils/trunk/checksums
    csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch

Removed Paths:
-------------
    csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch

Modified: csw/mgar/pkg/zutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zutils/trunk/Makefile	2011-03-31 13:47:38 UTC (rev 14029)
+++ csw/mgar/pkg/zutils/trunk/Makefile	2011-03-31 14:10:44 UTC (rev 14030)
@@ -1,5 +1,5 @@
 NAME = zutils
-VERSION = 0.8
+VERSION = 0.9
 CATEGORIES = utils
 
 DESCRIPTION = Utilities to deal with compressed and non-compressed files
@@ -12,24 +12,24 @@
   planned to be implemented soon.
 endef
 
+
 MASTER_SITES = http://download.savannah.gnu.org/releases/zutils/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES = $(DISTNAME).tar.gz
 PATCHFILES  = 0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch
 PATCHFILES += 0002-Use-correct-path-on-testsuite.patch
 PATCHFILES += 0003-Use-Zutils-instead-of-zutils.patch
-PATCHFILES += 0004-Fix-ambinguity-to-str.insert.patch
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+BUILD_DEP_PKGS += CSWhelp2man
+BUILD_DEP_PKGS += CSWlzip
 
-BUILD_DEP_PKGS = CSWhelp2man CSWlzip
-
 # The lzip binary is used from the scripts which is not detected by checkpkg
 RUNTIME_DEP_PKGS = CSWlzip
 CHECKPKG_OVERRIDES_CSWzutils += surplus-dependency|CSWlzip
 
 VENDOR_URL = http://www.nongnu.org/zutils/zutils.html
 
+EXTRA_LINKER_FLAGS = -norunpath
+
 NODIRPATHS = --includedir
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += CXX="$(CXX)"
@@ -44,18 +44,6 @@
 
 EXTRA_PAX_ARGS = -s ",/z,/Z,p"
 
-# These are false positives as lower case 'z' is in CSWgzipextras.
-CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zcmp|CSWgzipextras|CSWzutils
-CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/share/man/man1/Zcat.1|CSWgzipextras|CSWzutils
-CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zcat|CSWgzipextras|CSWzutils
-CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/share/man/man1/Zcmp.1|CSWgzipextras|CSWzutils
-CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zgrep|CSWgzipextras|CSWzutils
-CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zegrep|CSWgzipextras|CSWzutils
-CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zdiff|CSWgzipextras|CSWzutils
-CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/share/man/man1/Zdiff.1|CSWgzipextras|CSWzutils
-CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zfgrep|CSWgzipextras|CSWzutils
-CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/share/man/man1/Zgrep.1|CSWgzipextras|CSWzutils
-
 include gar/category.mk
 
 post-extract-modulated:

Modified: csw/mgar/pkg/zutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/zutils/trunk/checksums	2011-03-31 13:47:38 UTC (rev 14029)
+++ csw/mgar/pkg/zutils/trunk/checksums	2011-03-31 14:10:44 UTC (rev 14030)
@@ -1 +1 @@
-e7607d23b62ef3c4c74baed04a79ec6d  zutils-0.8.tar.gz
+487eb9549793be6ed7c2de324d4f12df  zutils-0.9.tar.gz

Modified: csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch	2011-03-31 13:47:38 UTC (rev 14029)
+++ csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch	2011-03-31 14:10:44 UTC (rev 14030)
@@ -1,17 +1,17 @@
-From 58974984d2356dbe92326769535f7ca7eb6c6588 Mon Sep 17 00:00:00 2001
+From 112d2b1f1b25a4d1451465d9c546c5dc7797d1b5 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 19 Nov 2010 14:30:36 +0100
+Date: Thu, 31 Mar 2011 16:00:44 +0200
 Subject: [PATCH] Use inttypes.h instead of stdint.h and add signal.h
 
 ---
  main.cc   |    3 ++-
- zcmp.cc   |    2 +-
+ zcmp.cc   |    3 ++-
  zdiff.cc  |    3 ++-
  zutils.cc |    2 +-
- 4 files changed, 6 insertions(+), 4 deletions(-)
+ 4 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/main.cc b/main.cc
-index bc7c5fb..fc598df 100644
+index 5059ce3..5ac5587 100644
 --- a/main.cc
 +++ b/main.cc
 @@ -28,7 +28,8 @@
@@ -25,20 +25,21 @@
  #include <sys/stat.h>
  #if defined(__MSVCRT__) || defined(__OS2__)
 diff --git a/zcmp.cc b/zcmp.cc
-index caa7852..32275b6 100644
+index b00d40b..7e41ea5 100644
 --- a/zcmp.cc
 +++ b/zcmp.cc
-@@ -27,7 +27,7 @@
+@@ -27,7 +27,8 @@
  #include <string>
  #include <vector>
  #include <fcntl.h>
 -#include <stdint.h>
 +#include <inttypes.h>
++#include <signal.h>
  #include <unistd.h>
  #include <sys/stat.h>
  #if defined(__MSVCRT__) || defined(__OS2__)
 diff --git a/zdiff.cc b/zdiff.cc
-index d01f492..138a75b 100644
+index 28425a3..d57a0b0 100644
 --- a/zdiff.cc
 +++ b/zdiff.cc
 @@ -27,7 +27,8 @@
@@ -52,7 +53,7 @@
  #include <sys/stat.h>
  #if defined(__MSVCRT__) || defined(__OS2__)
 diff --git a/zutils.cc b/zutils.cc
-index 5451534..367e933 100644
+index 1324f89..559a977 100644
 --- a/zutils.cc
 +++ b/zutils.cc
 @@ -22,7 +22,7 @@
@@ -65,5 +66,5 @@
  #include <sys/wait.h>
  
 -- 
-1.7.3
+1.7.3.2
 

Deleted: csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch	2011-03-31 13:47:38 UTC (rev 14029)
+++ csw/mgar/pkg/zutils/trunk/files/0004-Fix-ambinguity-to-str.insert.patch	2011-03-31 14:10:44 UTC (rev 14030)
@@ -1,25 +0,0 @@
-From f0b61c050f2b244a33a7c19b8c2164d95725470d Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 19 Nov 2010 14:28:47 +0100
-Subject: [PATCH 4/4] Fix ambinguity to str.insert
-
----
- zcat.cc |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/zcat.cc b/zcat.cc
-index f813bbe..34a37f3 100644
---- a/zcat.cc
-+++ b/zcat.cc
-@@ -45,7 +45,7 @@ public:
-       str[i] = '0';
-       }
-     if( first_digit_pos > 0 ) str[--first_digit_pos] = '1';
--    else str.insert( 0, 1, '1' );
-+    else str.insert( (unsigned) 0, 1, '1' );
-     }
- 
-   int sprint( uint8_t * const buf )
--- 
-1.7.3
-


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