diff -ruN collectd5/Makefile collectd5.new/Makefile
--- collectd5/Makefile	2012-07-27 05:20:16.000000000 +0200
+++ collectd5.new/Makefile	2012-08-31 15:17:54.000000000 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	5.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -48,7 +48,9 @@
 		TOKYOTYRANT	"Input: Tokyotyrant database"			Off \
 		XMMS		"Input: XMMS" 					Off \
 		RRDTOOL		"Output: RRDTool"				On  \
-		RRDCACHED	"Output: RRDTool Cached (require RRDTOOL)"	On
+		RRDCACHED	"Output: RRDTool Cached (require RRDTOOL)"	On  \
+		VIRT		"Build with libvirt"				Off \
+		WRITE_HTTP	"Output: write_http"				Off
 
 MAN1=		collectd.1 collectd-nagios.1 collectdmon.1 collectdctl.1
 MAN5=		collectd.conf.5 collectd-email.5 collectd-exec.5 \
@@ -88,7 +90,6 @@
 		--disable-irq \
 		--disable-java \
 		--without-java \
-		--disable-libvirt \
 		--disable-madwifi \
 		--disable-match_empty_counter \
 		--disable-match_hashed \
@@ -126,7 +127,6 @@
 		--disable-vmem \
 		--disable-vserver \
 		--disable-wireless \
-		--disable-write_http \
 		--disable-zfs_arc \
 		--without-perl-bindings \
 		--without-librabbitmq \
@@ -384,6 +384,23 @@
 PLIST_SUB+=	TOKYOTYRANT="@comment "
 .endif
 
+.if defined(WITH_VIRT)
+CONFIGURE_ARGS+=--enable-libvirt
+LIB_DEPENDS+=	virt.9:${PORTSDIR}/devel/libvirt
+PLIST_SUB+=	VIRT=""
+.else
+CONFIGURE_ARGS+=--disable-libvirt
+PLIST_SUB+=	VIRT="@comment "
+.endif
+
+.if defined(WITH_WRITE_HTTP)
+CONFIGURE_ARGS+=--enable-write_http
+PLIST_SUB+=	WRITE_HTTP=""
+.else
+CONFIGURE_ARGS+=--disable-write_http
+PLIST_SUB+=	WRITE_HTTP="@comment "
+.endif
+
 .if defined(WITH_XMMS)
 LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 CONFIGURE_ARGS+=--enable-xmms
diff -ruN collectd5/pkg-plist collectd5.new/pkg-plist
--- collectd5/pkg-plist	2012-04-13 05:20:13.000000000 +0200
+++ collectd5.new/pkg-plist	2012-08-31 15:17:59.000000000 +0200
@@ -105,12 +105,16 @@
 lib/collectd/uptime.so
 lib/collectd/uuid.la
 lib/collectd/uuid.so
+%%VIRT%%lib/collectd/libvirt.la
+%%VIRT%%lib/collectd/libvirt.so
 lib/collectd/write_graphite.so
 lib/collectd/write_graphite.la
 lib/libcollectdclient.la
 lib/libcollectdclient.so
 lib/libcollectdclient.so.0
 libdata/pkgconfig/libcollectdclient.pc
+%%WRITE_HTTP%%lib/collectd/write_http.la
+%%WRITE_HTTP%%lib/collectd/write_http.so
 %%XMMS%%lib/collectd/xmms.la
 %%XMMS%%lib/collectd/xmms.so
 %%DATADIR%%/postgresql_default.conf