6 files changed, 162 insertions, 10 deletions

diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index f49dbe2a768d..9b99c7ab3b4a 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.3.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
@@ -43,7 +43,7 @@ OPTIONS=	IPOD "Enable iPod support" off \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=	"Does not build on 4.X"
+BROKEN=	Does not build on 4.X
 .endif
 
 .ifdef (WITH_IPOD)
diff --git a/audio/rhythmbox-devel/distinfo b/audio/rhythmbox-devel/distinfo
index d93be2f23c09..840e27898dcc 100644
--- a/audio/rhythmbox-devel/distinfo
+++ b/audio/rhythmbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.9.3.tar.bz2) = 3ad98939192d44e64982588b15827ffe
-SHA256 (gnome2/rhythmbox-0.9.3.tar.bz2) = fa8fda4f02391426ee3d854cebf11e6e000dc6f6b9fd96b15b5193cb53140a08
-SIZE (gnome2/rhythmbox-0.9.3.tar.bz2) = 2510119
+MD5 (gnome2/rhythmbox-0.9.3.1.tar.bz2) = 0b63402c35c10de5581d79f5157a0739
+SHA256 (gnome2/rhythmbox-0.9.3.1.tar.bz2) = 8f25b3beba0954a39a2eabe12216f732f7880d313dd213767d57838a6d581976
+SIZE (gnome2/rhythmbox-0.9.3.1.tar.bz2) = 2579756
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index f46f5fc49cbe..7157c7e4ceed 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -4,6 +4,81 @@ libdata/bonobo/servers/GNOME_Rhythmbox.server
 libdata/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server
 libdata/pkgconfig/rhythmbox.pc
 share/dbus-1/services/org.gnome.Rhythmbox.service
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/ch07.html
+%%DOCSDIR%%/ch08.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/rhythmbox-RBCellRendererPixbuf.html
+%%DOCSDIR%%/rhythmbox-RBSource.html
+%%DOCSDIR%%/rhythmbox-eel-gconf-extensions.html
+%%DOCSDIR%%/rhythmbox-rb-cell-renderer-rating.html
+%%DOCSDIR%%/rhythmbox-rb-debug.html
+%%DOCSDIR%%/rhythmbox-rb-dialog.html
+%%DOCSDIR%%/rhythmbox-rb-druid.html
+%%DOCSDIR%%/rhythmbox-rb-entry-view.html
+%%DOCSDIR%%/rhythmbox-rb-enums.html
+%%DOCSDIR%%/rhythmbox-rb-file-helpers.html
+%%DOCSDIR%%/rhythmbox-rb-glade-helpers.html
+%%DOCSDIR%%/rhythmbox-rb-header.html
+%%DOCSDIR%%/rhythmbox-rb-history.html
+%%DOCSDIR%%/rhythmbox-rb-iradio-source.html
+%%DOCSDIR%%/rhythmbox-rb-library-source.html
+%%DOCSDIR%%/rhythmbox-rb-load-failure-dialog.html
+%%DOCSDIR%%/rhythmbox-rb-metadata.html
+%%DOCSDIR%%/rhythmbox-rb-new-station-dialog.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-linear-loop.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-linear.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-random-by-age-and-rating.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-random-by-age.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-random-by-rating.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-random-equal-weights.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-random.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-shuffle.html
+%%DOCSDIR%%/rhythmbox-rb-play-order.html
+%%DOCSDIR%%/rhythmbox-rb-player.html
+%%DOCSDIR%%/rhythmbox-rb-playlist-manager.html
+%%DOCSDIR%%/rhythmbox-rb-playlist-source-recorder.html
+%%DOCSDIR%%/rhythmbox-rb-playlist-source.html
+%%DOCSDIR%%/rhythmbox-rb-preferences.html
+%%DOCSDIR%%/rhythmbox-rb-property-view.html
+%%DOCSDIR%%/rhythmbox-rb-query-creator.html
+%%DOCSDIR%%/rhythmbox-rb-rating-helper.html
+%%DOCSDIR%%/rhythmbox-rb-rating.html
+%%DOCSDIR%%/rhythmbox-rb-recorder.html
+%%DOCSDIR%%/rhythmbox-rb-search-entry.html
+%%DOCSDIR%%/rhythmbox-rb-shell-clipboard.html
+%%DOCSDIR%%/rhythmbox-rb-shell-player.html
+%%DOCSDIR%%/rhythmbox-rb-shell-preferences.html
+%%DOCSDIR%%/rhythmbox-rb-shell.html
+%%DOCSDIR%%/rhythmbox-rb-song-display-box.html
+%%DOCSDIR%%/rhythmbox-rb-song-info.html
+%%DOCSDIR%%/rhythmbox-rb-source-header.html
+%%DOCSDIR%%/rhythmbox-rb-sourcelist-model.html
+%%DOCSDIR%%/rhythmbox-rb-sourcelist.html
+%%DOCSDIR%%/rhythmbox-rb-station-properties-dialog.html
+%%DOCSDIR%%/rhythmbox-rb-statusbar.html
+%%DOCSDIR%%/rhythmbox-rb-stock-icons.html
+%%DOCSDIR%%/rhythmbox-rb-string-helpers.html
+%%DOCSDIR%%/rhythmbox-rb-tray-icon.html
+%%DOCSDIR%%/rhythmbox-rb-tree-dnd.html
+%%DOCSDIR%%/rhythmbox-rb-tree-model-sort.html
+%%DOCSDIR%%/rhythmbox-rb-util.html
+%%DOCSDIR%%/rhythmbox-rhythmdb-property-model.html
+%%DOCSDIR%%/rhythmbox-rhythmdb-query-model.html
+%%DOCSDIR%%/rhythmbox-rhythmdb-tree.html
+%%DOCSDIR%%/rhythmbox-rhythmdb.html
+%%DOCSDIR%%/rhythmbox.devhelp
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
 share/gnome/application-registry/rhythmbox.applications
 share/gnome/applications/rhythmbox.desktop
 share/gnome/help/rhythmbox/C/authors.xml
@@ -170,3 +245,4 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @dirrm share/gnome/help/rhythmbox/C/figures
 @dirrm share/gnome/help/rhythmbox/C
 @dirrm share/gnome/help/rhythmbox
+@dirrm %%DOCSDIR%%
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index f49dbe2a768d..9b99c7ab3b4a 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.3.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
@@ -43,7 +43,7 @@ OPTIONS=	IPOD "Enable iPod support" off \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=	"Does not build on 4.X"
+BROKEN=	Does not build on 4.X
 .endif
 
 .ifdef (WITH_IPOD)
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index d93be2f23c09..840e27898dcc 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.9.3.tar.bz2) = 3ad98939192d44e64982588b15827ffe
-SHA256 (gnome2/rhythmbox-0.9.3.tar.bz2) = fa8fda4f02391426ee3d854cebf11e6e000dc6f6b9fd96b15b5193cb53140a08
-SIZE (gnome2/rhythmbox-0.9.3.tar.bz2) = 2510119
+MD5 (gnome2/rhythmbox-0.9.3.1.tar.bz2) = 0b63402c35c10de5581d79f5157a0739
+SHA256 (gnome2/rhythmbox-0.9.3.1.tar.bz2) = 8f25b3beba0954a39a2eabe12216f732f7880d313dd213767d57838a6d581976
+SIZE (gnome2/rhythmbox-0.9.3.1.tar.bz2) = 2579756
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index f46f5fc49cbe..7157c7e4ceed 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -4,6 +4,81 @@ libdata/bonobo/servers/GNOME_Rhythmbox.server
 libdata/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server
 libdata/pkgconfig/rhythmbox.pc
 share/dbus-1/services/org.gnome.Rhythmbox.service
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/ch07.html
+%%DOCSDIR%%/ch08.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/rhythmbox-RBCellRendererPixbuf.html
+%%DOCSDIR%%/rhythmbox-RBSource.html
+%%DOCSDIR%%/rhythmbox-eel-gconf-extensions.html
+%%DOCSDIR%%/rhythmbox-rb-cell-renderer-rating.html
+%%DOCSDIR%%/rhythmbox-rb-debug.html
+%%DOCSDIR%%/rhythmbox-rb-dialog.html
+%%DOCSDIR%%/rhythmbox-rb-druid.html
+%%DOCSDIR%%/rhythmbox-rb-entry-view.html
+%%DOCSDIR%%/rhythmbox-rb-enums.html
+%%DOCSDIR%%/rhythmbox-rb-file-helpers.html
+%%DOCSDIR%%/rhythmbox-rb-glade-helpers.html
+%%DOCSDIR%%/rhythmbox-rb-header.html
+%%DOCSDIR%%/rhythmbox-rb-history.html
+%%DOCSDIR%%/rhythmbox-rb-iradio-source.html
+%%DOCSDIR%%/rhythmbox-rb-library-source.html
+%%DOCSDIR%%/rhythmbox-rb-load-failure-dialog.html
+%%DOCSDIR%%/rhythmbox-rb-metadata.html
+%%DOCSDIR%%/rhythmbox-rb-new-station-dialog.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-linear-loop.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-linear.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-random-by-age-and-rating.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-random-by-age.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-random-by-rating.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-random-equal-weights.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-random.html
+%%DOCSDIR%%/rhythmbox-rb-play-order-shuffle.html
+%%DOCSDIR%%/rhythmbox-rb-play-order.html
+%%DOCSDIR%%/rhythmbox-rb-player.html
+%%DOCSDIR%%/rhythmbox-rb-playlist-manager.html
+%%DOCSDIR%%/rhythmbox-rb-playlist-source-recorder.html
+%%DOCSDIR%%/rhythmbox-rb-playlist-source.html
+%%DOCSDIR%%/rhythmbox-rb-preferences.html
+%%DOCSDIR%%/rhythmbox-rb-property-view.html
+%%DOCSDIR%%/rhythmbox-rb-query-creator.html
+%%DOCSDIR%%/rhythmbox-rb-rating-helper.html
+%%DOCSDIR%%/rhythmbox-rb-rating.html
+%%DOCSDIR%%/rhythmbox-rb-recorder.html
+%%DOCSDIR%%/rhythmbox-rb-search-entry.html
+%%DOCSDIR%%/rhythmbox-rb-shell-clipboard.html
+%%DOCSDIR%%/rhythmbox-rb-shell-player.html
+%%DOCSDIR%%/rhythmbox-rb-shell-preferences.html
+%%DOCSDIR%%/rhythmbox-rb-shell.html
+%%DOCSDIR%%/rhythmbox-rb-song-display-box.html
+%%DOCSDIR%%/rhythmbox-rb-song-info.html
+%%DOCSDIR%%/rhythmbox-rb-source-header.html
+%%DOCSDIR%%/rhythmbox-rb-sourcelist-model.html
+%%DOCSDIR%%/rhythmbox-rb-sourcelist.html
+%%DOCSDIR%%/rhythmbox-rb-station-properties-dialog.html
+%%DOCSDIR%%/rhythmbox-rb-statusbar.html
+%%DOCSDIR%%/rhythmbox-rb-stock-icons.html
+%%DOCSDIR%%/rhythmbox-rb-string-helpers.html
+%%DOCSDIR%%/rhythmbox-rb-tray-icon.html
+%%DOCSDIR%%/rhythmbox-rb-tree-dnd.html
+%%DOCSDIR%%/rhythmbox-rb-tree-model-sort.html
+%%DOCSDIR%%/rhythmbox-rb-util.html
+%%DOCSDIR%%/rhythmbox-rhythmdb-property-model.html
+%%DOCSDIR%%/rhythmbox-rhythmdb-query-model.html
+%%DOCSDIR%%/rhythmbox-rhythmdb-tree.html
+%%DOCSDIR%%/rhythmbox-rhythmdb.html
+%%DOCSDIR%%/rhythmbox.devhelp
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
 share/gnome/application-registry/rhythmbox.applications
 share/gnome/applications/rhythmbox.desktop
 share/gnome/help/rhythmbox/C/authors.xml
@@ -170,3 +245,4 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @dirrm share/gnome/help/rhythmbox/C/figures
 @dirrm share/gnome/help/rhythmbox/C
 @dirrm share/gnome/help/rhythmbox
+@dirrm %%DOCSDIR%%