[Midnightbsd-cvs] mports: audio/rhythmbox: Update for newer gnome + lib versions

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update for newer gnome + lib versions

Modified Files:
--------------
    mports/audio/rhythmbox:
        Makefile (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/audio/rhythmbox/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/rhythmbox/pkg-plist -L audio/rhythmbox/pkg-plist -u -r1.1 -r1.2
--- audio/rhythmbox/pkg-plist
+++ audio/rhythmbox/pkg-plist
@@ -206,7 +206,7 @@
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/gnome/applications/rhythmbox.desktop
+share/applications/rhythmbox.desktop
 share/gnome/help/rhythmbox/C/fdl-appendix.xml
 share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png
 share/gnome/help/rhythmbox/C/figures/rb-notification-area-menu.png
@@ -307,35 +307,35 @@
 share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
 share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
 share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
-share/gnome/omf/rhythmbox/rhythmbox-C.omf
-share/gnome/omf/rhythmbox/rhythmbox-el.omf
-share/gnome/omf/rhythmbox/rhythmbox-es.omf
-share/gnome/omf/rhythmbox/rhythmbox-fr.omf
-share/gnome/omf/rhythmbox/rhythmbox-ru.omf
-share/gnome/omf/rhythmbox/rhythmbox-sv.omf
-share/gnome/omf/rhythmbox/rhythmbox-zh_CN.omf
-share/gnome/rhythmbox/art/about-logo.png
-share/gnome/rhythmbox/art/media-eject.png
-share/gnome/rhythmbox/art/rhythmbox-no-star.png
-share/gnome/rhythmbox/art/rhythmbox-podcast.png
-share/gnome/rhythmbox/art/rhythmbox-set-star.png
-share/gnome/rhythmbox/art/rhythmbox-tray-icon.png
-share/gnome/rhythmbox/art/rhythmbox-unset-star.png
-share/gnome/rhythmbox/glade/create-playlist.glade
-share/gnome/rhythmbox/glade/druid.glade
-share/gnome/rhythmbox/glade/general-prefs.glade
-share/gnome/rhythmbox/glade/library-prefs.glade
-share/gnome/rhythmbox/glade/playlist-save.glade
-share/gnome/rhythmbox/glade/plugins.glade
-share/gnome/rhythmbox/glade/podcast-feed-properties.glade
-share/gnome/rhythmbox/glade/podcast-prefs.glade
-share/gnome/rhythmbox/glade/podcast-properties.glade
-share/gnome/rhythmbox/glade/song-info-multiple.glade
-share/gnome/rhythmbox/glade/song-info.glade
-share/gnome/rhythmbox/glade/uri-new.glade
-share/gnome/rhythmbox/glade/uri.glade
-share/gnome/rhythmbox/playlists.xml
-share/gnome/rhythmbox/rhythmbox-ui.xml
+share/omf/rhythmbox/rhythmbox-C.omf
+share/omf/rhythmbox/rhythmbox-el.omf
+share/omf/rhythmbox/rhythmbox-es.omf
+share/omf/rhythmbox/rhythmbox-fr.omf
+share/omf/rhythmbox/rhythmbox-ru.omf
+share/omf/rhythmbox/rhythmbox-sv.omf
+share/omf/rhythmbox/rhythmbox-zh_CN.omf
+share/rhythmbox/art/about-logo.png
+share/rhythmbox/art/media-eject.png
+share/rhythmbox/art/rhythmbox-no-star.png
+share/rhythmbox/art/rhythmbox-podcast.png
+share/rhythmbox/art/rhythmbox-set-star.png
+share/rhythmbox/art/rhythmbox-tray-icon.png
+share/rhythmbox/art/rhythmbox-unset-star.png
+share/rhythmbox/glade/create-playlist.glade
+share/rhythmbox/glade/druid.glade
+share/rhythmbox/glade/general-prefs.glade
+share/rhythmbox/glade/library-prefs.glade
+share/rhythmbox/glade/playlist-save.glade
+share/rhythmbox/glade/plugins.glade
+share/rhythmbox/glade/podcast-feed-properties.glade
+share/rhythmbox/glade/podcast-prefs.glade
+share/rhythmbox/glade/podcast-properties.glade
+share/rhythmbox/glade/song-info-multiple.glade
+share/rhythmbox/glade/song-info.glade
+share/rhythmbox/glade/uri-new.glade
+share/rhythmbox/glade/uri.glade
+share/rhythmbox/playlists.xml
+share/rhythmbox/rhythmbox-ui.xml
 share/icons/hicolor/48x48/apps/rhythmbox.png
 share/locale/am/LC_MESSAGES/rhythmbox.mo
 share/locale/ar/LC_MESSAGES/rhythmbox.mo
@@ -394,10 +394,10 @@
 share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
- at dirrm share/gnome/rhythmbox/glade
- at dirrm share/gnome/rhythmbox/art
- at dirrm share/gnome/rhythmbox
- at dirrm share/gnome/omf/rhythmbox
+ at dirrm share/rhythmbox/glade
+ at dirrm share/rhythmbox/art
+ at dirrm share/rhythmbox
+ at dirrm share/omf/rhythmbox
 @dirrm share/gnome/help/rhythmbox/zh_CN/figures
 @dirrm share/gnome/help/rhythmbox/zh_CN
 @dirrm share/gnome/help/rhythmbox/sv/figures
@@ -439,3 +439,4 @@
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+ at dirrmtry share/applications
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/audio/rhythmbox/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/rhythmbox/Makefile -L audio/rhythmbox/Makefile -u -r1.1 -r1.2
--- audio/rhythmbox/Makefile
+++ audio/rhythmbox/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.10.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
@@ -20,7 +20,7 @@
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem \
+		totem-plparser.7:${PORTSDIR}/multimedia/totem \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
 		soup-2.2.8:${PORTSDIR}/devel/libsoup \
@@ -39,8 +39,8 @@
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	LIBS="-lm" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include"
 
 GCONF_SCHEMAS=	rhythmbox.schemas
 
@@ -82,12 +82,12 @@
 
 .if defined(WITH_DAAP)
 CONFIGURE_ARGS+=	--enable-daap  --with-mdns=avahi
-LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi \
+LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi-app \
     			gnome-keyring:${PORTSDIR}/security/gnome-keyring
 PLIST_SUB+=		DAAP=""
 .else
 .if exists(${LOCALBASE}/lib/libavahi-client.a)
-LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi
+LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi-app
 .endif
 CONFIGURE_ARGS+=	--disable-daap
 PLIST_SUB+=		DAAP="@comment "
@@ -112,7 +112,7 @@
 .endif
 
 .if !defined(WITHOUT_IPOD)
-LIB_DEPENDS+=	gpod.2:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS+=	gpod.3:${PORTSDIR}/audio/libgpod
 CONFIGURE_ARGS+=--with-ipod
 PLIST_SUB+=	IPOD=""
 .else