3 files changed, 40 insertions, 23 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index f2f6887bf9b0..64674699a417 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rrdtool
-PORTVERSION=	1.4.7
-PORTREVISION=	2
+PORTVERSION=	1.4.8
 CATEGORIES=	databases graphics
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -12,11 +11,11 @@ COMMENT=	Round Robin Database Tools
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		cairo.2:${PORTSDIR}/graphics/cairo \
-		png15:${PORTSDIR}/graphics/png \
-		xml2:${PORTSDIR}/textproc/libxml2 \
-		pangocairo-1\.0.0:${PORTSDIR}/x11-toolkits/pango
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libcairo.so:${PORTSDIR}/graphics/cairo \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libxml2.so:${PORTSDIR}/textproc/libxml2 \
+		libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango
 
 CONFLICTS=	rrdtool-1.0* rrdtool-1.2*
 
@@ -42,7 +41,6 @@ PERL_MODULE_DESC=	Build PERL module
 PYTHON_MODULE_DESC=	Build PYTHON bindings
 RUBY_MODULE_DESC=	Build RUBY bindings
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON_MODULE}
@@ -92,19 +90,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
 ##LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS:=	${CFLAGS:N-ffast-math}
 
-MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
-		rrdbuild.1 rrdcached.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
-		rrdfetch.1 rrdfirst.1 rrdflushcached.1 rrdgraph.1 \
-		rrdgraph_data.1 rrdgraph_examples.1 rrdgraph_graph.1 \
-		rrdgraph_rpn.1 rrdinfo.1 rrdlast.1 rrdlastupdate.1 \
-		rrdresize.1 rrdrestore.1 rrdthreads.1 rrdtool.1 rrdtune.1 \
-		rrdtutorial.1 rrdupdate.1 rrdxport.1
-
-.if ${PORT_OPTIONS:MPERL_MODULE}
-MAN3=		RRDp.3 RRDs.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}
-.endif
-
 post-extract:
 	@${REINPLACE_CMD} -e 's/^POD3/#POD3/' ${WRKSRC}/doc/Makefile.in
 .if ! ${PORT_OPTIONS:MDOCS}
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 2669ac4afa9c..203777f0844f 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rrdtool-1.4.7.tar.gz) = 956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11
-SIZE (rrdtool-1.4.7.tar.gz) = 1349040
+SHA256 (rrdtool-1.4.8.tar.gz) = de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6
+SIZE (rrdtool-1.4.8.tar.gz) = 1379482
diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist
index 35297f1535af..ea628c84a43c 100644
--- a/databases/rrdtool/pkg-plist
+++ b/databases/rrdtool/pkg-plist
@@ -1,5 +1,7 @@
 bin/rrdcached
 bin/rrdcgi
+bin/rrdcreate
+bin/rrdinfo
 bin/rrdtool
 bin/rrdupdate
 include/rrd.h
@@ -14,6 +16,36 @@ lib/librrd_th.la
 lib/librrd_th.so
 lib/librrd_th.so.6
 libdata/pkgconfig/librrd.pc
+man/man1/bin_dec_hex.1.gz
+man/man1/cdeftutorial.1.gz
+man/man1/rpntutorial.1.gz
+man/man1/rrd-beginners.1.gz
+man/man1/rrdbuild.1.gz
+man/man1/rrdcached.1.gz
+man/man1/rrdcgi.1.gz
+man/man1/rrdcreate.1.gz
+man/man1/rrddump.1.gz
+man/man1/rrdfetch.1.gz
+man/man1/rrdfirst.1.gz
+man/man1/rrdflushcached.1.gz
+man/man1/rrdgraph.1.gz
+man/man1/rrdgraph_data.1.gz
+man/man1/rrdgraph_examples.1.gz
+man/man1/rrdgraph_graph.1.gz
+man/man1/rrdgraph_rpn.1.gz
+man/man1/rrdinfo.1.gz
+man/man1/rrdlast.1.gz
+man/man1/rrdlastupdate.1.gz
+man/man1/rrdresize.1.gz
+man/man1/rrdrestore.1.gz
+man/man1/rrdthreads.1.gz
+man/man1/rrdtool.1.gz
+man/man1/rrdtune.1.gz
+man/man1/rrdtutorial.1.gz
+man/man1/rrdupdate.1.gz
+man/man1/rrdxport.1.gz
+%%WITH_PERL%%%%PERL5_MAN3%%/RRDp.3.gz
+%%WITH_PERL%%%%PERL5_MAN3%%/RRDs.3.gz
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs