Hi!
This updates rrdtool-1.2.23 to 1.2.28. Use patch -E, one new patch was
added, and one removed.
It's been running for a while on i386 here without problems.
Please test/comment.
Daniel
--
LEVAI Daniel
PGP key ID = 0x4AC0A4B1
Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/rrdtool/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile 7 Oct 2008 14:27:22 -0000 1.43
+++ Makefile 27 Nov 2008 09:16:38 -0000
@@ -6,11 +6,11 @@
COMMENT-perl= perl interface to librrd
COMMENT-python= python interface to librrd
-VERSION= 1.2.23
+VERSION= 1.2.28
DISTNAME= rrdtool-${VERSION}
PKGNAME-main= ${DISTNAME}p0
-PKGNAME-perl= p5-RRD-${VERSION}p1
-PKGNAME-python= py-rrd-${VERSION}p1
+PKGNAME-perl= p5-RRD-${VERSION}
+PKGNAME-python= py-rrd-${VERSION}p0
SHARED_LIBS+= rrd 3.0
SHARED_LIBS+= rrd_th 3.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/rrdtool/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo 12 Sep 2007 14:34:36 -0000 1.9
+++ distinfo 27 Nov 2008 09:16:38 -0000
@@ -1,5 +1,5 @@
-MD5 (rrdtool-1.2.23.tar.gz) = 2voWG8nGHldjamCFyHwf6A==
-RMD160 (rrdtool-1.2.23.tar.gz) = DBFHJCrfR29ek/TVm1U+4+o3iyM=
-SHA1 (rrdtool-1.2.23.tar.gz) = XaYQ4ci8AbgKvCGrnpjgBDY7Qpw=
-SHA256 (rrdtool-1.2.23.tar.gz) = Sx3wCyOnShyBc03SdOcuANi7KbEeHz0pOP+HaR7OHw8=
-SIZE (rrdtool-1.2.23.tar.gz) = 1061530
+MD5 (rrdtool-1.2.28.tar.gz) = xniBHCqsyGWr9C1dIeyNdg==
+RMD160 (rrdtool-1.2.28.tar.gz) = EaTGQUA3s84OSdSbRY+fwT8+97o=
+SHA1 (rrdtool-1.2.28.tar.gz) = qMp1/PezLKlLBX+mY+X5iVIuLfk=
+SHA256 (rrdtool-1.2.28.tar.gz) = oAj+yYuzbQmnvogQr73Rv1HXNlIA0DoOlmopv4cbMEE=
+SIZE (rrdtool-1.2.28.tar.gz) = 1089006
Index: patches/patch-bindings_Makefile_in
===================================================================
RCS file: /cvs/ports/net/rrdtool/patches/patch-bindings_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-bindings_Makefile_in
--- patches/patch-bindings_Makefile_in 12 Sep 2007 14:34:36 -0000 1.1
+++ patches/patch-bindings_Makefile_in 27 Nov 2008 09:16:38 -0000
@@ -1,12 +1,21 @@
-$OpenBSD: patch-bindings_Makefile_in,v 1.1 2007/09/12 14:34:36 msf Exp $
---- bindings/Makefile.in.orig Wed May 2 19:06:59 2007
-+++ bindings/Makefile.in Tue Sep 11 14:31:11 2007
-@@ -550,7 +550,7 @@ ruby:
+--- bindings/Makefile.in.orig Wed Jul 23 15:56:19 2008
++++ bindings/Makefile.in Sat Nov 22 14:09:31 2008
+@@ -552,15 +552,15 @@ install-data-local:
+ test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true
+ test -d python/build && cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py install --skip-build --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true
- # rules for buildung the pyton module
+-# rules for buildung the ruby module
++# rules for building the ruby module
+ # RUBYARCHDIR= is to work around in a makefile quirk not sure
+ # it is is the right thing todo, but it makes rrdtool build on freebsd as well
+ ruby:
+ cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) RUBYARCHDIR=
+
+-# rules for buildung the pyton module
++# rules for building the python module
python:
-- cd python && env LIBDIR=../../src/.libs $(PYTHON) setup.py build
-+ cd python && env LIBDIR=../../src/.libs INCDIR=../../src $(PYTHON) setup.py build
+- cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build
++ cd python && env BUILDLIBDIR=../../src/.libs INCDIR=../../src $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build
# rules for building the perl module
perl_piped: perl-piped/Makefile
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/net/rrdtool/patches/patch-doc_Makefile_in,v
retrieving revision 1.6
diff -u -r1.6 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 12 Sep 2007 14:34:36 -0000 1.6
+++ patches/patch-doc_Makefile_in 27 Nov 2008 09:16:38 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.6 2007/09/12 14:34:36 msf Exp $
---- doc/Makefile.in.orig Thu May 3 03:06:59 2007
-+++ doc/Makefile.in Wed Jun 20 08:48:25 2007
-@@ -147,7 +147,7 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
+$OpenBSD$
+--- doc/Makefile.in.orig Wed Jul 23 15:56:19 2008
++++ doc/Makefile.in Sat Nov 22 14:09:31 2008
+@@ -150,7 +150,7 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
Index: patches/patch-examples_Makefile_in
===================================================================
RCS file: /cvs/ports/net/rrdtool/patches/patch-examples_Makefile_in,v
retrieving revision 1.6
diff -u -r1.6 patch-examples_Makefile_in
--- patches/patch-examples_Makefile_in 12 Sep 2007 14:34:36 -0000 1.6
+++ patches/patch-examples_Makefile_in 27 Nov 2008 09:16:38 -0000
@@ -1,7 +1,7 @@
-OpenBSD$
---- examples/Makefile.in.orig Thu May 3 03:07:00 2007
-+++ examples/Makefile.in Wed Jun 20 08:48:25 2007
-@@ -219,7 +219,7 @@ target_cpu = @target_cpu@
+$OpenBSD$
+--- examples/Makefile.in.orig Wed Jul 23 15:56:19 2008
++++ examples/Makefile.in Sat Nov 22 14:09:31 2008
+@@ -227,7 +227,7 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
EXTRA_DIST = cgi-demo.cgi.in
Index: patches/patch-rrd_config_h_in
===================================================================
RCS file: patches/patch-rrd_config_h_in
diff -N patches/patch-rrd_config_h_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-rrd_config_h_in 27 Nov 2008 09:16:38 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- rrd_config.h.in.orig Wed Jul 23 15:56:17 2008
++++ rrd_config.h.in Sat Nov 22 14:09:31 2008
+@@ -283,12 +283,12 @@
+ # include <errno.h>
+ #endif
+
+-#if defined(HAVE_SYS_MMAN_H)
+-#include <sys/mman.h>
+-#endif
+-
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
++#endif
++
++#if defined(HAVE_SYS_MMAN_H)
++#include <sys/mman.h>
+ #endif
+
+ #ifdef HAVE_SYS_PARAM_H
Index: patches/patch-src_rrd_graph_helper_c
===================================================================
RCS file: patches/patch-src_rrd_graph_helper_c
diff -N patches/patch-src_rrd_graph_helper_c
--- patches/patch-src_rrd_graph_helper_c 12 Sep 2007 14:34:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-$OpenBSD: patch-src_rrd_graph_helper_c,v 1.1 2007/09/12 14:34:36 msf Exp $
---- src/rrd_graph_helper.c.orig Wed May 2 19:06:10 2007
-+++ src/rrd_graph_helper.c Fri Jul 6 04:22:19 2007
-@@ -296,7 +296,7 @@ rrd_parse_print(const char *const line, unsigned int *
- int
- rrd_parse_shift(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp, image_desc_t *const im) {
- int i;
--
-+ long time_tmp = 0;
- if ((gdp->vidx=rrd_parse_find_vname(line,eaten,gdp,im))<0) return 1;
-
- switch (im->gdes[gdp->vidx].gf) {
-@@ -327,7 +327,8 @@ rrd_parse_shift(const char *const line, unsigned int *
- }
- } else {
- rrd_clear_error();
-- i=0; sscanf(&line[*eaten],"%li%n",&gdp->shval,&i);
-+ i=0; sscanf(&line[*eaten],"%li%n",&time_tmp,&i);
-+ gdp->shval = time_tmp;
- if (i!=(int)strlen(&line[*eaten])) {
- rrd_set_error("Not a valid offset: %s in line %s",&line[*eaten],line);
- return 1;
-@@ -377,6 +378,7 @@ rrd_parse_PVHLAST(const char *const line, unsigned int
- int i,j,k;
- int colorfound=0;
- char tmpstr[MAX_VNAME_LEN + 10]; /* vname#RRGGBBAA\0 */
-+ long time_tmp = 0;
- static int spacecnt = 0;
-
- if (spacecnt == 0) {
-@@ -443,7 +445,8 @@ rrd_parse_PVHLAST(const char *const line, unsigned int
- dprintf("- it is not an existing vname\n");
- switch (gdp->gf) {
- case GF_VRULE:
-- k=0;sscanf(tmpstr,"%li%n",&gdp->xrule,&k);
-+ k=0;sscanf(tmpstr,"%li%n",&time_tmp,&k);
-+ gdp->xrule = time_tmp;
- if (((j!=0)&&(k==j))||((j==0)&&(k==i))) {
- dprintf("- found time: %li\n",gdp->xrule);
- } else {
-@@ -454,9 +457,9 @@ rrd_parse_PVHLAST(const char *const line, unsigned int
- default:
- k=0;sscanf(tmpstr,"%lf%n",&gdp->yrule,&k);
- if (((j!=0)&&(k==j))||((j==0)&&(k==i))) {
-- dprintf("- found number: %f\n",gdp->yrule);
-+ dprintf("- found number: %lf\n",gdp->yrule);
- } else {
-- dprintf("- is is not a valid number: %li\n",gdp->xrule);
-+ dprintf("- is is not a valid number: %lf\n",gdp->yrule);
- rrd_set_error("parameter '%s' does not represent a number in line %s\n",tmpstr,line);
- return 1;
- }
