diff options
| -rw-r--r-- | databases/rrdtool/Makefile | 6 | ||||
| -rw-r--r-- | databases/rrdtool/buildlink3.mk | 4 | ||||
| -rw-r--r-- | databases/rrdtool/distinfo | 11 | ||||
| -rw-r--r-- | databases/rrdtool/patches/patch-al | 8 | ||||
| -rw-r--r-- | databases/rrdtool/patches/patch-am | 22 |
5 files changed, 14 insertions, 37 deletions
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 63d985cb404..c0c353ebf0d 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.67 2008/06/30 07:31:09 martti Exp $ +# $NetBSD: Makefile,v 1.67.4.1 2008/09/10 11:17:56 tron Exp $ -DISTNAME= rrdtool-1.3.0 -PKGREVISION= 1 +DISTNAME= rrdtool-1.3.2 +#PKGREVISION= 1 CATEGORIES= databases graphics net MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk index be53d8656a4..e9db800e2bd 100644 --- a/databases/rrdtool/buildlink3.mk +++ b/databases/rrdtool/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2008/06/23 16:24:30 he Exp $ +# $NetBSD: buildlink3.mk,v 1.19.4.1 2008/09/10 11:17:56 tron Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RRDTOOL_BUILDLINK3_MK:= ${RRDTOOL_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= rrdtool BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rrdtool .if ${RRDTOOL_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.rrdtool+= rrdtool>=1.2.26 +BUILDLINK_API_DEPENDS.rrdtool+= rrdtool>=1.3.2 BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool .endif # RRDTOOL_BUILDLINK3_MK diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo index 3fe201069ec..172b70b9013 100644 --- a/databases/rrdtool/distinfo +++ b/databases/rrdtool/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.29 2008/06/30 07:29:48 martti Exp $ +$NetBSD: distinfo,v 1.29.4.1 2008/09/10 11:17:56 tron Exp $ -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) = 5a3c397d8f5ed026972cbaadbe21f91f4e762a74 -SHA1 (patch-am) = 9797d7c33632376e75361963e8141a2ad30cfafe +SHA1 (rrdtool-1.3.2.tar.gz) = e4ba8ac84889d23595dc9c25be3d9c5b72ce619a +RMD160 (rrdtool-1.3.2.tar.gz) = 0fd86e318f32f9cba48f5a0d59e4425ba6baec63 +Size (rrdtool-1.3.2.tar.gz) = 1107391 bytes +SHA1 (patch-al) = 6c01b709fd8ca1b2f7968e721a8684864ae1db42 diff --git a/databases/rrdtool/patches/patch-al b/databases/rrdtool/patches/patch-al index e5d5e080987..7d9f80f3dbc 100644 --- a/databases/rrdtool/patches/patch-al +++ b/databases/rrdtool/patches/patch-al @@ -1,10 +1,10 @@ -$NetBSD: patch-al,v 1.12 2008/06/30 07:29:48 martti Exp $ +$NetBSD: patch-al,v 1.12.4.1 2008/09/10 11:17:56 tron Exp $ Correct examples directory. ---- examples/Makefile.in.orig 2007-11-20 02:15:30.000000000 +0200 -+++ examples/Makefile.in 2007-11-20 12:57:37.000000000 +0200 -@@ -224,7 +224,7 @@ +--- examples/Makefile.in.orig 2008-09-06 17:26:10.000000000 +0300 ++++ examples/Makefile.in 2008-09-07 08:37:18.000000000 +0300 +@@ -284,7 +284,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ EXTRA_DIST = cgi-demo.cgi.in diff --git a/databases/rrdtool/patches/patch-am b/databases/rrdtool/patches/patch-am deleted file mode 100644 index a75bb855518..00000000000 --- a/databases/rrdtool/patches/patch-am +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-am,v 1.6 2008/06/30 07:29:48 martti Exp $ - -Prepend file name to error message. - ---- src/rrd_update.c.orig 2008-06-11 01:12:55.000000000 +0200 -+++ src/rrd_update.c -@@ -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; - } |