1 files changed, 26 insertions, 13 deletions

diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index af90b8131666..d7c190516e21 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.54 2006/04/25 17:52:32 marcus Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.67 2006/10/12 19:04:47 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -15,18 +15,18 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marcus@FreeBSD.org
-COMMENT=	Audio player for the Gnome 2 desktop environment
+COMMENT=	Audio player for the GNOME 2 desktop environment
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
-		dbus-1.2:${PORTSDIR}/devel/dbus \
+		totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
 		soup-2.2.8:${PORTSDIR}/devel/libsoup \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
@@ -42,11 +42,12 @@ CONFIGURE_ENV=	LIBS="-lm" \
 
 GCONF_SCHEMAS=	rhythmbox.schemas
 
-OPTIONS=	IPOD "Enable iPod support" off \
-		DAAP "Enable iTunes music sharing" off \
+OPTIONS=	DAAP "Enable iTunes music sharing" off \
+		IPOD "Enable iPod support" on \
 		FAAD "Enable FAAD decoder support" off \
 		NOTIFY "Enable libnotify support" on \
-		VORBIS "Enable Ogg/Vorbis support" on
+		VORBIS "Enable Ogg/Vorbis support" on \
+		GDA "Enable GDA database storage" off
 
 .include <bsd.port.pre.mk>
 
@@ -54,10 +55,6 @@ OPTIONS=	IPOD "Enable iPod support" off \
 BROKEN=	Does not build on 4.X
 .endif
 
-.ifdef (WITH_IPOD)
-CONFIGURE_ARGS+=	--enable-ipod
-.endif
-
 .if !defined(WITHOUT_VORBIS)
 USE_GSTREAMER+=		vorbis
 .else
@@ -68,6 +65,13 @@ CONFIGURE_ARGS+=	--disable-vorbis --disable-vorbistest
 USE_GSTREAMER+=		faad
 .endif
 
+.if defined(WITH_GDA)
+USE_GNOME+=	libgda2
+CONFIGURE_ARGS+=--with-database=libgda
+.else
+CONFIGURE_ARGS+=--with-database=tree
+.endif
+
 .if defined(WITH_DAAP)
 CONFIGURE_ARGS+=	--enable-daap  --with-mdns=avahi
 LIB_DEPENDS+=		 avahi-client:${PORTSDIR}/net/avahi
@@ -95,4 +99,13 @@ CONFIGURE_ARGS+=--disable-python
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
+.if !defined(WITHOUT_IPOD)
+LIB_DEPENDS+=	gpod.400:${PORTSDIR}/audio/libgpod
+CONFIGURE_ARGS+=--with-ipod
+PLIST_SUB+=	IPOD=""
+.else
+CONFIGURE_ARGS+=--without-ipod
+PLIST_SUB+=	IPOD="@comment "
+.endif
+
 .include <bsd.port.post.mk>