summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/rrdtool/Makefile15
-rw-r--r--databases/rrdtool/PLIST6
-rw-r--r--databases/rrdtool/buildlink3.mk10
-rw-r--r--databases/rrdtool/distinfo16
-rw-r--r--databases/rrdtool/patches/patch-aa26
-rw-r--r--databases/rrdtool/patches/patch-ab30
-rw-r--r--databases/rrdtool/patches/patch-am32
-rw-r--r--databases/rrdtool/patches/patch-as13
-rw-r--r--databases/rrdtool/patches/patch-av22
-rw-r--r--databases/rrdtool/patches/patch-aw25
-rw-r--r--databases/rrdtool/patches/patch-ay13
11 files changed, 45 insertions, 163 deletions
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 8f6742aa8eb..88b1f6f679a 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2008/06/20 01:09:11 joerg Exp $
+# $NetBSD: Makefile,v 1.66 2008/06/23 16:24:30 he Exp $
-DISTNAME= rrdtool-1.2.27
+DISTNAME= rrdtool-1.3.0
PKGREVISION= 1
CATEGORIES= databases graphics net
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
@@ -11,6 +11,7 @@ COMMENT= Data analysis tool generating graphical representations
#LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
+DEPENDS+= pkg-config>=0.23:../../devel/pkg-config
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config perl
@@ -28,6 +29,8 @@ PERL5_PACKLIST+= auto/RRDs/.packlist
# rrdtool explicitly forbids any use of -ffast-math
BUILDLINK_TRANSFORM+= rm:-ffast-math
+# rrdtool wants libintl_gettext, which at least NetBSD's lib doesn't have
+USE_BUILTIN.gettext= no
SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= post-build
@@ -35,9 +38,15 @@ SUBST_MESSAGE.prefix= Fixing $${prefix} in scripts.
SUBST_FILES.prefix= examples/cgi-demo.cgi
SUBST_SED.prefix= -e '1s,^\#! \$${prefix},\#! ${PREFIX},'
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/libart/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/rrdtool/PLIST b/databases/rrdtool/PLIST
index 199866a74a0..511e0651a10 100644
--- a/databases/rrdtool/PLIST
+++ b/databases/rrdtool/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2007/01/30 13:26:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/06/23 16:24:30 he Exp $
bin/rrdcgi
bin/rrdtool
bin/rrdupdate
include/rrd.h
+include/rrd_format.h
lib/librrd.la
lib/librrd_th.la
man/man1/bin_dec_hex.1
@@ -120,10 +121,7 @@ share/examples/rrdtool/perftest.pl
share/examples/rrdtool/piped-demo.pl
share/examples/rrdtool/shared-demo.pl
share/examples/rrdtool/stripes.pl
-share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
@dirrm share/examples/rrdtool
-@dirrm share/rrdtool/fonts
-@dirrm share/rrdtool
@dirrm share/doc/rrdtool-${PKGVERSION}/html
@dirrm share/doc/rrdtool-${PKGVERSION}/txt
@dirrm share/doc/rrdtool-${PKGVERSION}
diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk
index 1ac7f2e200f..be53d8656a4 100644
--- a/databases/rrdtool/buildlink3.mk
+++ b/databases/rrdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/11/20 11:59:02 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2008/06/23 16:24:30 he Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RRDTOOL_BUILDLINK3_MK:= ${RRDTOOL_BUILDLINK3_MK}+
@@ -18,6 +18,12 @@ BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/libart/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 55d0834a20f..844364491ee 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,13 +1,7 @@
-$NetBSD: distinfo,v 1.27 2008/06/19 15:56:04 he Exp $
+$NetBSD: distinfo,v 1.28 2008/06/23 16:24:30 he Exp $
-SHA1 (rrdtool-1.2.27.tar.gz) = 15028b65be68da83602f7479405dffb1eef819ec
-RMD160 (rrdtool-1.2.27.tar.gz) = ee01b9cd52a9dbf42c6ac8d9259bdcfcd036b112
-Size (rrdtool-1.2.27.tar.gz) = 1081450 bytes
-SHA1 (patch-aa) = cb7129fcb30ca961c824204975fc9481ab7bb1e9
-SHA1 (patch-ab) = 01cb2f7f19925b7ac8693239d03df78fe604e381
+SHA1 (rrdtool-1.3.0.tar.gz) = c80572b3b74a3a58b83d83edcbcaf295f9a37538
+RMD160 (rrdtool-1.3.0.tar.gz) = c5d6665f22155bb6801e83cf9ec931b776cfcc2b
+Size (rrdtool-1.3.0.tar.gz) = 1101980 bytes
SHA1 (patch-al) = f4e8687e8d92347373646c0db344911420203f84
-SHA1 (patch-am) = bc6c6dd11a322e368e220cc813a32613576fec48
-SHA1 (patch-as) = aa48dbc38ae23493b8ff700fabf90d6e0f3f1d5a
-SHA1 (patch-av) = 2e2a626c8bbc78671ff7e834cb229f4a1b0c35c3
-SHA1 (patch-aw) = 69b95e3d92ac58f53ca06784dec5d76f6f632fff
-SHA1 (patch-ay) = 02d147bdbde1fee9b3de0badf7d9430d5be6029e
+SHA1 (patch-am) = 33ac537b57105cb12d02bd12df49ab076969c776
diff --git a/databases/rrdtool/patches/patch-aa b/databases/rrdtool/patches/patch-aa
deleted file mode 100644
index e2257353b17..00000000000
--- a/databases/rrdtool/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2008/05/05 05:25:20 martti Exp $
-
---- src/rrd_getopt.c.orig 2008-02-17 12:26:32.000000000 +0200
-+++ src/rrd_getopt.c 2008-05-05 08:18:08.000000000 +0300
-@@ -30,10 +30,6 @@
- #define _NO_PROTO
- #endif
-
--#ifdef HAVE_CONFIG_H
--#include "../rrd_config.h"
--#endif
--
- #if !defined (__STDC__) || !__STDC__
- /* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
-@@ -42,6 +38,10 @@
- #endif
- #endif
-
-+#ifdef HAVE_CONFIG_H
-+#include "../rrd_config.h"
-+#endif
-+
- #include <stdio.h>
-
- /* Comment out all this code if we are using the GNU C Library, and are not
diff --git a/databases/rrdtool/patches/patch-ab b/databases/rrdtool/patches/patch-ab
deleted file mode 100644
index 31bbf5024e4..00000000000
--- a/databases/rrdtool/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2008/05/05 05:25:20 martti Exp $
-
---- src/rrd_getopt1.c.orig 2008-02-17 12:26:32.000000000 +0200
-+++ src/rrd_getopt1.c 2008-05-05 08:18:29.000000000 +0300
-@@ -19,12 +19,6 @@
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
--#ifdef HAVE_CONFIG_H
--#include "../rrd_config.h"
--#endif
--
--#include "rrd_getopt.h"
--
- #if !defined (__STDC__) || !__STDC__
- /* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
-@@ -33,6 +27,12 @@
- #endif
- #endif
-
-+#ifdef HAVE_CONFIG_H
-+#include "../rrd_config.h"
-+#endif
-+
-+#include "rrd_getopt.h"
-+
- #include <stdio.h>
-
- /* Comment out all this code if we are using the GNU C Library, and are not
diff --git a/databases/rrdtool/patches/patch-am b/databases/rrdtool/patches/patch-am
index a7b0ea20f4f..f094ba763bf 100644
--- a/databases/rrdtool/patches/patch-am
+++ b/databases/rrdtool/patches/patch-am
@@ -1,16 +1,20 @@
-$NetBSD: patch-am,v 1.4 2008/06/19 15:56:04 he Exp $
+$NetBSD: patch-am,v 1.5 2008/06/23 16:24:30 he Exp $
---- src/rrd_update.c.orig 2008-02-17 11:26:32.000000000 +0100
+--- src/rrd_update.c.orig 2008-06-11 01:12:55.000000000 +0200
+++ src/rrd_update.c
-@@ -533,9 +533,9 @@ _rrd_update(const char *filename, const
- if(current_time < rrd.live_head->last_up ||
- (current_time == rrd.live_head->last_up &&
- (long)current_time_usec <= (long)rrd.live_head->last_up_usec)) {
-- rrd_set_error("illegal attempt to update using time %ld when "
-+ rrd_set_error("%s: illegal attempt to update using time %ld when "
- "last update time is %ld (minimum one second step)",
-- current_time, rrd.live_head->last_up);
-+ filename, current_time, rrd.live_head->last_up);
- free(step_start);
- break;
- }
+@@ -502,6 +502,15 @@ int _rrd_update(
+ rra_step_cnt, updvals, tmpl_idx, tmpl_cnt,
+ &pcdp_summary, version, skip_update,
+ &schedule_smooth) == -1) {
++ if (rrd_test_error()) { /* Should have error string always here */
++ char *save_error;
++
++ /* Prepend file name to error message */
++ if ((save_error = strdup(rrd_get_error())) != NULL) {
++ rrd_set_error("%s: %s", filename, save_error);
++ free(save_error);
++ }
++ }
+ free(arg_copy);
+ break;
+ }
diff --git a/databases/rrdtool/patches/patch-as b/databases/rrdtool/patches/patch-as
deleted file mode 100644
index 4f5f4a4330e..00000000000
--- a/databases/rrdtool/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.8 2006/05/05 17:42:07 adam Exp $
-
---- src/rrd_cgi.c.orig 2006-05-04 15:26:28.000000000 +0200
-+++ src/rrd_cgi.c
-@@ -418,7 +418,7 @@ int main(int argc, char *argv[]) {
-
- if (!filter) {
- printf ("Content-Type: text/html\n"
-- "Content-Length: %d\n",
-+ "Content-Length: %zd\n",
- strlen(buffer));
-
- if (labs(goodfor) > 0) {
diff --git a/databases/rrdtool/patches/patch-av b/databases/rrdtool/patches/patch-av
deleted file mode 100644
index ced6b346451..00000000000
--- a/databases/rrdtool/patches/patch-av
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-av,v 1.2 2005/07/03 15:23:34 wulf Exp $
-
---- src/parsetime.c.orig 2005-05-28 22:31:55.000000000 +0930
-+++ src/parsetime.c 2005-06-19 14:05:00.000000000 +0930
-@@ -662,6 +662,7 @@
- /* using time_t seems to help portability with 64bit oses */
- time_t mday=0, wday, mon, year = ptv->tm.tm_year;
- int tlen;
-+ time_t montime;
-
- switch (sc_tokid) {
- case YESTERDAY:
-@@ -716,7 +717,8 @@
- tlen = strlen(sc_token);
- mon = atol(sc_token);
- if (mon > 10*365*24*60*60) {
-- ptv->tm=*localtime(&mon);
-+ montime = mon;
-+ ptv->tm=*localtime(&montime);
- token();
- break;
- }
diff --git a/databases/rrdtool/patches/patch-aw b/databases/rrdtool/patches/patch-aw
deleted file mode 100644
index cfb6f28304e..00000000000
--- a/databases/rrdtool/patches/patch-aw
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aw,v 1.8 2007/11/20 11:58:00 martti Exp $
-
---- src/rrd_tool.c.orig 2007-11-20 02:15:10.000000000 +0200
-+++ src/rrd_tool.c 2007-11-20 12:58:12.000000000 +0200
-@@ -699,9 +699,9 @@
- printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n", XML_ENCODING);
- printf("<%s>\n", ROOT_TAG);
- printf(" <%s>\n", META_TAG);
-- printf(" <%s>%lu</%s>\n", META_START_TAG, start+step, META_START_TAG);
-+ printf(" <%s>%lu</%s>\n", META_START_TAG, (unsigned long) start+step, META_START_TAG);
- printf(" <%s>%lu</%s>\n", META_STEP_TAG, step, META_STEP_TAG);
-- printf(" <%s>%lu</%s>\n", META_END_TAG, end, META_END_TAG);
-+ printf(" <%s>%lu</%s>\n", META_END_TAG, (unsigned long) end, META_END_TAG);
- printf(" <%s>%lu</%s>\n", META_ROWS_TAG, row_cnt, META_ROWS_TAG);
- printf(" <%s>%lu</%s>\n", META_COLS_TAG, col_cnt, META_COLS_TAG);
- printf(" <%s>\n", LEGEND_TAG);
-@@ -717,7 +717,7 @@
- printf(" <%s>\n", DATA_TAG);
- for (ti = start+step; ti <= end; ti += step) {
- printf (" <%s>", DATA_ROW_TAG);
-- printf ("<%s>%lu</%s>", COL_TIME_TAG, ti, COL_TIME_TAG);
-+ printf ("<%s>%lu</%s>", COL_TIME_TAG, (unsigned long) ti, COL_TIME_TAG);
- for (j = 0; j < col_cnt; j++) {
- rrd_value_t newval = DNAN;
- if (enumds == 1)
diff --git a/databases/rrdtool/patches/patch-ay b/databases/rrdtool/patches/patch-ay
deleted file mode 100644
index 97043091ded..00000000000
--- a/databases/rrdtool/patches/patch-ay
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ay,v 1.5 2007/05/16 09:01:11 martti Exp $
-
---- src/rrd_dump.c.orig 2007-05-02 21:06:10.000000000 +0300
-+++ src/rrd_dump.c 2007-05-16 08:44:23.000000000 +0300
-@@ -113,7 +113,7 @@
- # error "Need strftime"
- #endif
- fprintf(out_file, "\t<lastupdate> %ld </lastupdate> <!-- %s -->\n\n",
-- rrd.live_head->last_up,somestring);
-+ (long) rrd.live_head->last_up,somestring);
- for(i=0;i<rrd.stat_head->ds_cnt;i++){
- fprintf(out_file, "\t<ds>\n");
- fprintf(out_file, "\t\t<name> %s </name>\n",rrd.ds_def[i].ds_nam);
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 13:25:21 +0000