forked from ports/contrib
rrdtool: 1.4.8 -> 1.5.6
This commit is contained in:
Danny Rawlins
parent
2e2ba0a149
commit
55878f3e83
@ -13,65 +13,61 @@ drwxr-xr-x root/root usr/include/
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/librrd.a
|
||||
-rwxr-xr-x root/root usr/lib/librrd.la
|
||||
lrwxrwxrwx root/root usr/lib/librrd.so -> librrd.so.4.2.1
|
||||
lrwxrwxrwx root/root usr/lib/librrd.so.4 -> librrd.so.4.2.1
|
||||
-rwxr-xr-x root/root usr/lib/librrd.so.4.2.1
|
||||
lrwxrwxrwx root/root usr/lib/librrd.so -> librrd.so.4.3.5
|
||||
lrwxrwxrwx root/root usr/lib/librrd.so.4 -> librrd.so.4.3.5
|
||||
-rwxr-xr-x root/root usr/lib/librrd.so.4.3.5
|
||||
-rw-r--r-- root/root usr/lib/librrd_th.a
|
||||
-rwxr-xr-x root/root usr/lib/librrd_th.la
|
||||
lrwxrwxrwx root/root usr/lib/librrd_th.so -> librrd_th.so.4.2.1
|
||||
lrwxrwxrwx root/root usr/lib/librrd_th.so.4 -> librrd_th.so.4.2.1
|
||||
-rwxr-xr-x root/root usr/lib/librrd_th.so.4.2.1
|
||||
lrwxrwxrwx root/root usr/lib/librrd_th.so -> librrd_th.so.4.3.5
|
||||
lrwxrwxrwx root/root usr/lib/librrd_th.so.4 -> librrd_th.so.4.3.5
|
||||
-rwxr-xr-x root/root usr/lib/librrd_th.so.4.3.5
|
||||
drwxr-xr-x root/root usr/lib/perl5/
|
||||
drwxr-xr-x root/root usr/lib/perl5/site_perl/
|
||||
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/
|
||||
-r--r--r-- root/root usr/lib/perl5/site_perl/5.18/RRDp.pm
|
||||
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/
|
||||
-r--r--r-- root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/RRDs.pm
|
||||
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/auto/
|
||||
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/auto/RRDs/
|
||||
-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.18/linux-thread-multi/auto/RRDs/RRDs.so
|
||||
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.22/
|
||||
-r--r--r-- root/root usr/lib/perl5/site_perl/5.22/RRDp.pm
|
||||
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/
|
||||
-r--r--r-- root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/RRDs.pm
|
||||
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/auto/
|
||||
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/auto/RRDs/
|
||||
-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.22/linux-thread-multi/auto/RRDs/RRDs.so
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/librrd.pc
|
||||
drwxr-xr-x root/root usr/lib/python2.7/
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/py_rrdtool-0.2.2-py2.7.egg-info
|
||||
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/rrdtoolmodule.so
|
||||
-rwxr-xr-x root/root usr/lib/tclrrd1.4.8.so
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/bin_dec_hex.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/cdeftutorial.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rpntutorial.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrd-beginners.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdbuild.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdcached.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdcgi.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdcreate.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrddump.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdfetch.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdfirst.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdflushcached.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdgraph.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdgraph_data.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdgraph_examples.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdgraph_graph.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdgraph_rpn.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdinfo.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdlast.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdlastupdate.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdresize.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdrestore.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdthreads.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdtool.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdtune.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdtutorial.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdupdate.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/rrdxport.1.gz
|
||||
drwxr-xr-x root/root usr/man/man3/
|
||||
-r--r--r-- root/root usr/man/man3/RRDp.3pm.gz
|
||||
-r--r--r-- root/root usr/man/man3/RRDs.3pm.gz
|
||||
-rw-r--r-- root/root usr/man/man3/librrd.3.gz
|
||||
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/rrdtool.so
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/rrdtool/
|
||||
-rwxr-xr-x root/root usr/share/rrdtool/ifOctets.tcl
|
||||
-rw-r--r-- root/root usr/share/rrdtool/pkgIndex.tcl
|
||||
drwxr-xr-x root/root usr/share/man/
|
||||
drwxr-xr-x root/root usr/share/man/man1/
|
||||
-rw-r--r-- root/root usr/share/man/man1/bin_dec_hex.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/cdeftutorial.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rpntutorial.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrd-beginners.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdbuild.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdcached.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdcgi.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdcreate.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrddump.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdfetch.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdfirst.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdflushcached.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdgraph.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdgraph_data.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdgraph_examples.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdgraph_graph.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdgraph_rpn.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdinfo.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdlast.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdlastupdate.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdresize.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdrestore.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdthreads.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdtool.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdtune.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdtutorial.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdupdate.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/rrdxport.1.gz
|
||||
drwxr-xr-x root/root usr/share/man/man3/
|
||||
-r--r--r-- root/root usr/share/man/man3/RRDp.3pm.gz
|
||||
-r--r--r-- root/root usr/share/man/man3/RRDs.3pm.gz
|
||||
-rw-r--r-- root/root usr/share/man/man3/librrd.3.gz
|
||||
|
||||
@ -1,2 +1 @@
|
||||
dbe59386db97fd2f2216729facd74ca8 rrdtool-1.4.8.tar.gz
|
||||
42e69fd496e2b9d9efbddc03fa081db7 rrdtool-pangofont.patch
|
||||
c3703bca0472e43930e3ddaa848446fc rrdtool-1.5.6.tar.gz
|
||||
|
||||
@ -2,26 +2,23 @@
|
||||
# URL: http://oss.oetiker.ch/rrdtool/index.en.html
|
||||
# Maintainer: Danny Rawlins, crux at romster dot me
|
||||
# Packager: Younes Hafri, ycrux at club-internet dot fr
|
||||
# Depends on: intltool libart_lgpl libcgi libgd pango tcl
|
||||
# Depends on: intltool pango
|
||||
|
||||
name=rrdtool
|
||||
version=1.4.8
|
||||
version=1.5.6
|
||||
release=1
|
||||
source=(http://oss.oetiker.ch/rrdtool/pub/$name-$version.tar.gz
|
||||
rrdtool-pangofont.patch)
|
||||
source=(http://oss.oetiker.ch/rrdtool/pub/$name-$version.tar.gz)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
patch -p1 -i $SRC/rrdtool-pangofont.patch
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
--enable-shared \
|
||||
--enable-perl-site-install \
|
||||
--enable-ruby-site-install \
|
||||
--disable-libwrap
|
||||
--disable-libwrap \
|
||||
--disable-rpath
|
||||
|
||||
make LIBS+="-lglib-2.0"
|
||||
make DESTDIR=$PKG install
|
||||
@ -39,4 +36,3 @@ build() {
|
||||
# Remove empty directories
|
||||
find $PKG -depth -empty -delete
|
||||
}
|
||||
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Oetiker <tobi@oetiker.ch>
|
||||
Date: Wed, 24 Apr 2013 23:49:28 +0200
|
||||
Subject: [PATCH] move to non-deprecated pango_font_map_create_context
|
||||
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
src/rrd_graph.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 2f9e395..d6b2722 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -535,7 +535,7 @@ EX_CHECK_ALL(cairo, cairo_font_options_create, cairo.h,
|
||||
EX_CHECK_ALL(cairo, cairo_svg_surface_create, cairo-svg.h, cairo-svg, 1.10.2, http://cairographics.org/releases/, "")
|
||||
EX_CHECK_ALL(cairo, cairo_pdf_surface_create, cairo-pdf.h, cairo-pdf, 1.10.2, http://cairographics.org/releases/, "")
|
||||
EX_CHECK_ALL(cairo, cairo_ps_surface_create, cairo-ps.h, cairo-ps, 1.10.2, http://cairographics.org/releases/, "")
|
||||
-EX_CHECK_ALL(pangocairo-1.0, pango_cairo_context_set_font_options, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
|
||||
+EX_CHECK_ALL(pangocairo-1.0, pango_font_map_create_context, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
|
||||
|
||||
fi
|
||||
EX_CHECK_ALL(glib-2.0, glib_check_version, glib.h, glib-2.0, 2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "")
|
||||
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
|
||||
index 5547aa6..25ae485 100644
|
||||
--- a/src/rrd_graph.c
|
||||
+++ b/src/rrd_graph.c
|
||||
@@ -4282,7 +4282,7 @@ void rrd_graph_init(
|
||||
fontmap = pango_cairo_font_map_get_default();
|
||||
}
|
||||
|
||||
- context = pango_cairo_font_map_create_context((PangoCairoFontMap*)fontmap);
|
||||
+ context = pango_font_map_create_context(fontmap);
|
||||
|
||||
pango_cairo_context_set_resolution(context, 100);
|
||||
|
||||
--
|
||||
1.8.1.6
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user