4 files changed, 33 insertions, 22 deletions

diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index 986e1b168a49..7c5adee41973 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rrdtool
-PORTVERSION=	1.0.41
+PORTVERSION=	1.0.45
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
@@ -26,16 +26,27 @@ CFLAGS:=	${CFLAGS:N-ffast-math}
 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
+		cdeftutorial.1 rpntutorial.1 rrdinfo.1 rrdxport.1 rrd-beginners.1
 MAN3=		RRDp.3 RRDs.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
+.if defined(WITH_LATIN2)
+CONFIGURE_ARGS+=	--with-latin2
+.endif
+
+pre-extract:
+.if !defined(WITH_LATIN2)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "You can enable support for ISO-8859-2 fonts by defining WITH_LATIN2."
+	@${ECHO_MSG} ""
+.endif
+
 post-install:
 .if !defined(BATCH)
-	@${ECHO} ""
-	@${ECHO} "############################################################################"
-	@${ECHO} "# See ${PREFIX}/share/examples/rrdtool for some demonstration code        #"
-	@${ECHO} "############################################################################"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "############################################################################"
+	@${ECHO_MSG} "# See ${PREFIX}/share/examples/rrdtool for some demonstration code        #"
+	@${ECHO_MSG} "############################################################################"
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/rrdtool10/distinfo b/databases/rrdtool10/distinfo
index 712273cdf955..a87a26d821c2 100644
--- a/databases/rrdtool10/distinfo
+++ b/databases/rrdtool10/distinfo
@@ -1 +1 @@
-MD5 (rrdtool-1.0.41.tar.gz) = 3559dafca2a5cd7bb81b1d2b707615df
+MD5 (rrdtool-1.0.45.tar.gz) = 64086fc7f1ca28c069ee5104f85d7a8c
diff --git a/databases/rrdtool10/files/patch-ac b/databases/rrdtool10/files/patch-ac
index d786d539f5b2..2e8a0ecb18dc 100644
--- a/databases/rrdtool10/files/patch-ac
+++ b/databases/rrdtool10/files/patch-ac
@@ -1,26 +1,23 @@
---- Makefile.in.orig	Sun Apr 14 11:47:46 2002
-+++ Makefile.in	Wed May  1 16:04:06 2002
-@@ -392,12 +392,17 @@
- 
+--- Makefile.in.orig	Mon Oct 20 22:43:34 2003
++++ Makefile.in	Mon Oct 20 22:43:25 2003
+@@ -393,13 +393,13 @@
  # 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:
 -	$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
 -	$(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
 -	$(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
-+
-+
+-	test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+-	test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
 +install-data-local: site-perl-inst
-+#      ./config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
-+#      $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
-+#      $(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
-+
-+
-+
++#	$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
++#	$(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
++#	$(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
++#	test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
++#	test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
  
  perl_piped:: $(top_builddir)/perl-piped
  	test -d perl-piped \
diff --git a/databases/rrdtool10/pkg-plist b/databases/rrdtool10/pkg-plist
index a84a6d29e72e..26a3e7033d6c 100644
--- a/databases/rrdtool10/pkg-plist
+++ b/databases/rrdtool10/pkg-plist
@@ -33,6 +33,7 @@ share/doc/rrdtool/rrdcgi.pod
 share/doc/rrdtool/rrdtutorial.pod
 share/doc/rrdtool/rrdtutorial.es.pod
 share/doc/rrdtool/rrdxport.pod
+share/doc/rrdtool/rrd-beginners.pod
 share/doc/rrdtool/rrdtool.txt
 share/doc/rrdtool/rrdinfo.txt
 share/doc/rrdtool/rrdlast.txt
@@ -53,6 +54,7 @@ share/doc/rrdtool/rrdtutorial.es.txt
 share/doc/rrdtool/RRDs.txt
 share/doc/rrdtool/RRDp.txt
 share/doc/rrdtool/rrdxport.txt
+share/doc/rrdtool/rrd-beginners.txt
 share/doc/rrdtool/html/rrdtool.html
 share/doc/rrdtool/html/rrdinfo.html
 share/doc/rrdtool/html/rrdlast.html
@@ -73,6 +75,7 @@ share/doc/rrdtool/html/rrdtutorial.es.html
 share/doc/rrdtool/html/RRDs.html
 share/doc/rrdtool/html/RRDp.html
 share/doc/rrdtool/html/rrdxport.html
+share/doc/rrdtool/rrd-beginners.html
 %%SITE_PERL%%/RRDp.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm