[csw-devel] SF.net SVN: gar:[11985] csw/mgar/pkg/rrdtool/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Dec 17 17:06:56 CET 2010
Revision: 11985
http://gar.svn.sourceforge.net/gar/?rev=11985&view=rev
Author: dmichelsen
Date: 2010-12-17 16:06:56 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
rrdtool: Lots of cleanup towards package split, some minor tweaks missing
Modified Paths:
--------------
csw/mgar/pkg/rrdtool/trunk/Makefile
csw/mgar/pkg/rrdtool/trunk/checksums
csw/mgar/pkg/rrdtool/trunk/gar
Removed Paths:
-------------
csw/mgar/pkg/rrdtool/trunk/files/0001-Fix-isinf.patch
csw/mgar/pkg/rrdtool/trunk/files/patch-64-Makefile.in
csw/mgar/pkg/rrdtool/trunk/files/patch-64-bindings-Makefile.in
csw/mgar/pkg/rrdtool/trunk/files/patch-src-rrd_open.c
csw/mgar/pkg/rrdtool/trunk/files/s_round.c
csw/mgar/pkg/rrdtool/trunk/files/s_round.h
Modified: csw/mgar/pkg/rrdtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/Makefile 2010-12-17 10:55:26 UTC (rev 11984)
+++ csw/mgar/pkg/rrdtool/trunk/Makefile 2010-12-17 16:06:56 UTC (rev 11985)
@@ -1,5 +1,5 @@
NAME = rrdtool
-VERSION = 1.4.3
+VERSION = 1.4.4
CATEGORIES = utils
DESCRIPTION = Time-series data logging and graphing
@@ -12,41 +12,53 @@
MASTER_SITES = http://oss.oetiker.ch/$(NAME)/pub/
DISTFILES = $(NAME)-$(VERSION).tar.gz
-PATCHFILES += patch-src-Makefile.in
-PATCHFILES += patch-src-rrd_open.c
-PATCHFILES += patch-bindings-Makefile.in
+# PATCHFILES += patch-src-Makefile.in
+
+# PATCHFILES += patch-bindings-Makefile.in
+
+# Use patch until this is fixed:
+# http://oss.oetiker.ch/rrdtool-trac/ticket/284
PATCHFILES += patch-bindings-ruby-extconf.rb
+
+# Make sure to link against libperl.so to make shared libraries self-contained.
PATCHFILES += patch-bindings-perl-piped-Makefile.PL
PATCHFILES += patch-bindings-perl-shared-Makefile.PL
-PATCHFILES += 0001-Fix-isinf.patch
-
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-# PACKAGES = CSWrrd CSWrrdrt CSWpmrrd CSWpy-rrdtool CSWrbrrd
-PACKAGES = CSWrrd
+PACKAGES = CSWrrd CSWrrdtool CSWrrdtool-devel CSWlibrrd4 CSWpm-rrdtool CSWpy-rrdtool CSWrb-rrdtool
-CATALOGNAME_CSWrrd = rrdtool
-CATALOGNAME_CSWrrdrt = rrdtool_rt
-CATALOGNAME_CSWpmrrd = pm_rrd
+CATALOGNAME_CSWrrd = rrd
+CATALOGNAME_CSWrrdtool = rrdtool
+CATALOGNAME_CSWrrdtool-devel = rrdtool_devel
+CATALOGNAME_CSWlibrrd4 = librrd4
+CATALOGNAME_CSWpm-rrdtool = pm_rrdtool
CATALOGNAME_CSWpy-rrdtool = py_rrdtool
-CATALOGNAME_CSWrbrrd = rb_rrd
+CATALOGNAME_CSWrb-rrdtool = rb_rrdtool
-SPKG_DESC_CSWrrd = $(DESCRIPTION)
-SPKG_DESC_CSWrrdrt = Runtime libraries for RRDtool
-SPKG_DESC_CSWpmrrd = RRDs: Access RRDtool as a shared module (part of RRDtool)
+SPKG_DESC_CSWrrd = Stub package as contents now moved to CSWrrdtool
+SPKG_DESC_CSWrrdtool = $(DESCRIPTION)
+SPKG_DESC_CSWrrdtool-devel = Development Files for RRDTool
+SPKG_DESC_CSWlibrrd4 = Runtime libraries for RRDtool providing librrd_th.so.4
+SPKG_DESC_CSWpm-rrdtool = RRDs: Access RRDtool as a shared module (part of RRDtool)
SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool)
-SPKG_DESC_CSWrbrrd = Ruby binding for RRD access (part of RRDtool)
+SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool)
-RUNTIME_DEP_PKGS_CSWrrd = CSWglib2 CSWpango CSWggettextrt CSWlibxml2 CSWlibcairo
-# RUNTIME_DEP_PKGS_CSWrrd += CSWrrdrt
-RUNTIME_DEP_PKGS_CSWrrdrt += CSWggettextrt CSWglib2 CSWlibcairo CSWpango CSWlibxml2
-RUNTIME_DEP_PKGS_CSWpmrrd = CSWperl CSWrrdrt
-RUNTIME_DEP_PKGS_CSWpy-rrdtool = CSWpython CSWrrdrt
-RUNTIME_DEP_PKGS_CSWrbrrd = CSWruby CSWrrdrt
+RUNTIME_DEP_PKGS_CSWrrd = CSWrrdtool CSWpm-rrdtool CSWpy-rrdtool CSWrb-rrdtool
+RUNTIME_DEP_PKGS_CSWrrdtool = CSWglib2 CSWpango CSWggettextrt CSWlibxml2 CSWlibcairo
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWrrdtool-devel = CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWggettextrt CSWglib2 CSWlibcairo CSWpango CSWlibxml2
+RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWperl
+RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby1
+RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd4
-BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWrrdrt)
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibrrd4)
BUILD_DEP_PKGS += CSWpangodevel CSWlibcairodevel CSWglib2devel
BUILD_DEP_PKGS += CSWperl
BUILD_DEP_PKGS += CSWpython-devel
@@ -55,6 +67,8 @@
EXTRA_INC = $(prefix)/include/cairo
EXTRA_INC += $(prefix)/include/libxml2
+EXTRA_LINKER_FLAGS = -lintl
+
BUILD64 = 1
NOISAEXEC = 1
STRIP_LIBTOOL = 1
@@ -75,31 +89,34 @@
EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*/\.packlist
EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(NAME)-$(VERSION),.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME),'
-PKGFILES_CSWrrdrt = $(PKGFILES_RT)
-PKGFILES_CSWpmrrd = $(libdir)/perl/.* $(sharedstatedir)/perl/.* .*\.3perl
+ARCHALL_CSWrrd = 1
+
+PKGFILES_CSWrrd = NOFILES
+PKGFILES_CSWrrdtool-devel = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibrrd4 = $(PKGFILES_RT)
+PKGFILES_CSWpm-rrdtool += $(libdir)/perl/.*
+PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/perl/.*
+PKGFILES_CSWpm-rrdtool += .*\.3perl
PKGFILES_CSWpy-rrdtool = $(libdir)/python/.*
-PKGFILES_CSWrbrrd = $(libdir)/ruby/.*
+PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.*
-CHECKPKG_OVERRIDES_CSWrrd += soname-not-found
+# Make legacy package depend on all new ones
+CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWpm-rrdtool
+CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWpy-rrdtool
+CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWrb-rrdtool
+CHECKPKG_OVERRIDES_CSWrrd += surplus-dependency|CSWrrdtool
-CHECKPKG_OVERRIDES_CSWrrd += missing-dependency|CSWperl
+# These is an example which requires Perl
+CHECKPKG_OVERRIDES_CSWrrdtool += missing-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWrbrrd += bad-rpath-entry
-CHECKPKG_OVERRIDES_CSWrbrrd += bad-rpath-entry
+# TBD:
+CHECKPKG_OVERRIDES_CSWrb-rrdtool += binary-architecture-does-not-match-placement|file=opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.9/RRD.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWrb-rrdtool += bad-rpath-entry|/home/dam/mgar/pkg/rrdtool/trunk/work/solaris9-sparc/install-isa-sparcv8/opt/csw/lib|opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.9/RRD.so
-# Take these out when the package are split again
-CHECKPKG_OVERRIDES_CSWrrd += binary-architecture-does-not-match-placement|file=opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.8/RRD.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWrrd += pkgname-does-not-start-with-CSWpy-
-CHECKPKG_OVERRIDES_CSWrrd += catalogname-does-not-start-with-py_
-CHECKPKG_OVERRIDES_CSWrrd += bad-rpath-entry|/home/dam/mgar/pkg/rrdtool/branches/x11-reloaded/work/solaris9-sparc/install-isa-sparcv8/opt/csw/lib|opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.8/RRD.so
-CHECKPKG_OVERRIDES_CSWrrd += bad-rpath-entry|/home/dam/mgar/pkg/rrdtool/branches/x11-reloaded/work/solaris9-i386/install-isa-i386/opt/csw/lib|opt/csw/lib/ruby/site_ruby/1.8/i386-solaris2.8/RRD.so
-CHECKPKG_OVERRIDES_CSWrrd += missing-dependency|CSWruby
-CHECKPKG_OVERRIDES_CSWrrd += missing-dependency|CSWpython
-
include gar/category.mk
-pre-build-modulated:
- echo " ==> Adding math function round()"
- cp $(FILEDIR)/s_round.c $(WORKSRC)/src
- cp $(FILEDIR)/s_round.h $(WORKSRC)/src
- @$(MAKECOOKIE)
+#pre-build-modulated:
+# echo " ==> Adding math function round()"
+# cp $(FILEDIR)/s_round.c $(WORKSRC)/src
+# cp $(FILEDIR)/s_round.h $(WORKSRC)/src
+# @$(MAKECOOKIE)
Modified: csw/mgar/pkg/rrdtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/checksums 2010-12-17 10:55:26 UTC (rev 11984)
+++ csw/mgar/pkg/rrdtool/trunk/checksums 2010-12-17 16:06:56 UTC (rev 11985)
@@ -1,8 +1 @@
-04c50cb4ab2c34aebf0413130776bfdd 0001-Fix-isinf.patch
-c6bc2f9c3d88e0488f0332a9d288dc39 patch-bindings-Makefile.in
-0d068a4648f3a52c79c00374fa0ef486 patch-bindings-perl-piped-Makefile.PL
-4fd31144a5e2799db7440d97430d3ab6 patch-bindings-perl-shared-Makefile.PL
-072482090287b462c8c092b2ead132da patch-bindings-ruby-extconf.rb
-20e58c7facf2687037288c157c32df1a patch-src-Makefile.in
-47709778545eec2e8c5c3b38f9c94fcd patch-src-rrd_open.c
-492cf946c72f85987238faa2c311b7bb rrdtool-1.4.3.tar.gz
+93ad2fc2e9ddcd7d99c611fe30284a54 rrdtool-1.4.4.tar.gz
Deleted: csw/mgar/pkg/rrdtool/trunk/files/0001-Fix-isinf.patch
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/0001-Fix-isinf.patch 2010-12-17 10:55:26 UTC (rev 11984)
+++ csw/mgar/pkg/rrdtool/trunk/files/0001-Fix-isinf.patch 2010-12-17 16:06:56 UTC (rev 11985)
@@ -1,26 +0,0 @@
-From b8063983295ef5629a106b61c735a90edd842412 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 25 Jun 2010 16:00:27 +0200
-Subject: [PATCH] Fix isinf
-
----
- src/rrd_config_bottom.h | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/rrd_config_bottom.h b/src/rrd_config_bottom.h
-index a569197..0a05a40 100644
---- a/src/rrd_config_bottom.h
-+++ b/src/rrd_config_bottom.h
-@@ -175,7 +175,8 @@ char *strchr (), *strrchr ();
- # ifdef isinf
- # undef isinf
- # endif
--# define isinf(a) (!!(fpclass(a) & (FP_SNAN|FP_QNAN)))
-+/* define isinf(a) (!!(fpclass(a) & (FP_SNAN|FP_QNAN))) */
-+#define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
-
- #endif
-
---
-1.7.1
-
Deleted: csw/mgar/pkg/rrdtool/trunk/files/patch-64-Makefile.in
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/patch-64-Makefile.in 2010-12-17 10:55:26 UTC (rev 11984)
+++ csw/mgar/pkg/rrdtool/trunk/files/patch-64-Makefile.in 2010-12-17 16:06:56 UTC (rev 11985)
@@ -1,75 +0,0 @@
---- rrdtool-1.4.2.orig/Makefile.in 2009-11-15 12:55:05.000000000 +0100
-+++ rrdtool-1.4.2/Makefile.in 2010-02-26 19:19:42.923524958 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -222,6 +222,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PERL = @PERL@
-@@ -427,7 +428,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -452,7 +453,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -616,7 +617,8 @@
- fi; \
- done
- -test -n "$(am__skip_mode_fix)" \
-- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+ || find "$(distdir)" -type d ! -perm -755 \
-+ -exec chmod u+rwx,go+rx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -660,17 +662,17 @@
- distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
-- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
-- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
-@@ -867,7 +869,7 @@
-
- # $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
-
--site-perl-inst: site-perl-install
-+site-perl-inst: echo skipping 64bit perl module install
-
- site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile
- cd bindings/perl-piped && $(MAKE) install
Deleted: csw/mgar/pkg/rrdtool/trunk/files/patch-64-bindings-Makefile.in
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/patch-64-bindings-Makefile.in 2010-12-17 10:55:26 UTC (rev 11984)
+++ csw/mgar/pkg/rrdtool/trunk/files/patch-64-bindings-Makefile.in 2010-12-17 16:06:56 UTC (rev 11985)
@@ -1,43 +0,0 @@
---- rrdtool-1.4.2.orig/bindings/Makefile.in 2009-11-15 12:55:04.000000000 +0100
-+++ rrdtool-1.4.2/bindings/Makefile.in 2010-02-26 19:19:41.514583447 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -205,6 +205,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PERL = @PERL@
-@@ -374,7 +375,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -399,7 +400,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -676,7 +677,7 @@
- .PHONY: python ruby
-
- # add the following to the all target
--all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@
-+all-local: @COMP_RUBY@
-
- install-data-local:
- $(AM_V_GEN)test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true
Deleted: csw/mgar/pkg/rrdtool/trunk/files/patch-src-rrd_open.c
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/patch-src-rrd_open.c 2010-12-17 10:55:26 UTC (rev 11984)
+++ csw/mgar/pkg/rrdtool/trunk/files/patch-src-rrd_open.c 2010-12-17 16:06:56 UTC (rev 11985)
@@ -1,37 +0,0 @@
---- rrdtool-1.4.2.orig/src/rrd_open.c 2009-11-15 12:54:23.000000000 +0100
-+++ rrdtool-1.4.2/src/rrd_open.c 2010-02-26 15:18:37.546048288 +0100
-@@ -683,7 +683,7 @@
- /* this is a leftover from the old days, it serves no purpose
- and is therefore turned into a no-op */
- void rrd_flush(
-- rrd_file_t *rrd_file __attribute__((unused)))
-+ rrd_file_t *rrd_file)
- {
- }
-
-@@ -745,10 +745,10 @@
- * aligning RRAs within stripes, or other performance enhancements
- */
- void rrd_notify_row(
-- rrd_file_t *rrd_file __attribute__((unused)),
-- int rra_idx __attribute__((unused)),
-- unsigned long rra_row __attribute__((unused)),
-- time_t rra_time __attribute__((unused)))
-+ rrd_file_t *rrd_file,
-+ int rra_idx,
-+ unsigned long rra_row,
-+ time_t rra_time)
- {
- }
-
-@@ -760,8 +760,8 @@
- * don't change to a new disk block at the same time
- */
- unsigned long rrd_select_initial_row(
-- rrd_file_t *rrd_file __attribute__((unused)),
-- int rra_idx __attribute__((unused)),
-+ rrd_file_t *rrd_file,
-+ int rra_idx,
- rra_def_t *rra
- )
- {
Deleted: csw/mgar/pkg/rrdtool/trunk/files/s_round.c
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/s_round.c 2010-12-17 10:55:26 UTC (rev 11984)
+++ csw/mgar/pkg/rrdtool/trunk/files/s_round.c 2010-12-17 16:06:56 UTC (rev 11985)
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2003, Steven G. Kargl
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice unmodified, this list of conditions, and the following
- * disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <math.h>
-#include "s_round.h"
-
-double
-round(double x)
-{
- double t;
-
- if (x >= 0.0) {
- t = floor(x);
- if (t - x <= -0.5)
- t += 1.0;
- return (t);
- } else {
- t = floor(-x);
- if (t + x <= -0.5)
- t += 1.0;
- return (-t);
- }
-}
Deleted: csw/mgar/pkg/rrdtool/trunk/files/s_round.h
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/s_round.h 2010-12-17 10:55:26 UTC (rev 11984)
+++ csw/mgar/pkg/rrdtool/trunk/files/s_round.h 2010-12-17 16:06:56 UTC (rev 11985)
@@ -1,27 +0,0 @@
-/*-
- * Copyright (c) 2003, Steven G. Kargl
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice unmodified, this list of conditions, and the following
- * disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-double round(double);
Modified: csw/mgar/pkg/rrdtool/trunk/gar
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/gar 2010-12-17 10:55:26 UTC (rev 11984)
+++ csw/mgar/pkg/rrdtool/trunk/gar 2010-12-17 16:06:56 UTC (rev 11985)
@@ -1 +1 @@
-link ../../../../gar/v2
\ No newline at end of file
+link ../../../gar/v2
\ No newline at end of file
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