Revision: 16902
http://gar.svn.sourceforge.net/gar/?rev=16902&view=rev
Author: dmichelsen
Date: 2012-01-24 13:19:55 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
rrdtool/trunk: Update to 1.4.7
Modified Paths:
--------------
csw/mgar/pkg/rrdtool/trunk/Makefile
csw/mgar/pkg/rrdtool/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
Modified: csw/mgar/pkg/rrdtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/Makefile 2012-01-24 12:48:29 UTC (rev 16901)
+++ csw/mgar/pkg/rrdtool/trunk/Makefile 2012-01-24 13:19:55 UTC (rev 16902)
@@ -1,5 +1,5 @@
NAME = rrdtool
-VERSION = 1.4.6
+VERSION = 1.4.7
CATEGORIES = utils
DESCRIPTION = Time-series data logging and graphing
@@ -12,10 +12,6 @@
MASTER_SITES = http://oss.oetiker.ch/$(NAME)/pub/
DISTFILES = $(DISTNAME).tar.gz
-# Use patch until this is fixed:
-# http://oss.oetiker.ch/rrdtool-trac/ticket/330
-PATCHFILES += 0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
-
PATCHFILES += 0002-Always-link-local-libs-first-during-Perl-module.patch
# Make sure to link against libperl.so to make shared libraries self-contained.
@@ -49,40 +45,40 @@
RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl8
RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibwrap1
RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibdbi1
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd3
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th3
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th4
OBSOLETED_BY_CSWrrdtool = CSWrrd
CATALOGNAME_CSWrrd = rrd_stub
PACKAGES += CSWrrdtool-dev
-SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.3
+SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.4
# Explicitly do not include *.3perl
PKGFILES_DEVEL_MAN3_MANPAGE = $(mandir)/man3/.*\.3
PKGFILES_CSWrrdtool-dev = $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd3
-RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th3
+RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th4
-PACKAGES += CSWlibrrd3
-SPKG_DESC_CSWlibrrd3 = Runtime library for RRDtool, librrd.so.3
-PKGFILES_CSWlibrrd3 += $(call pkgfiles_lib,librrd.so.3)
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibwrap1
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibdbi1
+PACKAGES += CSWlibrrd4
+SPKG_DESC_CSWlibrrd4 = Runtime library for RRDtool, librrd.so.4
+PKGFILES_CSWlibrrd4 += $(call pkgfiles_lib,librrd.so.4)
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibdbi1
-PACKAGES += CSWlibrrd-th3
-SPKG_DESC_CSWlibrrd-th3 = Runtime library for RRDtool, librrd_th.so.3
-PKGFILES_CSWlibrrd-th3 += $(call pkgfiles_lib,librrd_th.so.3)
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibwrap1
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibdbi1
+PACKAGES += CSWlibrrd-th4
+SPKG_DESC_CSWlibrrd-th4 = Runtime library for RRDtool, librrd_th.so.4
+PKGFILES_CSWlibrrd-th4 += $(call pkgfiles_lib,librrd_th.so.4)
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibdbi1
PACKAGES += CSWpm-rrdtool
SPKG_DESC_CSWpm-rrdtool = RRDs: Access RRDtool as a shared module (part of
RRDtool)
@@ -92,21 +88,21 @@
PKGFILES_CSWpm-rrdtool += .*\.3perl
RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWperl
-RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd4
OBSOLETED_BY_CSWpm-rrdtool = CSWrrd
PACKAGES += CSWpy-rrdtool
SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool)
PKGFILES_CSWpy-rrdtool = $(libdir)/python/.*
RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd4
OBSOLETED_BY_CSWpy-rrdtool = CSWrrd
PACKAGES += CSWrb-rrdtool
SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool)
PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.*
RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby18-1
-RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd4
OBSOLETED_BY_CSWrb-rrdtool = CSWrrd
# This is crappy and needs fixing, unfortunately inside extconf.rb which is
hard.
CHECKPKG_OVERRIDES_CSWrb-rrdtool += bad-rpath-entry
Modified: csw/mgar/pkg/rrdtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/checksums 2012-01-24 12:48:29 UTC (rev
16901)
+++ csw/mgar/pkg/rrdtool/trunk/checksums 2012-01-24 13:19:55 UTC (rev
16902)
@@ -1 +1 @@
-f62316beba89b5f31880850d2c2a5267 rrdtool-1.4.6.tar.gz
+ffe369d8921b4dfdeaaf43812100c38f rrdtool-1.4.7.tar.gz
Deleted:
csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
===================================================================
---
csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
2012-01-24 12:48:29 UTC (rev 16901)
+++
csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
2012-01-24 13:19:55 UTC (rev 16902)
@@ -1,26 +0,0 @@
-From 62585d67b81bd3b47872a061f8c369504bce986f Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@opencsw.org>
-Date: Thu, 19 Jan 2012 15:51:37 +0100
-Subject: [PATCH] Do not reference tm.tm_gmtoff on Solaris
-
----
- src/rrd_fetch_libdbi.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/rrd_fetch_libdbi.c b/src/rrd_fetch_libdbi.c
-index 21fbc08..9d437aa 100644
---- a/src/rrd_fetch_libdbi.c
-+++ b/src/rrd_fetch_libdbi.c
-@@ -464,7 +464,9 @@ rrd_fetch_fn_libdbi(
- struct tm tm;
- time_t t=time(NULL);
- localtime_r(&t,&tm);
-+#if !defined(__sun) && !defined(__sun__)
- gmt_offset=tm.tm_gmtoff;
-+#endif
- isunixtime=0; table_help.timestamp++;
- }
- /* hex-unescape the value */
---
-1.7.8.3
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
