From a800114d4bf931ecf09460703a1941f013a1a681 Mon Sep 17 00:00:00 2001 From: beech Date: Sat, 27 Dec 2008 01:43:12 +0000 Subject: - Depend on sqlite3, which is more likely to be already installed than sqlite2 - Fix a warning when no firefly_enable var is set in rc.conf PR: ports/129617 Submitted by: Ulrich Spoerlein Approved by: Mark Foster (maintainer) --- audio/firefly/Makefile | 5 +++-- audio/firefly/files/mt-daapd.in | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'audio') diff --git a/audio/firefly/Makefile b/audio/firefly/Makefile index d433707a7374..96f58e57b533 100644 --- a/audio/firefly/Makefile +++ b/audio/firefly/Makefile @@ -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/vorbis/codec.h:${PORTSDIR}/audio/libvorbis \ 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} ${PTHREAD_CFLAGS}" \ 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 diff --git a/audio/firefly/files/mt-daapd.in b/audio/firefly/files/mt-daapd.in index d11ec7d8e6dc..4d081ff7f12a 100644 --- a/audio/firefly/files/mt-daapd.in +++ b/audio/firefly/files/mt-daapd.in @@ -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" -- cgit