cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to newest 1.2 release (1.2.30), maintainer doesn't necessarily

Browse Source 
agree with staying with 1.2.x but doesn't mind too much either way
and 1.3 adds heavy dependencies.
This commit is contained in:
sthen 2009-01-26 21:26:32 +00:00
parent d7f94b3368
commit 6248392f4c
9 changed files with 54 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/rrdtool/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2008/10/07 14:27:22 sthen Exp $
# $OpenBSD: Makefile,v 1.44 2009/01/26 21:26:32 sthen Exp $
SHARED_ONLY= Yes
@ -6,11 +6,11 @@ COMMENT-main= system to store and display time-series data
COMMENT-perl= perl interface to librrd
COMMENT-python= python interface to librrd
VERSION= 1.2.23
VERSION= 1.2.30
DISTNAME= rrdtool-${VERSION}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-perl= p5-RRD-${VERSION}p1
PKGNAME-python= py-rrd-${VERSION}p1
PKGNAME-main= rrdtool-${VERSION}
PKGNAME-perl= p5-RRD-${VERSION}
PKGNAME-python= py-rrd-${VERSION}
SHARED_LIBS+= rrd 3.0
SHARED_LIBS+= rrd_th 3.0
@ -20,7 +20,7 @@ CATEGORIES= net
MAINTAINER= Mathieu Sauve-Frankel <msf@openbsd.org>
HOMEPAGE= http://oss.oetiker.ch/rrdtool/
# GPL
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -55,11 +55,12 @@ LIB_DEPENDS-main= png::graphics/png \
art_lgpl_2::graphics/libart
RUN_DEPENDS-main=
WANTLIB-perl= m
WANTLIB-perl= m z
LIB_DEPENDS-perl= rrd:rrdtool-${VERSION}:net/rrdtool
RUN_DEPENDS-perl=
LIB_DEPENDS-python= rrd:rrdtool-${VERSION}:net/rrdtool
RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS}
MODPY_EGG_VERSION= 0.2.1
.include <bsd.port.mk>

10
net/rrdtool/distinfo
View File

@ -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.30.tar.gz) = GbJPcYSo2/e0jBu7VlrZ+w==
RMD160 (rrdtool-1.2.30.tar.gz) = 7k1JL+5OEJ2onKhb2d1WHLnd/Ow=
SHA1 (rrdtool-1.2.30.tar.gz) = yFDcYAi9ZYDu+kJX4zn3i9P3j6M=
SHA256 (rrdtool-1.2.30.tar.gz) = MZDv6kEKbdA1eZcXlIst8JkQ9gjXLSPuga2tTNAYSuk=
SIZE (rrdtool-1.2.30.tar.gz) = 1092483

11
net/rrdtool/patches/patch-bindings_Makefile_in
View File

@ -1,12 +1,11 @@
$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 14:56:19 2008
+++ bindings/Makefile.in Thu Dec 11 11:22:50 2008
@@ -560,7 +560,7 @@ ruby:
# rules for buildung the pyton 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

8
net/rrdtool/patches/patch-doc_Makefile_in
View File

@ -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: patch-doc_Makefile_in,v 1.7 2009/01/26 21:26:32 sthen Exp $
--- 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@

8
net/rrdtool/patches/patch-examples_Makefile_in
View File

@ -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: patch-examples_Makefile_in,v 1.7 2009/01/26 21:26:32 sthen Exp $
--- 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

20
net/rrdtool/patches/patch-rrd_config_h_in Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-rrd_config_h_in,v 1.1 2009/01/26 21:26:32 sthen Exp $
--- 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

52
net/rrdtool/patches/patch-src_rrd_graph_helper_c
View File

@ -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;
}

8
net/rrdtool/pkg/PLIST-main
View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.1 2007/09/12 14:34:37 msf Exp $
bin/rrdcgi
bin/rrdtool
bin/rrdupdate
@comment $OpenBSD: PLIST-main,v 1.2 2009/01/26 21:26:32 sthen Exp $
@bin bin/rrdcgi
@bin bin/rrdtool
@bin bin/rrdupdate
include/rrd.h
lib/librrd.a
lib/librrd.la

5
net/rrdtool/pkg/PLIST-python
View File

@ -1,2 +1,5 @@
@comment $OpenBSD: PLIST-python,v 1.1 2007/09/12 14:34:37 msf Exp $
@comment $OpenBSD: PLIST-python,v 1.2 2009/01/26 21:26:32 sthen Exp $
lib/python${MODPY_VERSION}/
lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/py_rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/rrdtoolmodule.so