On 2008/12/12 01:46, Stuart Henderson wrote:
> On 2008/12/12 09:31, Dongsheng Song wrote:
> > Is anyone work for RRDtool 1.3.4 ?
>
> i'll probably look at it in a day or two.
>
..or sooner.
Really lightly tested in standalone use on amd64 only so far.
Definitely needs much testing in other places and with the
bindings. Those using it in a chrooted environment will have
"a couple" more libraries to copy in...
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/rrdtool/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile 7 Oct 2008 14:27:22 -0000 1.43
+++ Makefile 12 Dec 2008 02:33:58 -0000
@@ -1,30 +1,30 @@
# $OpenBSD: Makefile,v 1.43 2008/10/07 14:27:22 sthen Exp $
-SHARED_ONLY= Yes
+SHARED_ONLY= Yes
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.3.4
DISTNAME= rrdtool-${VERSION}
-PKGNAME-main= ${DISTNAME}p0
-PKGNAME-perl= p5-RRD-${VERSION}p1
-PKGNAME-python= py-rrd-${VERSION}p1
+PKGNAME-main= ${DISTNAME}
+PKGNAME-perl= p5-RRD-${VERSION}
+PKGNAME-python= py-rrd-${VERSION}
-SHARED_LIBS+= rrd 3.0
-SHARED_LIBS+= rrd_th 3.0
+SHARED_LIBS+= rrd 4.0
+SHARED_LIBS+= rrd_th 4.0
CATEGORIES= net
MAINTAINER= Mathieu Sauve-Frankel <m...@openbsd.org>
HOMEPAGE= http://oss.oetiker.ch/rrdtool/
-# GPL
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
+# GPLv2+
+PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE_FTP= Yes
+PERMIT_DISTFILES_CDROM= Yes
+PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}pub/
@@ -50,16 +50,21 @@ LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
PYTHON=${MODPY_BIN}
-WANTLIB-main= c m z freetype
+WANTLIB-main= c cairo expat fontconfig freetype glib-2.0 glitz \
+ gmodule-2.0 gobject-2.0 iconv intl m pcre pixman-1 z \
+ X11 Xau Xdmcp Xrender
+
LIB_DEPENDS-main= png::graphics/png \
- art_lgpl_2::graphics/libart
+ pango-1.0,pangoft2-1.0,pangocairo-1.0::devel/pango \
+ xml2::textproc/libxml
RUN_DEPENDS-main=
-WANTLIB-perl= m
+WANTLIB-perl=
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>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/rrdtool/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 12 Sep 2007 14:34:36 -0000 1.9
+++ distinfo 12 Dec 2008 02:33:58 -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.3.4.tar.gz) = fbO//D87JOgoqI/gIWUmbw==
+RMD160 (rrdtool-1.3.4.tar.gz) = FD6wYojU2zIUSZlD75d0OoGaS5k=
+SHA1 (rrdtool-1.3.4.tar.gz) = 1r+3AV2B23K8iAxqddgsoMI83Jw=
+SHA256 (rrdtool-1.3.4.tar.gz) = M+aNim2JBqXTttdiT8kYoMpJY3sSBIKhEY2U3lTYEW4=
+SIZE (rrdtool-1.3.4.tar.gz) = 1067603
Index: patches/patch-bindings_Makefile_in
===================================================================
RCS file: /cvs/ports/net/rrdtool/patches/patch-bindings_Makefile_in,v
retrieving revision 1.1
diff -u -p -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 12 Dec 2008 02:33:58 -0000
@@ -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 Sat Oct 4 17:04:16 2008
++++ bindings/Makefile.in Thu Dec 11 23:33:07 2008
+@@ -617,7 +617,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
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/net/rrdtool/patches/patch-doc_Makefile_in,v
retrieving revision 1.6
diff -u -p -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 12 Dec 2008 02:33:58 -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 Sat Oct 4 17:04:16 2008
++++ doc/Makefile.in Thu Dec 11 23:33:07 2008
+@@ -201,7 +201,7 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -9,4 +9,4 @@ $OpenBSD: patch-doc_Makefile_in,v 1.6 20
+RRDDOCDIR = $(datadir)/doc/rrdtool
RRDGRAPH_YLEGEND_ANGLE = @RRDGRAPH_YLEGEND_ANGLE@
RRD_DEFAULT_FONT = @RRD_DEFAULT_FONT@
- RUBY = @RUBY@
+ RRD_GETOPT_LONG = @RRD_GETOPT_LONG@
Index: patches/patch-examples_Makefile_in
===================================================================
RCS file: /cvs/ports/net/rrdtool/patches/patch-examples_Makefile_in,v
retrieving revision 1.6
diff -u -p -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 12 Dec 2008 02:33:58 -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 Sat Oct 4 17:04:16 2008
++++ examples/Makefile.in Thu Dec 11 23:33:07 2008
+@@ -284,7 +284,7 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
EXTRA_DIST = cgi-demo.cgi.in
Index: patches/patch-src_rrd_config_bottom_h
===================================================================
RCS file: patches/patch-src_rrd_config_bottom_h
diff -N patches/patch-src_rrd_config_bottom_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_rrd_config_bottom_h 12 Dec 2008 02:33:58 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- src/rrd_config_bottom.h.orig Fri Dec 12 02:11:53 2008
++++ src/rrd_config_bottom.h Fri Dec 12 02:11:54 2008
+@@ -15,12 +15,21 @@
+ #endif
+
+ /* FreeBSD 4.8 wants this included BEFORE sys/types.h */
++#ifdef FreeBSD
+ #ifdef HAVE_SYS_MMAN_H
+ # include <sys/mman.h>
+ #endif
++#endif
+
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
++#endif
++
++/* ... but OpenBSD must have it included AFTER sys/types.h */
++#ifndef FreeBSD
++#ifdef HAVE_SYS_MMAN_H
++# include <sys/mman.h>
++#endif
+ #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;
- }
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/rrdtool/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
--- pkg/PLIST-main 12 Sep 2007 14:34:37 -0000 1.1
+++ pkg/PLIST-main 12 Dec 2008 02:33:58 -0000
@@ -1,14 +1,16 @@
@comment $OpenBSD: PLIST-main,v 1.1 2007/09/12 14:34:37 msf Exp $
-bin/rrdcgi
-bin/rrdtool
-bin/rrdupdate
+...@bin bin/rrdcgi
+...@bin bin/rrdtool
+...@bin bin/rrdupdate
include/rrd.h
+include/rrd_format.h
lib/librrd.a
lib/librrd.la
@lib lib/librrd.so.${LIBrrd_VERSION}
lib/librrd_th.a
lib/librrd_th.la
@lib lib/librrd_th.so.${LIBrrd_th_VERSION}
+lib/pkgconfig/librrd.pc
@man man/man1/bin_dec_hex.1
@man man/man1/cdeftutorial.1
@man man/man1/rpntutorial.1
@@ -119,6 +121,3 @@ share/doc/rrdtool/txt/rrdxport.pod
share/doc/rrdtool/txt/rrdxport.txt
share/examples/rrdtool/
share/examples/rrdtool/cgi-demo.cgi
-share/rrdtool/
-share/rrdtool/fonts/
-share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
Index: pkg/PLIST-python
===================================================================
RCS file: /cvs/ports/net/rrdtool/pkg/PLIST-python,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-python
--- pkg/PLIST-python 12 Sep 2007 14:34:37 -0000 1.1
+++ pkg/PLIST-python 12 Dec 2008 02:33:58 -0000
@@ -1,2 +1,5 @@
@comment $OpenBSD: PLIST-python,v 1.1 2007/09/12 14:34:37 msf 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
