Index: Makefile
===================================================================
--- Makefile	(revision 362468)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rrdtool
 PORTVERSION=	1.4.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases graphics
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -12,11 +12,7 @@
 
 LICENSE=	GPLv2
 
-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
+LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
 
 CONFLICTS=	rrdtool10-* rrdtool12-*
 
@@ -33,8 +29,9 @@
 PORTEXAMPLES=	4charts.pl bigtops.pl cgi-demo.cgi minmax.pl perftest.pl \
 		piped-demo.pl shared-demo.pl stripes.pl
 
-OPTIONS_DEFINE=	DEJAVU JSON MMAP PERL_MODULE PYTHON_MODULE RUBY_MODULE EXAMPLES DOCS
-OPTIONS_DEFAULT=	MMAP PERL_MODULE
+OPTIONS_DEFINE=	CAIRO DEJAVU JSON MMAP PERL_MODULE PYTHON_MODULE RUBY_MODULE EXAMPLES DOCS
+OPTIONS_DEFAULT=	CAIRO MMAP PERL_MODULE
+CAIRO_DESC=		Enable the rrdtool graph command
 DEJAVU_DESC=		Use DejaVu fonts (requires X11)
 JSON_DESC=		Support of json export
 MMAP_DESC=		Use mmap in rrd_update
@@ -44,6 +41,18 @@
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MCAIRO}
+LIB_DEPENDS+=	libcairo.so:${PORTSDIR}/graphics/cairo \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango \
+		libpng15.so:${PORTSDIR}/graphics/png
+PLIST_SUB+=	WITH_CAIRO=""
+.else
+# The CGI filter links against rrd_graph.  Disable it
+CONFIGURE_ARGS+=	--disable-rrdcgi --disable-rrd_graph
+PLIST_SUB+=	WITH_CAIRO="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MPYTHON_MODULE}
 USE_PYTHON=	yes
 INSTALLS_EGGINFO=yes
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 362468)
+++ pkg-plist	(working copy)
@@ -1,5 +1,5 @@
 bin/rrdcached
-bin/rrdcgi
+%%WITH_CAIRO%%bin/rrdcgi
 bin/rrdcreate
 bin/rrdinfo
 bin/rrdtool