[csw-devel] SF.net SVN: gar:[8849] csw/mgar/pkg/rrdtool/branches

bensons at users.sourceforge.net bensons at users.sourceforge.net
Fri Feb 26 19:44:24 CET 2010


Revision: 8849
          http://gar.svn.sourceforge.net/gar/?rev=8849&view=rev
Author:   bensons
Date:     2010-02-26 18:44:24 +0000 (Fri, 26 Feb 2010)

Log Message:
-----------
rrdtool: added branch

Added Paths:
-----------
    csw/mgar/pkg/rrdtool/branches/benny/
    csw/mgar/pkg/rrdtool/branches/benny/Makefile
    csw/mgar/pkg/rrdtool/branches/benny/checksums
    csw/mgar/pkg/rrdtool/branches/benny/files/
    csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-Makefile.in
    csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-bindings-Makefile.in
    csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-Makefile.in
    csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-rrd_open.c
    csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c
    csw/mgar/pkg/rrdtool/branches/benny/files/s_round.h
    csw/mgar/pkg/rrdtool/branches/benny/gar

Added: csw/mgar/pkg/rrdtool/branches/benny/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/branches/benny/Makefile	2010-02-26 18:44:24 UTC (rev 8849)
@@ -0,0 +1,89 @@
+GARNAME = rrdtool
+GARVERSION = 1.4.2
+CATEGORIES = utils
+
+DESCRIPTION = time-series data logging and graphing.
+define BLURB
+	RRDtool is basically the time-series graphing and data storage/management
+	component of MRTG, broken out and `done right'. `done right' means that
+	RRDtool is magnitudes faster than MRTG and extremely configurable.
+endef
+
+MASTER_SITES = http://oss.oetiker.ch/$(GARNAME)/pub/
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+PACKAGES = CSWrrd
+CATALOGNAME = rrdtool
+
+#GARCOMPILER = SOS12
+#GARCOMPILER = GCC4
+#PACKAGING_PLATFORMS =  solaris9-sparc solaris9-i386
+
+RUNTIME_DEP_PKGS = CSWggettextrt
+RUNTIME_DEP_PKGS += CSWglib2
+RUNTIME_DEP_PKGS += CSWiconv
+RUNTIME_DEP_PKGS += CSWlibcairo
+# RUNTIME_DEP_PKGS += CSWlibxml2
+RUNTIME_DEP_PKGS += CSWpango
+RUNTIME_DEP_PKGS += CSWpng
+RUNTIME_DEP_PKGS += CSWsunmath
+RUNTIME_DEP_PKGS += CSWzlib
+RUNTIME_DEP_PKGS += CSWperl
+RUNTIME_DEP_PKGS += CSWruby
+
+EXTRA_INC = $(prefix)/include/cairo
+EXTRA_INC += $(prefix)/include/libxml2
+EXTRA_INC += $(prefix)/X11/include
+
+EXTRA_LIB = $(prefix)/X11/lib
+
+EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+
+EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+
+CONFIGURE_ARS  = $(DIRPATHS)
+CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(GARNAME)
+CONFIGURE_ARGS += --disable-python
+CONFIGURE_ARGS += --enable-ruby
+CONFIGURE_ARGS += --disable-libintl
+CONFIGURE_ARGS += --enable-perl
+CONFIGURE_ARGS += --with-perl-options=INSTALLDIRS=vendor
+CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
+CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+
+EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod
+
+TEST_TARGET = check
+
+PATCHFILES += patch-src-Makefile.in
+PATCHFILES += patch-src-rrd_open.c
+
+BUILD64 = 1
+
+STRIP_LIBTOOL = 1
+
+# ugly fix to fix doc path
+#post-install-modulated:
+	#@echo "  ==> Fixing doc path"
+	#@mv $(DESTDIR)$(prefix)/share/doc/rrdtool-$(GARVERSION) $(DESTDIR)$(prefix)/share/doc/rrdtool
+
+include gar/category.mk
+
+pre-build-modulated:
+	cp $(FILEDIR)/s_round.c $(WORKSRC)/src
+	cp $(FILEDIR)/s_round.h $(WORKSRC)/src
+	@$(MAKECOOKIE)
+
+pre-build-isa-amd64:
+	@# since our perl is 32bit, we need to patch away the module build
+	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-amd64-Makefile.in
+	gpatch -d$(WORKSRC) -p1 -F2 < \
+		$(FILEDIR)/patch-amd64-bindings-Makefile.in
+	@$(MAKECOOKIE)
+
+env:
+	@echo "PKG_CONFIG_PATH: $(PKG_CONFIG_PATH)"

Added: csw/mgar/pkg/rrdtool/branches/benny/checksums
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/checksums	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/branches/benny/checksums	2010-02-26 18:44:24 UTC (rev 8849)
@@ -0,0 +1,4 @@
+48a9b258cf8b4b943dbaf30ea939c315  CSWrrdtool.gspec
+20e58c7facf2687037288c157c32df1a  patch-src-Makefile.in
+47709778545eec2e8c5c3b38f9c94fcd  patch-src-rrd_open.c
+9318d3b4016dd9dd9897f1eac7548032  rrdtool-1.4.2.tar.gz

Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-Makefile.in
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-Makefile.in	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-Makefile.in	2010-02-26 18:44:24 UTC (rev 8849)
@@ -0,0 +1,75 @@
+--- 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

Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-bindings-Makefile.in
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-bindings-Makefile.in	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-bindings-Makefile.in	2010-02-26 18:44:24 UTC (rev 8849)
@@ -0,0 +1,43 @@
+--- 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@ @COMP_PYTHON@
+ 
+ install-data-local:
+ 	$(AM_V_GEN)test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true

Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-Makefile.in
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-Makefile.in	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-Makefile.in	2010-02-26 18:44:24 UTC (rev 8849)
@@ -0,0 +1,152 @@
+--- rrdtool-1.4.2.orig/src/Makefile.in	2009-11-15 12:55:05.000000000 +0100
++++ rrdtool-1.4.2/src/Makefile.in	2010-02-26 18:36:02.892925252 +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,
+@@ -105,14 +105,14 @@
+ 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-am__librrd_la_SOURCES_DIST = hash_32.c pngsize.c rrd_create.c \
+-	rrd_graph.c rrd_graph_helper.c rrd_version.c rrd_last.c \
+-	rrd_lastupdate.c rrd_first.c rrd_restore.c rrd_xport.c \
+-	rrd_gfx.c rrd_dump.c rrd_flushcached.c rrd_fetch.c \
++am__librrd_la_SOURCES_DIST = hash_32.c pngsize.c s_round.c \
++	rrd_create.c rrd_graph.c rrd_graph_helper.c rrd_version.c \
++	rrd_last.c rrd_lastupdate.c rrd_first.c rrd_restore.c \
++	rrd_xport.c rrd_gfx.c rrd_dump.c rrd_flushcached.c rrd_fetch.c \
+ 	rrd_resize.c rrd_tune.c rrd_fetch_libdbi.c
+ @BUILD_LIBDBI_TRUE at am__objects_1 = rrd_fetch_libdbi.lo
+-am__objects_2 = hash_32.lo pngsize.lo rrd_create.lo rrd_graph.lo \
+-	rrd_graph_helper.lo rrd_version.lo rrd_last.lo \
++am__objects_2 = hash_32.lo pngsize.lo s_round.lo rrd_create.lo \
++	rrd_graph.lo rrd_graph_helper.lo rrd_version.lo rrd_last.lo \
+ 	rrd_lastupdate.lo rrd_first.lo rrd_restore.lo rrd_xport.lo \
+ 	rrd_gfx.lo rrd_dump.lo rrd_flushcached.lo rrd_fetch.lo \
+ 	rrd_resize.lo rrd_tune.lo $(am__objects_1)
+@@ -128,9 +128,9 @@
+ 	rrd_hw_update.c rrd_diff.c rrd_format.c rrd_info.c rrd_error.c \
+ 	rrd_open.c rrd_client.c rrd_nan_inf.c rrd_rpncalc.c \
+ 	rrd_utils.c rrd_update.c rrd_getopt.c rrd_getopt1.c hash_32.c \
+-	pngsize.c rrd_create.c rrd_graph.c rrd_graph_helper.c \
+-	rrd_version.c rrd_last.c rrd_lastupdate.c rrd_first.c \
+-	rrd_restore.c rrd_xport.c rrd_gfx.c rrd_dump.c \
++	pngsize.c s_round.c rrd_create.c rrd_graph.c \
++	rrd_graph_helper.c rrd_version.c rrd_last.c rrd_lastupdate.c \
++	rrd_first.c rrd_restore.c rrd_xport.c rrd_gfx.c rrd_dump.c \
+ 	rrd_flushcached.c rrd_fetch.c rrd_resize.c rrd_tune.c \
+ 	rrd_fetch_libdbi.c rrd_thread_safe.c
+ @BUILD_GETOPT_TRUE at am__objects_3 = librrd_th_la-rrd_getopt.lo \
+@@ -145,14 +145,15 @@
+ 	$(am__objects_3)
+ @BUILD_LIBDBI_TRUE at am__objects_5 = librrd_th_la-rrd_fetch_libdbi.lo
+ am__objects_6 = librrd_th_la-hash_32.lo librrd_th_la-pngsize.lo \
+-	librrd_th_la-rrd_create.lo librrd_th_la-rrd_graph.lo \
+-	librrd_th_la-rrd_graph_helper.lo librrd_th_la-rrd_version.lo \
+-	librrd_th_la-rrd_last.lo librrd_th_la-rrd_lastupdate.lo \
+-	librrd_th_la-rrd_first.lo librrd_th_la-rrd_restore.lo \
+-	librrd_th_la-rrd_xport.lo librrd_th_la-rrd_gfx.lo \
+-	librrd_th_la-rrd_dump.lo librrd_th_la-rrd_flushcached.lo \
+-	librrd_th_la-rrd_fetch.lo librrd_th_la-rrd_resize.lo \
+-	librrd_th_la-rrd_tune.lo $(am__objects_5)
++	librrd_th_la-s_round.lo librrd_th_la-rrd_create.lo \
++	librrd_th_la-rrd_graph.lo librrd_th_la-rrd_graph_helper.lo \
++	librrd_th_la-rrd_version.lo librrd_th_la-rrd_last.lo \
++	librrd_th_la-rrd_lastupdate.lo librrd_th_la-rrd_first.lo \
++	librrd_th_la-rrd_restore.lo librrd_th_la-rrd_xport.lo \
++	librrd_th_la-rrd_gfx.lo librrd_th_la-rrd_dump.lo \
++	librrd_th_la-rrd_flushcached.lo librrd_th_la-rrd_fetch.lo \
++	librrd_th_la-rrd_resize.lo librrd_th_la-rrd_tune.lo \
++	$(am__objects_5)
+ am_librrd_th_la_OBJECTS = $(am__objects_4) $(am__objects_6) \
+ 	librrd_th_la-rrd_thread_safe.lo
+ librrd_th_la_OBJECTS = $(am_librrd_th_la_OBJECTS)
+@@ -160,7 +161,8 @@
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(librrd_th_la_CFLAGS) \
+ 	$(CFLAGS) $(librrd_th_la_LDFLAGS) $(LDFLAGS) -o $@
+ @BUILD_MULTITHREAD_TRUE at am_librrd_th_la_rpath = -rpath $(libdir)
+-librrdupd_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
++librrdupd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1)
+ am__librrdupd_la_SOURCES_DIST = rrd_parsetime.c rrd_hw.c rrd_hw_math.c \
+ 	rrd_hw_update.c rrd_diff.c rrd_format.c rrd_info.c rrd_error.c \
+ 	rrd_open.c rrd_client.c rrd_nan_inf.c rrd_rpncalc.c \
+@@ -219,7 +221,7 @@
+ 	$(am__librrdupd_la_SOURCES_DIST) $(rrdcached_SOURCES) \
+ 	$(rrdcgi_SOURCES) $(rrdtool_SOURCES) $(rrdupdate_SOURCES)
+ DATA = $(pkgconfig_DATA)
+-am__noinst_HEADERS_DIST = unused.h gettext.h rrd_getopt.h \
++am__noinst_HEADERS_DIST = unused.h gettext.h s_round.h rrd_getopt.h \
+ 	rrd_parsetime.h rrd_config_bottom.h rrd_i18n.h rrd_format.h \
+ 	rrd_tool.h rrd_xport.h rrd.h rrd_rpncalc.h rrd_hw.h \
+ 	rrd_hw_math.h rrd_hw_update.h fnv.h rrd_graph.h \
+@@ -322,6 +324,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@
+@@ -442,20 +445,20 @@
+ 	rrd_diff.c rrd_format.c rrd_info.c rrd_error.c rrd_open.c \
+ 	rrd_client.c rrd_nan_inf.c rrd_rpncalc.c rrd_utils.c \
+ 	rrd_update.c $(am__append_3)
+-RRD_C_FILES = hash_32.c pngsize.c rrd_create.c rrd_graph.c \
++RRD_C_FILES = hash_32.c pngsize.c s_round.c rrd_create.c rrd_graph.c \
+ 	rrd_graph_helper.c rrd_version.c rrd_last.c rrd_lastupdate.c \
+ 	rrd_first.c rrd_restore.c rrd_xport.c rrd_gfx.c rrd_dump.c \
+ 	rrd_flushcached.c rrd_fetch.c rrd_resize.c rrd_tune.c \
+ 	$(am__append_1)
+-noinst_HEADERS = unused.h gettext.h rrd_getopt.h rrd_parsetime.h \
+-	rrd_config_bottom.h rrd_i18n.h rrd_format.h rrd_tool.h \
+-	rrd_xport.h rrd.h rrd_rpncalc.h rrd_hw.h rrd_hw_math.h \
+-	rrd_hw_update.h fnv.h rrd_graph.h rrd_is_thread_safe.h \
+-	$(am__append_2)
++noinst_HEADERS = unused.h gettext.h s_round.h rrd_getopt.h \
++	rrd_parsetime.h rrd_config_bottom.h rrd_i18n.h rrd_format.h \
++	rrd_tool.h rrd_xport.h rrd.h rrd_rpncalc.h rrd_hw.h \
++	rrd_hw_math.h rrd_hw_update.h fnv.h rrd_graph.h \
++	rrd_is_thread_safe.h $(am__append_2)
+ noinst_LTLIBRARIES = librrdupd.la
+ lib_LTLIBRARIES = librrd.la $(am__append_4)
+ librrdupd_la_SOURCES = $(UPD_C_FILES) rrd_not_thread_safe.c
+-librrdupd_la_LIBADD = $(CORE_LIBS)
++librrdupd_la_LIBADD = $(CORE_LIBS) $(LTLIBINTL)
+ librrd_la_SOURCES = $(RRD_C_FILES)
+ librrd_la_DEPENDENCIES = librrdupd.la librrd.sym
+ librrd_la_LIBADD = librrdupd.la $(ALL_LIBS)
+@@ -668,6 +671,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/librrd_th_la-rrd_utils.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/librrd_th_la-rrd_version.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/librrd_th_la-rrd_xport.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/librrd_th_la-s_round.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pngsize.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rrd_cgi.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rrd_client.Plo at am__quote@
+@@ -706,6 +710,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rrd_xport.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rrdcached-rrd_daemon.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rrdupdate.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/s_round.Plo at am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -875,6 +880,14 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librrd_th_la_CFLAGS) $(CFLAGS) -c -o librrd_th_la-pngsize.lo `test -f 'pngsize.c' || echo '$(srcdir)/'`pngsize.c
+ 
++librrd_th_la-s_round.lo: s_round.c
++ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librrd_th_la_CFLAGS) $(CFLAGS) -MT librrd_th_la-s_round.lo -MD -MP -MF $(DEPDIR)/librrd_th_la-s_round.Tpo -c -o librrd_th_la-s_round.lo `test -f 's_round.c' || echo '$(srcdir)/'`s_round.c
++ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/librrd_th_la-s_round.Tpo $(DEPDIR)/librrd_th_la-s_round.Plo
++ at am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='s_round.c' object='librrd_th_la-s_round.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librrd_th_la_CFLAGS) $(CFLAGS) -c -o librrd_th_la-s_round.lo `test -f 's_round.c' || echo '$(srcdir)/'`s_round.c
++
+ librrd_th_la-rrd_create.lo: rrd_create.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librrd_th_la_CFLAGS) $(CFLAGS) -MT librrd_th_la-rrd_create.lo -MD -MP -MF $(DEPDIR)/librrd_th_la-rrd_create.Tpo -c -o librrd_th_la-rrd_create.lo `test -f 'rrd_create.c' || echo '$(srcdir)/'`rrd_create.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/librrd_th_la-rrd_create.Tpo $(DEPDIR)/librrd_th_la-rrd_create.Plo

Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-rrd_open.c
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-rrd_open.c	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-src-rrd_open.c	2010-02-26 18:44:24 UTC (rev 8849)
@@ -0,0 +1,37 @@
+--- 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
+     )
+ {

Added: csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c	2010-02-26 18:44:24 UTC (rev 8849)
@@ -0,0 +1,48 @@
+/*-
+ * 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>
+
+double
+round(double x)
+{
+        double t;
+/*
+        if (!isfinite(x))
+                return (x);
+*/
+        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);
+        }
+}

Added: csw/mgar/pkg/rrdtool/branches/benny/files/s_round.h
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/files/s_round.h	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/branches/benny/files/s_round.h	2010-02-26 18:44:24 UTC (rev 8849)
@@ -0,0 +1,27 @@
+/*-
+ * 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);

Added: csw/mgar/pkg/rrdtool/branches/benny/gar
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/gar	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/branches/benny/gar	2010-02-26 18:44:24 UTC (rev 8849)
@@ -0,0 +1 @@
+link ../../../../gar/v2
\ No newline at end of file


Property changes on: csw/mgar/pkg/rrdtool/branches/benny/gar
___________________________________________________________________
Added: svn:special
   + *


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