[csw-devel] SF.net SVN: gar:[16133] csw/mgar/pkg/tardy/trunk

[dmichelsen at users.sourceforge.net]

Revision: 16133
          http://gar.svn.sourceforge.net/gar/?rev=16133&view=rev
Author:   dmichelsen
Date:     2011-11-08 08:42:50 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
tardy/trunk: Update to 1.25, still does not compile

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

Added Paths:
-----------
    csw/mgar/pkg/tardy/trunk/files/0002-Adjust-memchr-return-type.patch

Modified: csw/mgar/pkg/tardy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tardy/trunk/Makefile	2011-11-08 02:56:34 UTC (rev 16132)
+++ csw/mgar/pkg/tardy/trunk/Makefile	2011-11-08 08:42:50 UTC (rev 16133)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = tardy
-VERSION = 1.20
+VERSION = 1.25
 CATEGORIES = utils
 
 DESCRIPTION = A tar(1) Postprocessor
@@ -14,18 +14,20 @@
 #   https://sourceforge.net/tracker/?func=detail&aid=3170673&group_id=116896&atid=676344
 PATCHFILES += 0001-Add-includes-for-va_list-on-Solaris.patch
 
-# File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PATCHFILES += 0002-Adjust-memchr-return-type.patch
 
 LICENSE = LICENSE
 
+BUILD_DEP_PKGS += CSWlibexplain-dev
+
 PACKAGES = CSWtardy
-CATALOGNAME_CSWtardy = tardy
 SPKG_DESC_CSWtardy = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWtardy += CSWzlib
+RUNTIME_DEP_PKGS_CSWtardy += CSWlibz1
 
-CONFIGURE_ARGS = $(DIRPATHS)
+EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64
 
+CONFIGURE_ARGS += AWK=gawk
+
 include gar/category.mk
 
 pre-install-modulated:

Modified: csw/mgar/pkg/tardy/trunk/checksums
===================================================================
--- csw/mgar/pkg/tardy/trunk/checksums	2011-11-08 02:56:34 UTC (rev 16132)
+++ csw/mgar/pkg/tardy/trunk/checksums	2011-11-08 08:42:50 UTC (rev 16133)
@@ -1 +1 @@
-160c411a436b1dd3dca7ef03d69073c7  tardy-1.20.tar.gz
+27e1b625488d824d6e95412ba88c0651  tardy-1.25.tar.gz

Added: csw/mgar/pkg/tardy/trunk/files/0002-Adjust-memchr-return-type.patch
===================================================================
--- csw/mgar/pkg/tardy/trunk/files/0002-Adjust-memchr-return-type.patch	                        (rev 0)
+++ csw/mgar/pkg/tardy/trunk/files/0002-Adjust-memchr-return-type.patch	2011-11-08 08:42:50 UTC (rev 16133)
@@ -0,0 +1,33 @@
+From 94c254ecdf380031bce41f6d77ce9476116c7f12 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 8 Nov 2011 09:32:38 +0100
+Subject: [PATCH] Adjust memchr return type
+
+---
+ libtardy/ac/string.cc |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libtardy/ac/string.cc b/libtardy/ac/string.cc
+index 2881107..6a337ed 100644
+--- a/libtardy/ac/string.cc
++++ b/libtardy/ac/string.cc
+@@ -92,14 +92,14 @@ memmem(const void *haystack_v, size_t haystack_size, const void *needle_v,
+     }
+     const unsigned char *needle = (const unsigned char *)needle_v;
+     if (needle_size == 1)
+-        return memchr(haystack_v, needle[0], haystack_size);
++        return (void *) memchr(haystack_v, needle[0], haystack_size);
+     const unsigned char *haystack = (const unsigned char *)haystack_v;
+     const unsigned char *haystack_end =
+         haystack + haystack_size - needle_size + 1;
+     while (haystack < haystack_end)
+     {
+         const unsigned char *first =
+-            memchr(haystack, needle[0], haystack_end - haystack);
++            (const unsigned char *) memchr(haystack, needle[0], haystack_end - haystack);
+         if (!first)
+             break;
+         if (0 == memcmp(first + 1, needle + 1, needle_size - 1))
+-- 
+1.7.6.1
+

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