Index: Makefile
===================================================================
RCS file: /tank/ncvs/ports/audio/firefly/Makefile,v
retrieving revision 1.1
diff -u -p -u -r1.1 Makefile
--- Makefile	19 Oct 2008 15:59:15 -0000	1.1
+++ Makefile	13 Dec 2008 17:18:18 -0000
@@ -6,6 +6,7 @@
 
 PORTNAME=	firefly
 PORTVERSION=	1696
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://nightlies.fireflymediaserver.org/nightlies/svn-${PORTVERSION}/ \
 		http://www.magnesium.net/~mdf/distfiles/
@@ -19,7 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/vorb
 RUN_DEPENDS=	oggdec:${PORTSDIR}/audio/vorbis-tools \
 		flac:${PORTSDIR}/audio/flac
 LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
-		sqlite:${PORTSDIR}/databases/sqlite2 \
+		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		id3tag.0:${PORTSDIR}/audio/libid3tag
 
 CONFLICTS=	mt-daapd-0.2.*
@@ -30,7 +31,7 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHRE
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=		--prefix=${LOCALBASE} --with-id3tag=${PREFIX} --enable-sqlite --enable-oggvorbis --enable-flac
+CONFIGURE_ARGS=		--prefix=${LOCALBASE} --with-id3tag=${PREFIX} --enable-sqlite3 --enable-oggvorbis --enable-flac
 
 #USE_AUTOTOOLS=	autoheader:261 autoconf:261:env
 
Index: files/mt-daapd.in
===================================================================
RCS file: /tank/ncvs/ports/audio/firefly/files/mt-daapd.in,v
retrieving revision 1.1
diff -u -p -u -r1.1 mt-daapd.in
--- files/mt-daapd.in	19 Oct 2008 15:59:15 -0000	1.1
+++ files/mt-daapd.in	13 Dec 2008 17:18:18 -0000
@@ -6,8 +6,10 @@
 
 . %%RC_SUBR%%
 
+: ${firefly_enable=NO}
+
 name="firefly"
-rcvar="firefly_enable"
+rcvar="`set_rcvar`"
 
 command="%%PREFIX%%/sbin/mt-daapd"
 command_args="-c %%PREFIX%%/etc/mt-daapd.conf"