diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index ad5acfedc5e..2aa2000dc46 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2000/12/07 17:25:09 brad Exp $
+# $OpenBSD: Makefile,v 1.11 2001/03/04 17:06:41 danh Exp $
-VERSION= 1.0.28
+VERSION= 1.0.33
DISTNAME= rrdtool-${VERSION}
CATEGORIES= net
-NEED_VERSION= 1.340
+NEED_VERSION= 1.358
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/ \
ftp://ftp.sunet.se/pub/network/monitoring/rrdtool/ \
http://ftp.sunet.se/pub/network/monitoring/rrdtool/
@@ -22,18 +22,13 @@ SUBST_VARS= VERSION
FLAVORS= tcl
FLAVOR?=
-LIB_DEPENDS+= gd.18::graphics/gd
.if ${FLAVOR:L:Mtcl}
LIB_DEPENDS+= tcl83::lang/tcl/8.3
-.endif
-
-.if ${FLAVOR:L:Mtcl}
USE_GMAKE= Yes
.endif
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --enable-static
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED} --enable-static
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/net/rrdtool/files/md5 b/net/rrdtool/files/md5
index 30ac4fc1803..f6cf7f87780 100644
--- a/net/rrdtool/files/md5
+++ b/net/rrdtool/files/md5
@@ -1,3 +1,3 @@
-MD5 (rrdtool-1.0.28.tar.gz) = 4db8949675ccb97cd289fae96fb3dbb0
-RMD160 (rrdtool-1.0.28.tar.gz) = df91c78dab7974b88df29dbad1679be69a3c9eaf
-SHA1 (rrdtool-1.0.28.tar.gz) = f43bd1abbc6895754de3891885cdd26dc15e7495
+MD5 (rrdtool-1.0.33.tar.gz) = 54bb6daf131cdc4bbe2bcf005bf583a5
+RMD160 (rrdtool-1.0.33.tar.gz) = f58f63800bcaff215d274fa53ca9c9521d020658
+SHA1 (rrdtool-1.0.33.tar.gz) = d0394368ef30dcd390d466843ef4d052365f2470
diff --git a/net/rrdtool/patches/patch-Makefile_in b/net/rrdtool/patches/patch-Makefile_in
index cd6d0dc8b20..948527bc60c 100644
--- a/net/rrdtool/patches/patch-Makefile_in
+++ b/net/rrdtool/patches/patch-Makefile_in
@@ -1,16 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2000/11/20 01:12:41 danh Exp $
---- Makefile.in.orig Thu Sep 14 01:57:45 2000
-+++ Makefile.in Sun Nov 19 20:03:59 2000
-@@ -86,7 +86,7 @@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- RSYNC = rsync --rsh=ssh
-
- # build the following subdirectories
--SUBDIRS = cgilib-0.4 config gd1.3 zlib-1.1.3 libpng-1.0.6 src doc examples contrib tcl
-+SUBDIRS = cgilib-0.4 config src doc examples contrib tcl
-
-
- # the following files are not mentioned in any other Makefile
-@@ -384,11 +384,11 @@ maintainer-clean
+$OpenBSD: patch-Makefile_in,v 1.7 2001/03/04 17:06:41 danh Exp $
+--- Makefile.in.orig Thu Feb 22 06:02:14 2001
++++ Makefile.in Sun Mar 4 11:30:43 2001
+@@ -385,11 +385,11 @@ maintainer-clean
# lets schedule the perl stuff for installation
# the special call to install-sh is because the -d switch is not portable
install-data-local:
@@ -19,9 +10,9 @@ $OpenBSD: patch-Makefile_in,v 1.6 2000/11/20 01:12:41 danh Exp $
- $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
-+ $(INSTALL) -d -m 755 $(DESTDIR)$(prefix)/libdata/perl5/site_perl/@build_cpu@-openbsd/auto/RRDs
-+ $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/libdata/perl5/site_perl/@build_cpu@-openbsd
-+ $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/libdata/perl5/site_perl/@build_cpu@-openbsd
++ ./config/mkinstalldirs $(DESTDIR)$(prefix)/libdata/perl5/site_perl/@build_cpu@-openbsd/auto/RRDs
++ $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/libdata/perl5/site_perl
++ $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/libdata/perl5/site_perl
+ $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/libdata/perl5/site_perl/@build_cpu@-openbsd/auto/RRDs
+ $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/libdata/perl5/site_perl/@build_cpu@-openbsd/auto/RRDs
diff --git a/net/rrdtool/patches/patch-config_ltconfig b/net/rrdtool/patches/patch-config_ltconfig
index 62638ad3c10..6f59c69a0b0 100644
--- a/net/rrdtool/patches/patch-config_ltconfig
+++ b/net/rrdtool/patches/patch-config_ltconfig
@@ -1,5 +1,6 @@
---- config/ltconfig.orig Fri Aug 6 00:06:49 1999
-+++ config/ltconfig Mon Feb 19 10:31:47 2001
+$OpenBSD: patch-config_ltconfig,v 1.3 2001/03/04 17:06:41 danh Exp $
+--- config/ltconfig.orig Thu Feb 22 16:09:55 2001
++++ config/ltconfig Thu Feb 22 16:11:58 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
diff --git a/net/rrdtool/patches/patch-config_ltmain.sh b/net/rrdtool/patches/patch-config_ltmain_sh
similarity index 79%
rename from net/rrdtool/patches/patch-config_ltmain.sh
rename to net/rrdtool/patches/patch-config_ltmain_sh
index 2892b8a751f..aa6e9696640 100644
--- a/net/rrdtool/patches/patch-config_ltmain.sh
+++ b/net/rrdtool/patches/patch-config_ltmain_sh
@@ -1,20 +1,21 @@
+$OpenBSD: patch-config_ltmain_sh,v 1.1 2001/03/04 17:06:41 danh Exp $
--- config/ltmain.sh.orig Fri Aug 6 00:06:50 1999
-+++ config/ltmain.sh Mon Feb 19 10:44:03 2001
++++ config/ltmain.sh Thu Feb 22 16:40:28 2001
@@ -1073,6 +1073,17 @@ compiler."
# These systems don't actually have c library (as such)
continue
;;
-+ *-*-openbsd*)
-+ # Do not include libc due to us having libc/libc_r.
-+ continue
-+ ;;
++ *-*-openbsd*)
++ # Do not include libc due to us having libc/libc_r.
++ continue
++ ;;
+ esac
-+ elif test "$arg" = "-lc_r"; then
-+ case "$host" in
-+ *-*-openbsd*)
-+ # Do not include libc_r directly, use -pthread flag.
-+ continue
-+ ;;
++ elif test "$arg" = "-lc_r"; then
++ case "$host" in
++ *-*-openbsd*)
++ # Do not include libc_r directly, use -pthread flag.
++ continue
++ ;;
esac
elif test "$arg" = "-lm"; then
case "$host" in
@@ -23,8 +24,8 @@
;;
+ -thread)
-+ deplibs="$deplibs $arg"
-+ ;;
++ deplibs="$deplibs $arg"
++ ;;
+
-module)
module=yes
@@ -33,9 +34,9 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
-+ *-*-openbsd*)
-+ # do not include libc due to us having libc/libc_r.
-+ ;;
++ *-*-openbsd*)
++ # do not include libc due to us having libc/libc_r.
++ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
diff --git a/net/rrdtool/patches/patch-contrib_Makefile_in b/net/rrdtool/patches/patch-contrib_Makefile_in
index 7783bb5c104..2b81a44fc3f 100644
--- a/net/rrdtool/patches/patch-contrib_Makefile_in
+++ b/net/rrdtool/patches/patch-contrib_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-contrib_Makefile_in,v 1.3 2000/11/20 01:12:41 danh Exp $
---- contrib/Makefile.in.orig Thu Sep 14 02:04:30 2000
-+++ contrib/Makefile.in Sun Nov 19 19:54:44 2000
-@@ -86,7 +86,7 @@ VERSION = @VERSION@
+$OpenBSD: patch-contrib_Makefile_in,v 1.4 2001/03/04 17:06:41 danh Exp $
+--- contrib/Makefile.in.orig Thu Feb 22 06:07:39 2001
++++ contrib/Makefile.in Thu Feb 22 16:07:21 2001
+@@ -87,7 +87,7 @@ VERSION = @VERSION@
ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- SUBDIRS = log2rrd rrd-file-icon trytime rrdproc rrdlastds add_ds killspike rrdfetchnames
+ SUBDIRS = trytime
-contribdir = $(prefix)/contrib
+contribdir = $(prefix)/share/examples/rrdtool/contrib
contrib_DATA = README
- EXTRA_DIST = clickgraphs php3 php4
+ EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool/patches/patch-contrib_add_ds_Makefile_in b/net/rrdtool/patches/patch-contrib_add_ds_Makefile_in
deleted file mode 100644
index 658cee8d33f..00000000000
--- a/net/rrdtool/patches/patch-contrib_add_ds_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-contrib_add_ds_Makefile_in,v 1.2 2000/06/29 21:12:24 jakob Exp $
---- contrib/add_ds/Makefile.in.orig Tue Jun 13 06:47:44 2000
-+++ contrib/add_ds/Makefile.in Thu Jun 29 13:34:55 2000
-@@ -87,7 +87,7 @@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
-
- EXTRA_DIST = add_ds.pl.in batch.pl.in
-
--contribdir = $(prefix)/contrib/add_ds
-+contribdir = $(prefix)/share/examples/rrdtool/contrib/add_ds
- contrib_DATA = README
- contrib_SCRIPTS = add_ds.pl batch.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool/patches/patch-contrib_killspike_Makefile_in b/net/rrdtool/patches/patch-contrib_killspike_Makefile_in
deleted file mode 100644
index d179c2ec921..00000000000
--- a/net/rrdtool/patches/patch-contrib_killspike_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-contrib_killspike_Makefile_in,v 1.2 2000/06/29 21:12:24 jakob Exp $
---- contrib/killspike/Makefile.in.orig Tue Jun 13 06:47:48 2000
-+++ contrib/killspike/Makefile.in Thu Jun 29 13:35:24 2000
-@@ -87,7 +87,7 @@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
-
- EXTRA_DIST = killspike.pl.in
-
--contribdir = $(prefix)/contrib/killspike
-+contribdir = $(prefix)/share/examples/rrdtool/contrib/killspike
- contrib_DATA = README
- contrib_SCRIPTS = killspike.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool/patches/patch-contrib_log2rrd_Makefile_in b/net/rrdtool/patches/patch-contrib_log2rrd_Makefile_in
deleted file mode 100644
index 860c7640c99..00000000000
--- a/net/rrdtool/patches/patch-contrib_log2rrd_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-contrib_log2rrd_Makefile_in,v 1.2 2000/06/29 21:12:24 jakob Exp $
---- contrib/log2rrd/Makefile.in.orig Tue Jun 13 06:47:24 2000
-+++ contrib/log2rrd/Makefile.in Thu Jun 29 13:35:43 2000
-@@ -87,7 +87,7 @@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
-
- EXTRA_DIST = log2rrd.pl.in
-
--contribdir = $(prefix)/contrib/log2rrd
-+contribdir = $(prefix)/share/examples/rrdtool/contrib/log2rrd
- contrib_DATA = README
- contrib_SCRIPTS = log2rrd.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool/patches/patch-contrib_rrd-file-icon_Makefile_in b/net/rrdtool/patches/patch-contrib_rrd-file-icon_Makefile_in
deleted file mode 100644
index 0844f7bec66..00000000000
--- a/net/rrdtool/patches/patch-contrib_rrd-file-icon_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-contrib_rrd-file-icon_Makefile_in,v 1.2 2000/06/29 21:12:24 jakob Exp $
---- contrib/rrd-file-icon/Makefile.in.orig Tue Jun 13 06:47:28 2000
-+++ contrib/rrd-file-icon/Makefile.in Thu Jun 29 13:36:39 2000
-@@ -86,7 +86,7 @@ VERSION = @VERSION@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
-
- EXTRA_DIST = rrd.png
--contribdir = $(prefix)/contrib/rrd-file-icon
-+contribdir = $(prefix)/share/examples/rrdtool/contrib/rrd-file-icon
- contrib_DATA = README rrd.png
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../../config/config.h
diff --git a/net/rrdtool/patches/patch-contrib_rrdfetchnames_Makefile_in b/net/rrdtool/patches/patch-contrib_rrdfetchnames_Makefile_in
deleted file mode 100644
index a232fe06943..00000000000
--- a/net/rrdtool/patches/patch-contrib_rrdfetchnames_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-contrib_rrdfetchnames_Makefile_in,v 1.2 2000/06/29 21:12:24 jakob Exp $
---- contrib/rrdfetchnames/Makefile.in.orig Tue Jun 13 06:47:52 2000
-+++ contrib/rrdfetchnames/Makefile.in Thu Jun 29 13:37:04 2000
-@@ -87,7 +87,7 @@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
-
- EXTRA_DIST = rrdfetchnames.pl.in
-
--contribdir = $(prefix)/contrib/rrdfetchnames
-+contribdir = $(prefix)/share/examples/rrdtool/contrib/rrdfetchnames
- contrib_DATA = README
- contrib_SCRIPTS = rrdfetchnames.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool/patches/patch-contrib_rrdlastds_Makefile_in b/net/rrdtool/patches/patch-contrib_rrdlastds_Makefile_in
deleted file mode 100644
index 4e2751f6cd4..00000000000
--- a/net/rrdtool/patches/patch-contrib_rrdlastds_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-contrib_rrdlastds_Makefile_in,v 1.2 2000/06/29 21:12:24 jakob Exp $
---- contrib/rrdlastds/Makefile.in.orig Tue Jun 13 06:47:41 2000
-+++ contrib/rrdlastds/Makefile.in Thu Jun 29 13:38:07 2000
-@@ -87,7 +87,7 @@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
-
- EXTRA_DIST = rrdlastds.pl.in
-
--contribdir = $(prefix)/contrib/rrdlastds
-+contribdir = $(prefix)/share/examples/rrdtool/contrib/rrdlastds
- contrib_DATA = README
- contrib_SCRIPTS = rrdlastds.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/net/rrdtool/patches/patch-contrib_rrdproc_Makefile_in b/net/rrdtool/patches/patch-contrib_rrdproc_Makefile_in
deleted file mode 100644
index f105a5273bb..00000000000
--- a/net/rrdtool/patches/patch-contrib_rrdproc_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-contrib_rrdproc_Makefile_in,v 1.2 2000/06/29 21:12:24 jakob Exp $
---- contrib/rrdproc/Makefile.in.orig Tue Jun 13 06:47:37 2000
-+++ contrib/rrdproc/Makefile.in Thu Jun 29 13:38:44 2000
-@@ -86,7 +86,7 @@ VERSION = @VERSION@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
-
- EXTRA_DIST = rrdproc.c
--contribdir = $(prefix)/contrib/rrdproc
-+contribdir = $(prefix)/share/examples/rrdtool/contrib/rrdproc
- contrib_DATA = README rrdproc.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../../config/config.h
diff --git a/net/rrdtool/patches/patch-contrib_trytime_Makefile_in b/net/rrdtool/patches/patch-contrib_trytime_Makefile_in
index 700fb26c946..11583655aef 100644
--- a/net/rrdtool/patches/patch-contrib_trytime_Makefile_in
+++ b/net/rrdtool/patches/patch-contrib_trytime_Makefile_in
@@ -1,13 +1,9 @@
-$OpenBSD: patch-contrib_trytime_Makefile_in,v 1.3 2000/09/06 19:17:23 danh Exp $
-$NetBSD: patch-ad,v 1.2 2000/05/07 12:50:52 wulf Exp $
---- contrib/trytime/Makefile.in.orig Wed Jul 12 05:58:25 2000
-+++ contrib/trytime/Makefile.in Tue Aug 22 19:03:47 2000
-@@ -85,9 +85,9 @@ TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
- VERSION = @VERSION@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+$OpenBSD: patch-contrib_trytime_Makefile_in,v 1.4 2001/03/04 17:06:43 danh Exp $
+--- contrib/trytime/Makefile.in.orig Thu Feb 22 16:15:55 2001
++++ contrib/trytime/Makefile.in Thu Feb 22 16:16:47 2001
+@@ -88,7 +88,7 @@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
--INCLUDES = -I../../src -I../../gd1.3
-+INCLUDES = -I../../src
+ INCLUDES = -I../../src -I../../gd1.3
EXTRA_DIST = trytime.c
-contribdir = $(prefix)/contrib/trytime
+contribdir = $(prefix)/share/examples/rrdtool/contrib/trytime
diff --git a/net/rrdtool/patches/patch-doc_Makefile_in b/net/rrdtool/patches/patch-doc_Makefile_in
index d0b469cb9ca..416cda13f72 100644
--- a/net/rrdtool/patches/patch-doc_Makefile_in
+++ b/net/rrdtool/patches/patch-doc_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.2 2000/06/29 21:12:24 jakob Exp $
---- doc/Makefile.in.orig Tue Jun 13 06:47:10 2000
-+++ doc/Makefile.in Thu Jun 29 13:40:03 2000
-@@ -106,9 +106,9 @@ HTML = $(POD:.pod=.html) $(PMP:.pm=.html
+$OpenBSD: patch-doc_Makefile_in,v 1.3 2001/03/04 17:06:43 danh Exp $
+--- doc/Makefile.in.orig Thu Feb 22 16:17:07 2001
++++ doc/Makefile.in Thu Feb 22 16:17:46 2001
+@@ -108,9 +108,9 @@ PDF = $(MAN:.1=.pdf)
EXTRA_DIST = $(POD) $(HTML) $(TXT)
# some install rules
diff --git a/net/rrdtool/patches/patch-examples_Makefile_in b/net/rrdtool/patches/patch-examples_Makefile_in
index 1fb8f4f3916..cd0f6f23c5f 100644
--- a/net/rrdtool/patches/patch-examples_Makefile_in
+++ b/net/rrdtool/patches/patch-examples_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-examples_Makefile_in,v 1.2 2000/06/29 21:12:24 jakob Exp $
---- examples/Makefile.in.orig Tue Jun 13 06:47:13 2000
-+++ examples/Makefile.in Thu Jun 29 13:40:25 2000
-@@ -91,7 +91,7 @@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+$OpenBSD: patch-examples_Makefile_in,v 1.3 2001/03/04 17:06:43 danh Exp $
+--- examples/Makefile.in.orig Thu Feb 22 16:18:11 2001
++++ examples/Makefile.in Thu Feb 22 16:18:29 2001
+@@ -92,7 +92,7 @@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
diff --git a/net/rrdtool/patches/patch-examples_cgi-demo_cgi_in b/net/rrdtool/patches/patch-examples_cgi-demo_cgi_in
deleted file mode 100644
index 85ddd30093e..00000000000
--- a/net/rrdtool/patches/patch-examples_cgi-demo_cgi_in
+++ /dev/null
@@ -1,22 +0,0 @@
-$OpenBSD: patch-examples_cgi-demo_cgi_in,v 1.1 2000/09/06 19:17:23 danh Exp $
-$NetBSD: patch-al,v 1.2 2000/05/07 12:50:52 wulf Exp $
---- examples/cgi-demo.cgi.in.orig Tue Aug 22 18:57:13 2000
-+++ examples/cgi-demo.cgi.in Tue Aug 22 18:57:51 2000
-@@ -11,7 +11,7 @@ the shared-demo.pl.
- This is NOT traffic
-
-
--"
-@@ -22,7 +22,7 @@ the shared-demo.pl.
-
-
-
-- 'RRDs',
- 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
- 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
-- 'INC' => '-I../src -I../gd1.3',
-+ 'INC' => '-I../src -I${LOCALBASE}/include',
- # where to look for the necessary libraries
- # Perl will figure out which one is valid
- 'depend' => {'RRDs.c' => "../src/.libs/librrd_private.a"},
-- 'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"},
-+ 'dynamic_lib' => {'OTHERLDFLAGS' => "-L\${LOCALBASE}/lib $librrd -lm -lz -ljpeg -lpng -lgd"},
- 'realclean' => {FILES => 't/demo?.rrd t/demo?.gif' }
- );
diff --git a/net/rrdtool/patches/patch-src_Makefile_in b/net/rrdtool/patches/patch-src_Makefile_in
deleted file mode 100644
index 8fb306ae373..00000000000
--- a/net/rrdtool/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,137 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2000/09/06 19:17:23 danh Exp $
-$NetBSD: patch-ah,v 1.4 2000/05/07 12:50:52 wulf Exp $
---- src/Makefile.in.orig Wed Jul 12 05:58:14 2000
-+++ src/Makefile.in Tue Aug 22 21:41:22 2000
-@@ -37,8 +37,6 @@ mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
-
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -87,11 +85,8 @@ TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
- VERSION = @VERSION@
-
- CGI_LIB_DIR = $(top_srcdir)/@CGI_LIB_DIR@
--GD_LIB_DIR = $(top_srcdir)/@GD_LIB_DIR@
--PNG_LIB_DIR = $(top_srcdir)/@PNG_LIB_DIR@
--ZLIB_LIB_DIR = $(top_srcdir)/@ZLIB_LIB_DIR@
-
--INCLUDES = -I$(CGI_LIB_DIR) -I$(GD_LIB_DIR) -I$(PNG_LIB_DIR) -I$(ZLIB_LIB_DIR)
-+INCLUDES = -I$(CGI_LIB_DIR) -I$(LOCALBASE)/include
-
- #COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
- #LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
-@@ -107,7 +102,7 @@ RRD_C_FILES = gdpng.c getopt.c geto
- # creates a ./.lib/*.al file that contains the PIC compiled object
- # files.
-
--RRD_LIBS = $(CGI_LIB_DIR)/librrd_cgi.la $(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la $(ZLIB_LIB_DIR)/librrd_z.la
-+RRD_LIBS = $(CGI_LIB_DIR)/librrd_cgi.la -lz -ljpeg -lpng -lgd
-
-
- lib_LTLIBRARIES = librrd.la
-@@ -143,17 +138,13 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../confi
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--librrd_la_DEPENDENCIES = $(CGI_LIB_DIR)/librrd_cgi.la \
--$(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la \
--$(ZLIB_LIB_DIR)/librrd_z.la
-+librrd_la_DEPENDENCIES = $(CGI_LIB_DIR)/librrd_cgi.la
- librrd_la_OBJECTS = gdpng.lo getopt.lo getopt1.lo gifsize.lo \
- parsetime.lo pngsize.lo rrd_create.lo rrd_diff.lo rrd_dump.lo \
- rrd_info.lo rrd_error.lo rrd_fetch.lo rrd_format.lo rrd_graph.lo \
- rrd_last.lo rrd_open.lo rrd_resize.lo rrd_restore.lo rrd_tune.lo \
- rrd_update.lo
--librrd_private_la_DEPENDENCIES = $(CGI_LIB_DIR)/librrd_cgi.la \
--$(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la \
--$(ZLIB_LIB_DIR)/librrd_z.la
-+librrd_private_la_DEPENDENCIES = $(CGI_LIB_DIR)/librrd_cgi.la
- librrd_private_la_OBJECTS = gdpng.lo getopt.lo getopt1.lo gifsize.lo \
- parsetime.lo pngsize.lo rrd_create.lo rrd_diff.lo rrd_dump.lo \
- rrd_info.lo rrd_error.lo rrd_fetch.lo rrd_format.lo rrd_graph.lo \
-@@ -273,7 +264,7 @@ librrd.la: $(librrd_la_OBJECTS) $(librrd
- $(LINK) -rpath $(libdir) $(librrd_la_LDFLAGS) $(librrd_la_OBJECTS) $(librrd_la_LIBADD) $(LIBS)
-
- librrd_private.la: $(librrd_private_la_OBJECTS) $(librrd_private_la_DEPENDENCIES)
-- $(LINK) $(librrd_private_la_LDFLAGS) $(librrd_private_la_OBJECTS) $(librrd_private_la_LIBADD) $(LIBS)
-+ $(LINK) -rpath $(libdir) $(librrd_private_la_LDFLAGS) $(librrd_private_la_OBJECTS) $(librrd_private_la_LIBADD) $(LIBS)
-
- mostlyclean-binPROGRAMS:
-
-@@ -367,49 +358,49 @@ distdir: $(DISTFILES)
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
--gdpng.lo gdpng.o : gdpng.c ../libpng-1.0.6/png.h ../zlib-1.1.3/zlib.h \
-- ../zlib-1.1.3/zconf.h ../libpng-1.0.6/pngconf.h ../gd1.3/gd.h
-+gdpng.lo gdpng.o : gdpng.c $(LOCALBASE)/include/png.h /usr/include/zlib.h \
-+ /usr/include/zconf.h $(LOCALBASE)/include/pngconf.h \
-+ $(LOCALBASE)/include/gd.h
- getopt.lo getopt.o : getopt.c ../config/config.h getopt.h
- getopt1.lo getopt1.o : getopt1.c ../config/config.h getopt.h
- gifsize.lo gifsize.o : gifsize.c
- parsetime.lo parsetime.o : parsetime.c rrd_tool.h ../config/config.h \
-- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
--pngsize.lo pngsize.o : pngsize.c ../libpng-1.0.6/png.h \
-- ../zlib-1.1.3/zlib.h ../zlib-1.1.3/zconf.h \
-- ../libpng-1.0.6/pngconf.h
-+ rrd.h getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
-+pngsize.lo pngsize.o : pngsize.c $(LOCALBASE)/include/png.h \
-+ /usr/include/zlib.h /usr/include/zconf.h $(LOCALBASE)/include/pngconf.h
- rrd_cgi.o: rrd_cgi.c rrd_tool.h ../config/config.h rrd.h getopt.h \
-- rrd_format.h ../gd1.3/gd.h ../cgilib-0.4/cgi.h
-+ rrd_format.h $(LOCALBASE)/include/gd.h ../cgilib-0.4/cgi.h
- rrd_create.lo rrd_create.o : rrd_create.c rrd_tool.h ../config/config.h \
-- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+ rrd.h getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_diff.lo rrd_diff.o : rrd_diff.c rrd_tool.h ../config/config.h rrd.h \
-- getopt.h rrd_format.h ../gd1.3/gd.h
-+ getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_dump.lo rrd_dump.o : rrd_dump.c rrd_tool.h ../config/config.h rrd.h \
-- getopt.h rrd_format.h ../gd1.3/gd.h
-+ getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_error.lo rrd_error.o : rrd_error.c rrd_tool.h ../config/config.h \
-- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+ rrd.h getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_fetch.lo rrd_fetch.o : rrd_fetch.c rrd_tool.h ../config/config.h \
-- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+ rrd.h getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_format.lo rrd_format.o : rrd_format.c rrd_tool.h ../config/config.h \
-- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+ rrd.h getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_graph.lo rrd_graph.o : rrd_graph.c rrd_tool.h ../config/config.h \
-- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h \
-- ../gd1.3/gdlucidan10.h ../gd1.3/gdlucidab12.h
-+ rrd.h getopt.h rrd_format.h $(LOCALBASE)/include/gd.h \
-+ $(LOCALBASE)/include/gdfontt.h ${LOCALBASE}/include/gdfonts.h
- rrd_info.lo rrd_info.o : rrd_info.c rrd_tool.h ../config/config.h rrd.h \
-- getopt.h rrd_format.h ../gd1.3/gd.h
-+ getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_last.lo rrd_last.o : rrd_last.c rrd_tool.h ../config/config.h rrd.h \
-- getopt.h rrd_format.h ../gd1.3/gd.h
-+ getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_open.lo rrd_open.o : rrd_open.c rrd_tool.h ../config/config.h rrd.h \
-- getopt.h rrd_format.h ../gd1.3/gd.h
-+ getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_resize.lo rrd_resize.o : rrd_resize.c rrd_tool.h ../config/config.h \
-- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+ rrd.h getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_restore.lo rrd_restore.o : rrd_restore.c rrd_tool.h \
-- ../config/config.h rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+ ../config/config.h rrd.h getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_tool.o: rrd_tool.c rrd_tool.h ../config/config.h rrd.h getopt.h \
-- rrd_format.h ../gd1.3/gd.h
-+ rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_tune.lo rrd_tune.o : rrd_tune.c rrd_tool.h ../config/config.h rrd.h \
-- getopt.h rrd_format.h ../gd1.3/gd.h
-+ getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
- rrd_update.lo rrd_update.o : rrd_update.c rrd_tool.h ../config/config.h \
-- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+ rrd.h getopt.h rrd_format.h $(LOCALBASE)/include/gd.h
-
- info-am:
- info: info-am
diff --git a/net/rrdtool/patches/patch-src_rrd_graph_c b/net/rrdtool/patches/patch-src_rrd_graph_c
deleted file mode 100644
index 791007511b8..00000000000
--- a/net/rrdtool/patches/patch-src_rrd_graph_c
+++ /dev/null
@@ -1,67 +0,0 @@
-$OpenBSD: patch-src_rrd_graph_c,v 1.1 2000/09/06 19:17:23 danh Exp $
-$NetBSD: patch-ai,v 1.2 2000/05/07 12:50:52 wulf Exp $
---- src/rrd_graph.c.orig Tue Aug 22 19:37:46 2000
-+++ src/rrd_graph.c Tue Aug 22 19:40:34 2000
-@@ -6,12 +6,12 @@
-
- #include "rrd_tool.h"
- #include
--#include
--#include
-+#include
-+#include
- #include
-
--#define SmallFont gdLucidaNormal10
--#define LargeFont gdLucidaBold12
-+#define SmallFont gdFontTiny
-+#define LargeFont gdFontSmall
-
- /* #define DEBUG */
-
-@@ -38,7 +38,7 @@ enum op_en {OP_NUMBER=0,OP_VARIABLE,OP_I
- OP_MIN,OP_MAX,OP_LIMIT, OP_FLOOR, OP_CEIL,
- OP_UN,OP_END};
-
--enum if_en {IF_GIF=0,IF_PNG=1};
-+enum if_en {IF_PNG=0};
-
- typedef struct rpnp_t {
- enum op_en op;
-@@ -340,7 +340,6 @@ enum gf_en gf_conv(char *string){
-
- enum if_en if_conv(char *string){
-
-- conv_if(GIF,IF_GIF)
- conv_if(PNG,IF_PNG)
-
- return (-1);
-@@ -2309,9 +2308,6 @@ int lazy_check(image_desc_t *im){
- if ((fd = fopen(im->graphfile,"rb")) == NULL)
- return 0; /* the file does not exist */
- switch (im->imgformat) {
-- case IF_GIF:
-- size = GifSize(fd,&(im->xgif),&(im->ygif));
-- break;
- case IF_PNG:
- size = PngSize(fd,&(im->xgif),&(im->ygif));
- break;
-@@ -2570,9 +2566,6 @@ graph_paint(image_desc_t *im, char ***ca
- }
- }
- switch (im->imgformat) {
-- case IF_GIF:
-- gdImageGif(gif, fo);
-- break;
- case IF_PNG:
- gdImagePng(gif, fo);
- break;
-@@ -2687,7 +2680,7 @@ rrd_graph(int argc, char **argv, char **
- im.prt_c = 0;
- im.gdes_c = 0;
- im.gdes = NULL;
-- im.imgformat = IF_GIF; /* we default to GIF output */
-+ im.imgformat = IF_PNG; /* we default to PNG output */
-
- for(i=0;i
-+
- #ifdef WIN32
- # include "ntconfig.h"
- #else
-@@ -125,7 +130,6 @@ int GifSize(FILE *, long *, long *);
- int PngSize(FILE *, long *, long *);
- int PngSize(FILE *, long *, long *);
-
--#include
- void gdImagePng(gdImagePtr im, FILE *out);
-
- int rrd_create_fn(char *file_name, rrd_t *rrd);
diff --git a/net/rrdtool/patches/patch-tcl_Makefile_in b/net/rrdtool/patches/patch-tcl_Makefile_in
deleted file mode 100644
index 8fd58eec41d..00000000000
--- a/net/rrdtool/patches/patch-tcl_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tcl_Makefile_in,v 1.3 2000/06/19 09:11:27 camield Exp $
---- tcl/Makefile.in.orig Mon Jun 12 14:29:45 2000
-+++ tcl/Makefile.in Wed Jun 14 12:51:00 2000
-@@ -32,8 +32,6 @@ mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
-
--DESTDIR =
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
diff --git a/net/rrdtool/pkg/PLIST b/net/rrdtool/pkg/PLIST
index 6ee7121a197..2ebae346c6a 100644
--- a/net/rrdtool/pkg/PLIST
+++ b/net/rrdtool/pkg/PLIST
@@ -1,12 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.5 2000/09/06 19:17:24 danh Exp $
+@comment $OpenBSD: PLIST,v 1.6 2001/03/04 17:06:44 danh Exp $
bin/rrdcgi
bin/rrdtool
+bin/rrdupdate
bin/trytime
include/rrd.h
lib/librrd.a
lib/librrd.la
-libdata/perl5/site_perl/${ARCH}-openbsd/RRDp.pm
-libdata/perl5/site_perl/${ARCH}-openbsd/RRDs.pm
+libdata/perl5/site_perl/RRDp.pm
+libdata/perl5/site_perl/RRDs.pm
libdata/perl5/site_perl/${ARCH}-openbsd/auto/RRDs/RRDs.bs
libdata/perl5/site_perl/${ARCH}-openbsd/auto/RRDs/RRDs.so
man/man1/RRDp.1
@@ -26,6 +27,7 @@ man/man1/rrdrestore.1
man/man1/rrdtool.1
man/man1/rrdtune.1
man/man1/rrdtutorial.1
+man/man1/rrdtutorial.es.1
man/man1/rrdupdate.1
share/doc/rrdtool/RRDp.txt
share/doc/rrdtool/RRDs.txt
@@ -49,6 +51,7 @@ share/doc/rrdtool/html/rrdresize.html
share/doc/rrdtool/html/rrdrestore.html
share/doc/rrdtool/html/rrdtool.html
share/doc/rrdtool/html/rrdtune.html
+share/doc/rrdtool/html/rrdtutorial.es.html
share/doc/rrdtool/html/rrdtutorial.html
share/doc/rrdtool/html/rrdupdate.html
share/doc/rrdtool/rpntutorial.pod
@@ -75,6 +78,8 @@ share/doc/rrdtool/rrdtool.pod
share/doc/rrdtool/rrdtool.txt
share/doc/rrdtool/rrdtune.pod
share/doc/rrdtool/rrdtune.txt
+share/doc/rrdtool/rrdtutorial.es.pod
+share/doc/rrdtool/rrdtutorial.es.txt
share/doc/rrdtool/rrdtutorial.pod
share/doc/rrdtool/rrdtutorial.txt
share/doc/rrdtool/rrdupdate.pod
@@ -82,21 +87,6 @@ share/doc/rrdtool/rrdupdate.txt
share/examples/rrdtool/bigtops.pl
share/examples/rrdtool/cgi-demo.cgi
share/examples/rrdtool/contrib/README
-share/examples/rrdtool/contrib/add_ds/README
-share/examples/rrdtool/contrib/add_ds/add_ds.pl
-share/examples/rrdtool/contrib/add_ds/batch.pl
-share/examples/rrdtool/contrib/killspike/README
-share/examples/rrdtool/contrib/killspike/killspike.pl
-share/examples/rrdtool/contrib/log2rrd/README
-share/examples/rrdtool/contrib/log2rrd/log2rrd.pl
-share/examples/rrdtool/contrib/rrd-file-icon/README
-share/examples/rrdtool/contrib/rrd-file-icon/rrd.png
-share/examples/rrdtool/contrib/rrdfetchnames/README
-share/examples/rrdtool/contrib/rrdfetchnames/rrdfetchnames.pl
-share/examples/rrdtool/contrib/rrdlastds/README
-share/examples/rrdtool/contrib/rrdlastds/rrdlastds.pl
-share/examples/rrdtool/contrib/rrdproc/README
-share/examples/rrdtool/contrib/rrdproc/rrdproc.c
share/examples/rrdtool/contrib/trytime/README
share/examples/rrdtool/contrib/trytime/trytime.c
share/examples/rrdtool/minmax.pl
@@ -105,13 +95,6 @@ share/examples/rrdtool/shared-demo.pl
share/examples/rrdtool/stripes.pl
%%SHARED%%
@dirrm share/examples/rrdtool/contrib/trytime
-@dirrm share/examples/rrdtool/contrib/rrdproc
-@dirrm share/examples/rrdtool/contrib/rrdlastds
-@dirrm share/examples/rrdtool/contrib/rrdfetchnames
-@dirrm share/examples/rrdtool/contrib/rrd-file-icon
-@dirrm share/examples/rrdtool/contrib/log2rrd
-@dirrm share/examples/rrdtool/contrib/killspike
-@dirrm share/examples/rrdtool/contrib/add_ds
@dirrm share/examples/rrdtool/contrib
@dirrm share/examples/rrdtool
@dirrm share/doc/rrdtool/html