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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Oct 29 13:20:22 CET 2012


Revision: 19534
          http://gar.svn.sourceforge.net/gar/?rev=19534&view=rev
Author:   dmichelsen
Date:     2012-10-29 12:20:21 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
zutils/trunk: Update to 1.0-rc3

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

Added Paths:
-----------
    csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch

Removed Paths:
-------------
    csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch

Modified: csw/mgar/pkg/zutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zutils/trunk/Makefile	2012-10-29 11:08:28 UTC (rev 19533)
+++ csw/mgar/pkg/zutils/trunk/Makefile	2012-10-29 12:20:21 UTC (rev 19534)
@@ -1,5 +1,5 @@
 NAME = zutils
-VERSION = 0.9
+VERSION = 1.0-rc3
 CATEGORIES = utils
 GARTYPE = v2
 
@@ -15,10 +15,10 @@
 
 
 MASTER_SITES = http://download.savannah.gnu.org/releases/zutils/
-DISTFILES = $(DISTNAME).tar.gz
+DISTFILES = $(DISTNAME).tar.lz
 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-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch
 
 BUILD_DEP_PKGS += CSWhelp2man
 BUILD_DEP_PKGS += CSWlzip
@@ -31,6 +31,9 @@
 
 EXTRA_LINKER_FLAGS = -norunpath
 
+BUILD64 = 1
+ISAEXEC = 1
+
 NODIRPATHS = --includedir
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += CXX="$(CXX)"
@@ -43,6 +46,8 @@
 
 EXTRA_PAX_ARGS = -s ",/z,/Z,p"
 
+TEST_ENV_PATH = $(bindir):$(prefix)/gnu:$(PATH)
+
 include gar/category.mk
 
 post-extract-modulated:

Modified: csw/mgar/pkg/zutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/zutils/trunk/checksums	2012-10-29 11:08:28 UTC (rev 19533)
+++ csw/mgar/pkg/zutils/trunk/checksums	2012-10-29 12:20:21 UTC (rev 19534)
@@ -1 +1 @@
-487eb9549793be6ed7c2de324d4f12df  zutils-0.9.tar.gz
+2a1c6ea7a2f62bde43474d0e39d727c8  zutils-1.0-rc3.tar.lz

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	2012-10-29 11:08:28 UTC (rev 19533)
+++ csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch	2012-10-29 12:20:21 UTC (rev 19534)
@@ -1,6 +1,6 @@
-From 112d2b1f1b25a4d1451465d9c546c5dc7797d1b5 Mon Sep 17 00:00:00 2001
+From eb0bb7a36ef4f6aaaf43c7aad9390f974d067cb1 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 31 Mar 2011 16:00:44 +0200
+Date: Mon, 29 Oct 2012 12:33:21 +0100
 Subject: [PATCH] Use inttypes.h instead of stdint.h and add signal.h
 
 ---
@@ -11,7 +11,7 @@
  4 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/main.cc b/main.cc
-index 5059ce3..5ac5587 100644
+index 38e6b13..7d5b52d 100644
 --- a/main.cc
 +++ b/main.cc
 @@ -28,7 +28,8 @@
@@ -19,41 +19,41 @@
  #include <dirent.h>
  #include <fcntl.h>
 -#include <stdint.h>
++#include <signal.h>
 +#include <inttypes.h>
-+#include <signal.h>
  #include <unistd.h>
  #include <sys/stat.h>
- #if defined(__MSVCRT__) || defined(__OS2__)
+ 
 diff --git a/zcmp.cc b/zcmp.cc
-index b00d40b..7e41ea5 100644
+index 3ebce0e..ec65d30 100644
 --- a/zcmp.cc
 +++ b/zcmp.cc
-@@ -27,7 +27,8 @@
+@@ -28,7 +28,8 @@
  #include <string>
  #include <vector>
  #include <fcntl.h>
 -#include <stdint.h>
++#include <signal.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 28425a3..d57a0b0 100644
+index 1c329bd..cc8a0b7 100644
 --- a/zdiff.cc
 +++ b/zdiff.cc
-@@ -27,7 +27,8 @@
+@@ -28,7 +28,8 @@
  #include <string>
  #include <vector>
  #include <fcntl.h>
 -#include <stdint.h>
++#include <signal.h>
 +#include <inttypes.h>
-+#include <signal.h>
  #include <unistd.h>
  #include <sys/stat.h>
- #if defined(__MSVCRT__) || defined(__OS2__)
+ 
 diff --git a/zutils.cc b/zutils.cc
-index 1324f89..559a977 100644
+index f65786f..c5abcbf 100644
 --- a/zutils.cc
 +++ b/zutils.cc
 @@ -22,7 +22,7 @@
@@ -66,5 +66,5 @@
  #include <sys/wait.h>
  
 -- 
-1.7.3.2
+1.7.10.3
 

Deleted: csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch	2012-10-29 11:08:28 UTC (rev 19533)
+++ csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch	2012-10-29 12:20:21 UTC (rev 19534)
@@ -1,27 +0,0 @@
-From bcb402f846f5eeb9d1a3cc4ac1c3c7f9aaf24cd9 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 19 Feb 2010 16:44:26 +0100
-Subject: [PATCH 1/3] Use correct path on testsuite
-
----
- testsuite/check.sh |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/testsuite/check.sh b/testsuite/check.sh
-index 073843e..fa5727c 100755
---- a/testsuite/check.sh
-+++ b/testsuite/check.sh
-@@ -5,6 +5,10 @@
- # This script is free software: you have unlimited permission
- # to copy, distribute and modify it.
- 
-+# Only ucb echo understands -n
-+PATH=/opt/csw/bin:/opt/csw/gnu:/usr/ucb:$PATH
-+export PATH
-+
- LC_ALL=C
- export LC_ALL
- objdir=`pwd`
--- 
-1.7.3
-

Added: csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch	                        (rev 0)
+++ csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch	2012-10-29 12:20:21 UTC (rev 19534)
@@ -0,0 +1,25 @@
+From f28f9f56e929af03f88e89c8620269ac815a0e8c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 29 Oct 2012 13:12:55 +0100
+Subject: [PATCH] Avoid ambiguity between char* and unsigned long on sparcv9
+
+---
+ zcat.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/zcat.cc b/zcat.cc
+index 02ab766..0c2b46a 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( 0U, 1, '1' );
++    else str.insert( (char *) NULL, 1, '1' );
+     }
+ 
+   int sprint( uint8_t * const buf )
+-- 
+1.7.10.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