Upgrade to version 1.2.4.

24 files changed, 252 insertions, 396 deletions

diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index 501cf6d0ebba..c05ed67e85a5 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -6,51 +6,40 @@
 #
 
 PORTNAME=	rrdtool
-PORTVERSION=	1.0.49
+PORTVERSION=	1.2.4
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Round Robin Database Tools
 
-USE_PERL5=	yes
-MAKE_ENV=	PERL=${PERL}
+LIB_DEPENDS=	cgi.1:${PORTSDIR}/devel/cgilib \
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
+		png.5:${PORTSDIR}/graphics/png
 
+USE_PERL5=	yes
 USE_LIBTOOL_VER=15
+USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-shared --enable-local-zlib \
-		--program-transform-name=''
-CONFIGURE_ENV=	PERL=${PERL}
+CONFIGURE_ARGS=	--enable-perl-site-install
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -fPIC
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype2
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS:=	${CFLAGS:N-ffast-math}
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+INSTALLS_SHLIB=	yes
 
-MAN1=		RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
-		rrdfetch.1 rrdgraph.1 rrdlast.1 rrdresize.1 rrdrestore.1 \
-		rrdtool.1 rrdtune.1 rrdtutorial.1 rrdtutorial.es.1 rrdupdate.1 \
-		cdeftutorial.1 rpntutorial.1 rrdinfo.1 rrdxport.1 rrd-beginners.1
+MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
+		rrdbuild.1 rrdcgi.1 rrdcreate.1 rrddump.1 rrdfetch.1 rrdfirst.1 \
+		rrdgraph.1 rrdgraph_data.1 rrdgraph_examples.1 rrdgraph_graph.1 \
+		rrdgraph_rpn.1 rrdinfo.1 rrdlast.1 rrdresize.1 rrdrestore.1 \
+		rrdthreads.1 rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 \
+		rrdxport.1
 MAN3=		RRDp.3 RRDs.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-OPTIONS=	"ISO-8859-2 fonts support" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_LATIN2)
-CONFIGURE_ARGS+=--enable-latin2
-.endif
-
-.if ${ARCH} == "amd64"
-CONFIGURE_ARGS+=--with-pic
-.endif
-
-.if ${ARCH} == "ia64"
-BROKEN=		"Does not build on ia64"
-.endif
-
 post-extract:
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's/install-idocDATA install-ihtmlDATA//g' \
@@ -65,4 +54,4 @@ post-install:
 	@${ECHO_MSG} "############################################################################"
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/rrdtool/distinfo b/net/rrdtool/distinfo
index 5f69d61f8f67..173dfc9bf721 100644
--- a/net/rrdtool/distinfo
+++ b/net/rrdtool/distinfo
@@ -1,2 +1,2 @@
-MD5 (rrdtool-1.0.49.tar.gz) = fbe492dbf3d68abb1d86c2322e7ed44a
-SIZE (rrdtool-1.0.49.tar.gz) = 1466897
+MD5 (rrdtool-1.2.4.tar.gz) = 27da66448d7f8c0cb948fd945916a9cb
+SIZE (rrdtool-1.2.4.tar.gz) = 869156
diff --git a/net/rrdtool/files/patch-aa b/net/rrdtool/files/patch-aa
deleted file mode 100644
index 8436cf0346fb..000000000000
--- a/net/rrdtool/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- perl-shared/Makefile.PL.in.orig	Thu Apr  8 01:04:53 2004
-+++ perl-shared/Makefile.PL.in	Sun Aug  8 18:11:16 2004
-@@ -10,7 +10,7 @@
-     'NAME'         => 'RRDs',
-     'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
-     'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
--    'INC'          => '-I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
-+    'INC'          => '-I../ -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
-     'CCFLAGS'      => "$Config{ccflags} -DHAVE_CONFIG_H",
-     # where to look for the necessary libraries 
-     # Perl will figure out which one is valid
diff --git a/net/rrdtool/files/patch-ac b/net/rrdtool/files/patch-ac
deleted file mode 100644
index 5d34a7b5d9e1..000000000000
--- a/net/rrdtool/files/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.in.orig	Sun Aug  8 12:40:15 2004
-+++ Makefile.in	Wed Mar 16 21:26:50 2005
-@@ -633,21 +633,7 @@
- # lets schedule the perl stuff for installation
- # the special call to install-sh is because the -d switch is not portable
- # mac os X has its perl module in bundles so it seems
--install-data-local:
--	@if test "x$(PERL)" != "xno"; then \
--	  echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
--	  $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
--	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \
--	  $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \
--	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \
--	  $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \
--	  echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
--	  $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
--	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \
--	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \
--	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \
--	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \
--	fi
-+install-data-local: site-perl-inst
- 
- # rules for building the perl module
- 
-@@ -727,8 +713,8 @@
- site-perl-inst: site-perl-install
- 
- site-perl-install: all perl-piped/Makefile perl-shared/Makefile
--	cd perl-piped && $(MAKE) install
--	cd perl-shared && $(MAKE) install
-+	cd perl-piped && $(MAKE) pure_install
-+	cd perl-shared && $(MAKE) pure_install
- 
- site-tcl-install: all
- 	cd tcl && $(MAKE) tcl-install
diff --git a/net/rrdtool/files/patch-ae b/net/rrdtool/files/patch-ae
deleted file mode 100644
index b1465ab16354..000000000000
--- a/net/rrdtool/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/Makefile.in.orig	Sun Apr 14 11:51:02 2002
-+++ doc/Makefile.in	Wed May  1 16:05:42 2002
-@@ -110,9 +110,9 @@
- EXTRA_DIST = $(POD) $(HTML) $(TXT)
- 
- # some install rules
--idocdir = $(prefix)/doc
-+idocdir = $(prefix)/share/doc/rrdtool/
- idoc_DATA = $(POD) $(TXT)
--ihtmldir = $(prefix)/html
-+ihtmldir = $(prefix)/share/doc/rrdtool/html
- ihtml_DATA = $(HTML)
- imandir = $(prefix)/man/man1
- iman_DATA = $(MAN)
diff --git a/net/rrdtool/files/patch-af b/net/rrdtool/files/patch-af
deleted file mode 100644
index ab74382bf032..000000000000
--- a/net/rrdtool/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in.orig	Sun Apr 14 11:51:04 2002
-+++ examples/Makefile.in	Wed May  1 16:07:13 2002
-@@ -93,7 +93,7 @@
- 
- EXTRA_DIST = cgi-demo.cgi.in    piped-demo.pl.in   shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
- 
--examplesdir = $(prefix)/examples
-+examplesdir = $(prefix)/share/examples/rrdtool
- examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../config/config.h
diff --git a/net/rrdtool/files/patch-ag b/net/rrdtool/files/patch-ag
deleted file mode 100644
index 205d5ac7228c..000000000000
--- a/net/rrdtool/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig Sun Apr 14 11:51:05 2002
-+++ contrib/Makefile.in	Wed May  1 16:08:10 2002
-@@ -88,7 +88,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- SUBDIRS = trytime
--contribdir = $(prefix)/contrib
-+contribdir = $(prefix)/share/examples/rrdtool
- contrib_DATA = README
- 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/files/patch-ak b/net/rrdtool/files/patch-ak
deleted file mode 100644
index 982c95f4fd38..000000000000
--- a/net/rrdtool/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/trytime/Makefile.in.orig	Mon Apr  5 02:03:53 2004
-+++ contrib/trytime/Makefile.in	Tue Apr  6 11:17:12 2004
-@@ -162,7 +162,7 @@
- target_vendor = @target_vendor@
- AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
- EXTRA_DIST = trytime.c
--contribdir = $(prefix)/contrib/trytime
-+contribdir = $(prefix)/share/examples/rrdtool/trytime
- contrib_DATA = README trytime.c
- bin_PROGRAMS = trytime
- trytime_SOURCES = trytime.c
diff --git a/net/rrdtool/files/patch-doc-Makefile.in b/net/rrdtool/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..aa913c5ed40f
--- /dev/null
+++ b/net/rrdtool/files/patch-doc-Makefile.in
@@ -0,0 +1,14 @@
+--- doc/Makefile.in.orig	Sun May  8 03:59:02 2005
++++ doc/Makefile.in	Mon May  9 00:02:25 2005
+@@ -215,9 +215,9 @@
+ 
+ # some install rules if the install pat
+ DOCPREFIX := $(shell echo "@prefix@" | grep rrd >/dev/null && echo "rrdtool-@VERSION@/")
+-idocdir = $(prefix)/shared/doc/$(DOCPREFIX)txt
++idocdir = $(datadir)/doc/rrdtool/txt
+ idoc_DATA = $(POD) $(TXT)
+-ihtmldir = $(prefix)/shared/doc/$(DOCPREFIX)html
++ihtmldir = $(datadir)/doc/rrdtool/html
+ ihtml_DATA = $(HTML)
+ imandir = $(mandir)/man1
+ iman_DATA = $(MAN)
diff --git a/net/rrdtool/files/patch-examples-Makefile.in b/net/rrdtool/files/patch-examples-Makefile.in
new file mode 100644
index 000000000000..9f1a9e49241c
--- /dev/null
+++ b/net/rrdtool/files/patch-examples-Makefile.in
@@ -0,0 +1,11 @@
+--- examples/Makefile.in.orig	Sun May  8 03:59:03 2005
++++ examples/Makefile.in	Mon May  9 00:05:04 2005
+@@ -194,7 +194,7 @@
+ EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in \
+ 	stripes.pl.in bigtops.pl.in minmax.pl.in 4charts.pl.in
+ 
+-examplesdir = $(prefix)/examples
++examplesdir = $(datadir)/examples/rrdtool
+ examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
+ 	stripes.pl bigtops.pl minmax.pl 4charts.pl
+ 
diff --git a/net/rrdtool/files/patch-rrd_graph.c b/net/rrdtool/files/patch-rrd_graph.c
deleted file mode 100644
index b8fcdefb8c77..000000000000
--- a/net/rrdtool/files/patch-rrd_graph.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/rrd_graph.c.orig	Sun Aug  8 14:58:13 2004
-+++ src/rrd_graph.c	Sun Aug  8 18:19:06 2004
-@@ -2966,7 +2966,7 @@
- 
- 	
- 	opt = getopt_long(argc, argv, 
--			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMX:L:S:RB:O:U:",
-+			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMNX:L:S:RB:O:U:",
- 			  long_options, &option_index);
- 
- 	if (opt == EOF)
diff --git a/net/rrdtool/pkg-plist b/net/rrdtool/pkg-plist
index 8dff2081e87d..36b21608a366 100644
--- a/net/rrdtool/pkg-plist
+++ b/net/rrdtool/pkg-plist
@@ -1,81 +1,98 @@
 bin/rrdtool
 bin/rrdcgi
-bin/trytime
 bin/rrdupdate
 lib/librrd.a
-lib/librrd.so.0
 lib/librrd.so
+lib/librrd.so.2
+lib/librrd_th.a
+lib/librrd_th.so
+lib/librrd_th.so.2
 include/rrd.h
+%%EXAMPLESDIR%%/4charts.pl
+%%EXAMPLESDIR%%/bigtops.pl
 %%EXAMPLESDIR%%/cgi-demo.cgi
+%%EXAMPLESDIR%%/minmax.pl
 %%EXAMPLESDIR%%/piped-demo.pl
 %%EXAMPLESDIR%%/shared-demo.pl
 %%EXAMPLESDIR%%/stripes.pl
-%%EXAMPLESDIR%%/bigtops.pl
-%%EXAMPLESDIR%%/minmax.pl
-%%EXAMPLESDIR%%/trytime/trytime.c
-%%EXAMPLESDIR%%/trytime/README
-%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/rrdtool.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdinfo.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdlast.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdcreate.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdupdate.pod
-%%PORTDOCS%%%%DOCSDIR%%/cdeftutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/rpntutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdgraph.pod
-%%PORTDOCS%%%%DOCSDIR%%/bin_dec_hex.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdfetch.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdrestore.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrddump.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtune.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdresize.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdcgi.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.es.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdxport.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrd-beginners.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtool.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdinfo.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdlast.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdcreate.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdupdate.txt
-%%PORTDOCS%%%%DOCSDIR%%/cdeftutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/rpntutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdgraph.txt
-%%PORTDOCS%%%%DOCSDIR%%/bin_dec_hex.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdfetch.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdrestore.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrddump.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdtune.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdresize.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdcgi.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.es.txt
-%%PORTDOCS%%%%DOCSDIR%%/RRDs.txt
-%%PORTDOCS%%%%DOCSDIR%%/RRDp.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdxport.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrd-beginners.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdinfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdcreate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cdeftutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rpntutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdbuild.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdcreate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrddump.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdfetch.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdfirst.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_data.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_examples.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_graph.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_rpn.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrddump.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdthreads.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdtune.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.es.html
-%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdxport.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html
+%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.txt
+%%DATADIR%%/fonts/DejaVuSansMono-Roman.ttf
 %%SITE_PERL%%/RRDp.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
@@ -83,9 +100,11 @@ include/rrd.h
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
-@dirrm %%EXAMPLESDIR%%/trytime
 @dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
diff --git a/net/rrdtool10/Makefile b/net/rrdtool10/Makefile
index 501cf6d0ebba..c05ed67e85a5 100644
--- a/net/rrdtool10/Makefile
+++ b/net/rrdtool10/Makefile
@@ -6,51 +6,40 @@
 #
 
 PORTNAME=	rrdtool
-PORTVERSION=	1.0.49
+PORTVERSION=	1.2.4
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Round Robin Database Tools
 
-USE_PERL5=	yes
-MAKE_ENV=	PERL=${PERL}
+LIB_DEPENDS=	cgi.1:${PORTSDIR}/devel/cgilib \
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
+		png.5:${PORTSDIR}/graphics/png
 
+USE_PERL5=	yes
 USE_LIBTOOL_VER=15
+USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-shared --enable-local-zlib \
-		--program-transform-name=''
-CONFIGURE_ENV=	PERL=${PERL}
+CONFIGURE_ARGS=	--enable-perl-site-install
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -fPIC
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype2
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS:=	${CFLAGS:N-ffast-math}
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+INSTALLS_SHLIB=	yes
 
-MAN1=		RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
-		rrdfetch.1 rrdgraph.1 rrdlast.1 rrdresize.1 rrdrestore.1 \
-		rrdtool.1 rrdtune.1 rrdtutorial.1 rrdtutorial.es.1 rrdupdate.1 \
-		cdeftutorial.1 rpntutorial.1 rrdinfo.1 rrdxport.1 rrd-beginners.1
+MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
+		rrdbuild.1 rrdcgi.1 rrdcreate.1 rrddump.1 rrdfetch.1 rrdfirst.1 \
+		rrdgraph.1 rrdgraph_data.1 rrdgraph_examples.1 rrdgraph_graph.1 \
+		rrdgraph_rpn.1 rrdinfo.1 rrdlast.1 rrdresize.1 rrdrestore.1 \
+		rrdthreads.1 rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 \
+		rrdxport.1
 MAN3=		RRDp.3 RRDs.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-OPTIONS=	"ISO-8859-2 fonts support" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_LATIN2)
-CONFIGURE_ARGS+=--enable-latin2
-.endif
-
-.if ${ARCH} == "amd64"
-CONFIGURE_ARGS+=--with-pic
-.endif
-
-.if ${ARCH} == "ia64"
-BROKEN=		"Does not build on ia64"
-.endif
-
 post-extract:
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's/install-idocDATA install-ihtmlDATA//g' \
@@ -65,4 +54,4 @@ post-install:
 	@${ECHO_MSG} "############################################################################"
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/rrdtool10/distinfo b/net/rrdtool10/distinfo
index 5f69d61f8f67..173dfc9bf721 100644
--- a/net/rrdtool10/distinfo
+++ b/net/rrdtool10/distinfo
@@ -1,2 +1,2 @@
-MD5 (rrdtool-1.0.49.tar.gz) = fbe492dbf3d68abb1d86c2322e7ed44a
-SIZE (rrdtool-1.0.49.tar.gz) = 1466897
+MD5 (rrdtool-1.2.4.tar.gz) = 27da66448d7f8c0cb948fd945916a9cb
+SIZE (rrdtool-1.2.4.tar.gz) = 869156
diff --git a/net/rrdtool10/files/patch-aa b/net/rrdtool10/files/patch-aa
deleted file mode 100644
index 8436cf0346fb..000000000000
--- a/net/rrdtool10/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- perl-shared/Makefile.PL.in.orig	Thu Apr  8 01:04:53 2004
-+++ perl-shared/Makefile.PL.in	Sun Aug  8 18:11:16 2004
-@@ -10,7 +10,7 @@
-     'NAME'         => 'RRDs',
-     'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
-     'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
--    'INC'          => '-I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
-+    'INC'          => '-I../ -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
-     'CCFLAGS'      => "$Config{ccflags} -DHAVE_CONFIG_H",
-     # where to look for the necessary libraries 
-     # Perl will figure out which one is valid
diff --git a/net/rrdtool10/files/patch-ac b/net/rrdtool10/files/patch-ac
deleted file mode 100644
index 5d34a7b5d9e1..000000000000
--- a/net/rrdtool10/files/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.in.orig	Sun Aug  8 12:40:15 2004
-+++ Makefile.in	Wed Mar 16 21:26:50 2005
-@@ -633,21 +633,7 @@
- # lets schedule the perl stuff for installation
- # the special call to install-sh is because the -d switch is not portable
- # mac os X has its perl module in bundles so it seems
--install-data-local:
--	@if test "x$(PERL)" != "xno"; then \
--	  echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
--	  $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
--	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \
--	  $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \
--	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \
--	  $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \
--	  echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
--	  $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
--	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \
--	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \
--	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \
--	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \
--	fi
-+install-data-local: site-perl-inst
- 
- # rules for building the perl module
- 
-@@ -727,8 +713,8 @@
- site-perl-inst: site-perl-install
- 
- site-perl-install: all perl-piped/Makefile perl-shared/Makefile
--	cd perl-piped && $(MAKE) install
--	cd perl-shared && $(MAKE) install
-+	cd perl-piped && $(MAKE) pure_install
-+	cd perl-shared && $(MAKE) pure_install
- 
- site-tcl-install: all
- 	cd tcl && $(MAKE) tcl-install
diff --git a/net/rrdtool10/files/patch-ae b/net/rrdtool10/files/patch-ae
deleted file mode 100644
index b1465ab16354..000000000000
--- a/net/rrdtool10/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/Makefile.in.orig	Sun Apr 14 11:51:02 2002
-+++ doc/Makefile.in	Wed May  1 16:05:42 2002
-@@ -110,9 +110,9 @@
- EXTRA_DIST = $(POD) $(HTML) $(TXT)
- 
- # some install rules
--idocdir = $(prefix)/doc
-+idocdir = $(prefix)/share/doc/rrdtool/
- idoc_DATA = $(POD) $(TXT)
--ihtmldir = $(prefix)/html
-+ihtmldir = $(prefix)/share/doc/rrdtool/html
- ihtml_DATA = $(HTML)
- imandir = $(prefix)/man/man1
- iman_DATA = $(MAN)
diff --git a/net/rrdtool10/files/patch-af b/net/rrdtool10/files/patch-af
deleted file mode 100644
index ab74382bf032..000000000000
--- a/net/rrdtool10/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in.orig	Sun Apr 14 11:51:04 2002
-+++ examples/Makefile.in	Wed May  1 16:07:13 2002
-@@ -93,7 +93,7 @@
- 
- EXTRA_DIST = cgi-demo.cgi.in    piped-demo.pl.in   shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
- 
--examplesdir = $(prefix)/examples
-+examplesdir = $(prefix)/share/examples/rrdtool
- examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../config/config.h
diff --git a/net/rrdtool10/files/patch-ag b/net/rrdtool10/files/patch-ag
deleted file mode 100644
index 205d5ac7228c..000000000000
--- a/net/rrdtool10/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig Sun Apr 14 11:51:05 2002
-+++ contrib/Makefile.in	Wed May  1 16:08:10 2002
-@@ -88,7 +88,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- SUBDIRS = trytime
--contribdir = $(prefix)/contrib
-+contribdir = $(prefix)/share/examples/rrdtool
- contrib_DATA = README
- 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/rrdtool10/files/patch-ak b/net/rrdtool10/files/patch-ak
deleted file mode 100644
index 982c95f4fd38..000000000000
--- a/net/rrdtool10/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/trytime/Makefile.in.orig	Mon Apr  5 02:03:53 2004
-+++ contrib/trytime/Makefile.in	Tue Apr  6 11:17:12 2004
-@@ -162,7 +162,7 @@
- target_vendor = @target_vendor@
- AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
- EXTRA_DIST = trytime.c
--contribdir = $(prefix)/contrib/trytime
-+contribdir = $(prefix)/share/examples/rrdtool/trytime
- contrib_DATA = README trytime.c
- bin_PROGRAMS = trytime
- trytime_SOURCES = trytime.c
diff --git a/net/rrdtool10/files/patch-doc-Makefile.in b/net/rrdtool10/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..aa913c5ed40f
--- /dev/null
+++ b/net/rrdtool10/files/patch-doc-Makefile.in
@@ -0,0 +1,14 @@
+--- doc/Makefile.in.orig	Sun May  8 03:59:02 2005
++++ doc/Makefile.in	Mon May  9 00:02:25 2005
+@@ -215,9 +215,9 @@
+ 
+ # some install rules if the install pat
+ DOCPREFIX := $(shell echo "@prefix@" | grep rrd >/dev/null && echo "rrdtool-@VERSION@/")
+-idocdir = $(prefix)/shared/doc/$(DOCPREFIX)txt
++idocdir = $(datadir)/doc/rrdtool/txt
+ idoc_DATA = $(POD) $(TXT)
+-ihtmldir = $(prefix)/shared/doc/$(DOCPREFIX)html
++ihtmldir = $(datadir)/doc/rrdtool/html
+ ihtml_DATA = $(HTML)
+ imandir = $(mandir)/man1
+ iman_DATA = $(MAN)
diff --git a/net/rrdtool10/files/patch-examples-Makefile.in b/net/rrdtool10/files/patch-examples-Makefile.in
new file mode 100644
index 000000000000..9f1a9e49241c
--- /dev/null
+++ b/net/rrdtool10/files/patch-examples-Makefile.in
@@ -0,0 +1,11 @@
+--- examples/Makefile.in.orig	Sun May  8 03:59:03 2005
++++ examples/Makefile.in	Mon May  9 00:05:04 2005
+@@ -194,7 +194,7 @@
+ EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in \
+ 	stripes.pl.in bigtops.pl.in minmax.pl.in 4charts.pl.in
+ 
+-examplesdir = $(prefix)/examples
++examplesdir = $(datadir)/examples/rrdtool
+ examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
+ 	stripes.pl bigtops.pl minmax.pl 4charts.pl
+ 
diff --git a/net/rrdtool10/files/patch-rrd_graph.c b/net/rrdtool10/files/patch-rrd_graph.c
deleted file mode 100644
index b8fcdefb8c77..000000000000
--- a/net/rrdtool10/files/patch-rrd_graph.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/rrd_graph.c.orig	Sun Aug  8 14:58:13 2004
-+++ src/rrd_graph.c	Sun Aug  8 18:19:06 2004
-@@ -2966,7 +2966,7 @@
- 
- 	
- 	opt = getopt_long(argc, argv, 
--			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMX:L:S:RB:O:U:",
-+			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMNX:L:S:RB:O:U:",
- 			  long_options, &option_index);
- 
- 	if (opt == EOF)
diff --git a/net/rrdtool10/pkg-plist b/net/rrdtool10/pkg-plist
index 8dff2081e87d..36b21608a366 100644
--- a/net/rrdtool10/pkg-plist
+++ b/net/rrdtool10/pkg-plist
@@ -1,81 +1,98 @@
 bin/rrdtool
 bin/rrdcgi
-bin/trytime
 bin/rrdupdate
 lib/librrd.a
-lib/librrd.so.0
 lib/librrd.so
+lib/librrd.so.2
+lib/librrd_th.a
+lib/librrd_th.so
+lib/librrd_th.so.2
 include/rrd.h
+%%EXAMPLESDIR%%/4charts.pl
+%%EXAMPLESDIR%%/bigtops.pl
 %%EXAMPLESDIR%%/cgi-demo.cgi
+%%EXAMPLESDIR%%/minmax.pl
 %%EXAMPLESDIR%%/piped-demo.pl
 %%EXAMPLESDIR%%/shared-demo.pl
 %%EXAMPLESDIR%%/stripes.pl
-%%EXAMPLESDIR%%/bigtops.pl
-%%EXAMPLESDIR%%/minmax.pl
-%%EXAMPLESDIR%%/trytime/trytime.c
-%%EXAMPLESDIR%%/trytime/README
-%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/rrdtool.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdinfo.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdlast.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdcreate.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdupdate.pod
-%%PORTDOCS%%%%DOCSDIR%%/cdeftutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/rpntutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdgraph.pod
-%%PORTDOCS%%%%DOCSDIR%%/bin_dec_hex.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdfetch.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdrestore.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrddump.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtune.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdresize.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdcgi.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.es.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdxport.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrd-beginners.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtool.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdinfo.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdlast.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdcreate.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdupdate.txt
-%%PORTDOCS%%%%DOCSDIR%%/cdeftutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/rpntutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdgraph.txt
-%%PORTDOCS%%%%DOCSDIR%%/bin_dec_hex.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdfetch.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdrestore.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrddump.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdtune.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdresize.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdcgi.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.es.txt
-%%PORTDOCS%%%%DOCSDIR%%/RRDs.txt
-%%PORTDOCS%%%%DOCSDIR%%/RRDp.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdxport.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrd-beginners.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdinfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdcreate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cdeftutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rpntutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdbuild.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdcreate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrddump.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdfetch.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdfirst.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_data.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_examples.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_graph.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_rpn.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrddump.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdthreads.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdtune.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.es.html
-%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdxport.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html
+%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.txt
+%%DATADIR%%/fonts/DejaVuSansMono-Roman.ttf
 %%SITE_PERL%%/RRDp.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
@@ -83,9 +100,11 @@ include/rrd.h
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
-@dirrm %%EXAMPLESDIR%%/trytime
 @dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs