12 files changed, 460 insertions, 334 deletions

diff --git a/audio/freeamp/Makefile b/audio/freeamp/Makefile
index 70d766c4bb2e..a68258a7bb41 100644
--- a/audio/freeamp/Makefile
+++ b/audio/freeamp/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	freeamp
-PORTVERSION=	2.1.rc5
+PORTVERSION=	2.1.0
 PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.freeamp.org/download/src/
 
 MAINTAINER=	ports@FreeBSD.org
 
-BROKEN=		"incompatibility with release versions of musicbrainz API."
-
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 LIB_DEPENDS=	musicbrainz.1:${PORTSDIR}/audio/musicbrainz \
 		id3:${PORTSDIR}/audio/id3lib \
@@ -25,7 +23,8 @@ USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GNOMECTRL=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOCONF	=yes
+
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 .include <bsd.port.pre.mk>
@@ -36,4 +35,11 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} -D_M_IX86"
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -D_M_ALPHA"
 .endif
 
+post-install:
+	if [ ! -d ... ]; then \
+		${MKDIR} ${LOCALBASE}/etc/sdr/plugins; \
+	fi;\
+	${INSTALL_DATA} ${FILESDIR}/sdr2.plugin.S100.audio.rtp.mpa.freeamp \
+		${LOCALBASE}/etc/sdr/plugins/
+
 .include <bsd.port.post.mk>
diff --git a/audio/freeamp/distinfo b/audio/freeamp/distinfo
index 9dfb8c7831b4..b022bc70cb1b 100644
--- a/audio/freeamp/distinfo
+++ b/audio/freeamp/distinfo
@@ -1 +1 @@
-MD5 (freeamp-2.1.rc5.tar.bz2) = be532e938a060372832b6a940f7b0837
+MD5 (freeamp-2.1.0.tar.bz2) = 58d4bfe12a58abc4ef33bbfc19e8b4a7
diff --git a/audio/freeamp/files/patch-aa b/audio/freeamp/files/patch-aa
new file mode 100644
index 000000000000..93832dff5bbf
--- /dev/null
+++ b/audio/freeamp/files/patch-aa
@@ -0,0 +1,19 @@
+*** configure.in.orig	Sun Jul  1 15:31:13 2001
+--- configure.in	Sun Jul  1 15:32:03 2001
+***************
+*** 928,934 ****
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_CHECK_LIB(musicbrainz, mb_New, ,
+!   AC_MSG_ERROR([FreeAmp requires that the MusicBrainz client library be installed.]),-ldl)
+  AC_LANG_RESTORE
+  
+  AC_CONFIG_HEADER(config/config.h)
+--- 928,934 ----
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_CHECK_LIB(musicbrainz, mb_New, ,
+!   AC_MSG_ERROR([FreeAmp requires that the MusicBrainz client library be installed.]))
+  AC_LANG_RESTORE
+  
+  AC_CONFIG_HEADER(config/config.h)
diff --git a/audio/freeamp/files/patch-ab b/audio/freeamp/files/patch-ab
new file mode 100644
index 000000000000..74c70f279b31
--- /dev/null
+++ b/audio/freeamp/files/patch-ab
@@ -0,0 +1,19 @@
+*** config/config.h.in.orig	Sun Jul  1 18:51:35 2001
+--- config/config.h.in	Sun Jul  1 18:51:49 2001
+***************
+*** 46,52 ****
+  #define BRANDING_UPDATE_SERVER "fatman.freeamp.org"
+  #define BRANDING_UPDATE_PATH "/update/freeamp/"
+  #define BRANDING_DEFAULT_THEME "FreeAmp.fat"
+! #define BRANDING_SHARE_PATH "/../share/freeamp"
+  #define BRANDING_APP_NAME "freeamp"
+  
+  #define FREEAMP_PATH_ENV "FREEAMP_PATH"
+--- 46,52 ----
+  #define BRANDING_UPDATE_SERVER "fatman.freeamp.org"
+  #define BRANDING_UPDATE_PATH "/update/freeamp/"
+  #define BRANDING_DEFAULT_THEME "FreeAmp.fat"
+! #define BRANDING_SHARE_PATH "/../share/gnome/freeamp"
+  #define BRANDING_APP_NAME "freeamp"
+  
+  #define FREEAMP_PATH_ENV "FREEAMP_PATH"
diff --git a/audio/freeamp/files/sdr2.plugin.S100.audio.rtp.mpa.freeamp b/audio/freeamp/files/sdr2.plugin.S100.audio.rtp.mpa.freeamp
new file mode 100644
index 000000000000..202e4cceee0e
--- /dev/null
+++ b/audio/freeamp/files/sdr2.plugin.S100.audio.rtp.mpa.freeamp
@@ -0,0 +1,10 @@
+media:audio
+tool:freeamp
+proto:RTP/AVP
+protoname:RTP
+
+fmt:14
+{
+  fmtname:MPEG
+}
+flags:rtp://$(ADDRESS):$(PORT)
diff --git a/audio/freeamp/pkg-plist b/audio/freeamp/pkg-plist
index e4b2618825cd..d1207e1fa629 100644
--- a/audio/freeamp/pkg-plist
+++ b/audio/freeamp/pkg-plist
@@ -1,7 +1,13 @@
 bin/freeamp
+etc/sdr/plugins/sdr2.plugin.S100.audio.rtp.mpa.freeamp
+share/gnome/freeamp/themes/Aquatica.fat
+share/gnome/freeamp/themes/EMusic.fat
+share/gnome/freeamp/themes/FreeAmp.fat
+share/gnome/freeamp/themes/FreeAmpClassic.fat
+share/gnome/freeamp/themes/Relatable.fat
+share/gnome/freeamp/themes/Tommy.fat
 lib/freeamp/plugins/cd.lmc
 lib/freeamp/plugins/cd.pmo
-lib/freeamp/plugins/cddb.mdf
 lib/freeamp/plugins/corba.ui
 lib/freeamp/plugins/download.ui
 lib/freeamp/plugins/freeamp.ui
@@ -30,166 +36,169 @@ lib/freeamp/plugins/wavout.pmo
 lib/freeamp/plugins/winamp.ftf
 lib/freeamp/plugins/xingmp3.lmc
 lib/freeamp/plugins/winamp_theme.xml
-share/freeamp/themes/FreeAmp.fat
-share/freeamp/help/keyboard_shortcuts.html
-share/freeamp/help/adding_items_to_the_bottom_of_the_playlist_queue.html
-share/freeamp/help/adding_items_to_the_playlist_for_immediate_playback.html
-share/freeamp/help/adding_music_to_your_music_collection.html
-share/freeamp/help/adding_tracks_to_a_playlist.html
-share/freeamp/help/adjusting_the_playback_volume.html
-share/freeamp/help/appearance_topics.html
-share/freeamp/help/bw_logo.gif
-share/freeamp/help/changing_information_about_a_track.html
-share/freeamp/help/changing_the_order_of_tracks_in_a_playlist.html
-share/freeamp/help/musicbro.gif
-share/freeamp/help/changing_the_player_theme.html
-share/freeamp/help/changing_the_tool_view_in_my_music.html
-share/freeamp/help/clearing_a_playlist.html
-share/freeamp/help/configuring_player_settings.html
-share/freeamp/help/configuring_settings_topics.html
-share/freeamp/help/Copy of configuring_settings_topics.html
-share/freeamp/help/creating_a_new_playlist.html
-share/freeamp/help/creating_and_managing_topics.html
-share/freeamp/help/creating_and_modifying_topics.html
-share/freeamp/help/creating_custom_themes.html
-share/freeamp/help/creating_relatable_playlists.html
-share/freeamp/help/currentlylisten.gif
-share/freeamp/help/deleting_an_mp3_file_from_your_computer.html
-share/freeamp/help/download.gif
-share/freeamp/help/download_manager.html
-share/freeamp/help/download_manager_entry.html
-share/freeamp/help/downloading_mp3_files_from_a_web_site.html
-share/freeamp/help/drive_selection_entry.html
-share/freeamp/help/edit_info_entry.html
-share/freeamp/help/edit_track_info.html
-share/freeamp/help/editing_the_currently_playing_playlist.html
-share/freeamp/help/ejecting_audio_cds.html
-share/freeamp/help/equal.gif
-share/freeamp/help/files.gif
-share/freeamp/help/freeampmain_eq.jpg
-share/freeamp/help/freeampmain_eqclosed.gif
-share/freeamp/help/glossary.html
-share/freeamp/help/freeampmain_eqopen.gif
-share/freeamp/help/getting_help.html
-share/freeamp/help/help.gif
-share/freeamp/help/help.html
-share/freeamp/help/helpstyle.css
-share/freeamp/help/adding_a_custom_theme.html
-share/freeamp/help/menu_topics.html
-share/freeamp/help/min.gif
-share/freeamp/help/moving_to_the_next_track.html
-share/freeamp/help/moving_to_the_previous_track.html
-share/freeamp/help/music_browser_entry.html
-share/freeamp/help/my_music.html
-share/freeamp/help/mymusic.gif
-share/freeamp/help/mymusicfolders.gif
-share/freeamp/help/nextrack.gif
-share/freeamp/help/opening_a_playlist.html
-share/freeamp/help/options.gif
-share/freeamp/help/overview_topics.html
-share/freeamp/help/pause.gif
-share/freeamp/help/pause2.gif
-share/freeamp/help/pausing_downloading.html
-share/freeamp/help/pausing_playback.html
-share/freeamp/help/play.gif
-share/freeamp/help/playing_audio_cds.html
-share/freeamp/help/playing_mp3_files.html
-share/freeamp/help/playing_streams.html
-share/freeamp/help/playing_topics.html
-share/freeamp/help/playing_tracks_in_random_order.html
-share/freeamp/help/postit.gif
-share/freeamp/help/preferences_about.html
-share/freeamp/help/preferences_about_entry.html
-share/freeamp/help/preferences_advanced.html
-share/freeamp/help/preferences_advanced_entry.html
-share/freeamp/help/preferences_directory_entry.html
-share/freeamp/help/preferences_folders.html
-share/freeamp/help/preferences_general.html
-share/freeamp/help/preferences_general_entry.html
-share/freeamp/help/preferences_plugins.html
-share/freeamp/help/preferences_plugins_entry.html
-share/freeamp/help/preferences_relatable.html
-share/freeamp/help/preferences_relatable_entry.html
-share/freeamp/help/preferences_streaming.html
-share/freeamp/help/preferences_streaming_entry.html
-share/freeamp/help/preferences_themes.html
-share/freeamp/help/preferences_themes_entry.html
-share/freeamp/help/what_are_relatable_features_entry.html
-share/freeamp/help/prev_track.gif
-share/freeamp/help/quit.gif
-share/freeamp/help/prevtrack.gif
-share/freeamp/help/random1.gif
-share/freeamp/help/random2.gif
-share/freeamp/help/relatable_button.gif
-share/freeamp/help/relatable_entry.html
-share/freeamp/help/relatable_eqclosed.gif
-share/freeamp/help/relatable_equopen.gif
-share/freeamp/help/relatable_profile.html
-share/freeamp/help/relatable_streams.html
-share/freeamp/help/relatable_suggest.gif
-share/freeamp/help/relatablelogo.gif
-share/freeamp/help/relatablesig.gif
-share/freeamp/help/removing_a_playlist_from_your_music_collection.html
-share/freeamp/help/removing_a_track_from_the_playlist.html
-share/freeamp/help/removing_a_track_from_your_music_collection.html
-share/freeamp/help/repeat1.gif
-share/freeamp/help/repeatall.gif
-share/freeamp/help/repeating_playback.html
-share/freeamp/help/repeatno.gif
-share/freeamp/help/resuming_downloading.html
-share/freeamp/help/resuming_playback.html
-share/freeamp/help/saving_a_playlist.html
-share/freeamp/help/saving_a_stream_on_your_computer.html
-share/freeamp/help/scroll.gif
-share/freeamp/help/search_computer_for_music.html
-share/freeamp/help/searching_for_music_on_your_computer.html
-share/freeamp/help/seeking_in_the_current_track.html
-share/freeamp/help/setting_file_associations_or_mime_types.html
-share/freeamp/help/Shortcut to preferences_advanced.html.lnk
-share/freeamp/help/setting_the_default_playlist_queue_option.html
-share/freeamp/help/setting_the_folder_location_to_save_your_music.html
-share/freeamp/help/stop.gif
-share/freeamp/help/sorting_tracks_in_the_playlist.html
-share/freeamp/help/spacetravel.gif
-share/freeamp/help/spacetravel_ret.gif
-share/freeamp/help/spacetraveleq.gif
-share/freeamp/help/spacetraveleq_ret.gif
-share/freeamp/help/spacetravelmed.gif
-share/freeamp/help/spacetravelsm.gif
-share/freeamp/help/stopping_playback.html
-share/freeamp/help/streaming_topics.html
-share/freeamp/help/taddfiles.gif
-share/freeamp/help/tadditems.gif
-share/freeamp/help/technical_support.html
-share/freeamp/help/view.gif
-share/freeamp/help/teditinfo.gif
-share/freeamp/help/the_page_could_not_be_found.html
-share/freeamp/help/timportitems.gif
-share/freeamp/help/tnewplaylist.gif
-share/freeamp/help/tremoveitems.gif
-share/freeamp/help/tsaveplaylist.gif
-share/freeamp/help/update_topics.html
-share/freeamp/help/updating_the_player.html
-share/freeamp/help/viewing_id3_topics.html
-share/freeamp/help/viewing_the_track_duration.html
-share/freeamp/help/viewing_the_track_name.html
-share/freeamp/help/volume.gif
-share/freeamp/help/what_are_id3_tags.html
-share/freeamp/help/what_are_relatable_features.html
-share/freeamp/help/what_are_themes.html
-share/freeamp/help/what_is_a_playlist.html
-share/freeamp/help/what_is_my_music.html
-share/freeamp/help/what_is_streaming.html
-share/freeamp/help/what_is_the_player.html
-share/freeamp/help/what_kind_of_mp3_files_can_i_play.html
-share/freeamp/help/working_with_the_my_music_collection_folders.html
-share/freeamp/help/main_window.html
-share/freeamp/help/contents.html
-share/freeamp/help/preferences_musicbrowser.html
-share/freeamp/help/preferences_musicbrowser_entry.html
-share/freeamp/help/setting_the_playlist_display_information.html
+share/gnome/freeamp/help/getting_help.html
+share/gnome/freeamp/help/keyboard_shortcuts.html
+share/gnome/freeamp/help/adding_items_to_the_bottom_of_the_playlist_queue.html
+share/gnome/freeamp/help/adding_items_to_the_playlist_for_immediate_playback.html
+share/gnome/freeamp/help/adding_music_to_your_music_collection.html
+share/gnome/freeamp/help/adding_tracks_to_a_playlist.html
+share/gnome/freeamp/help/adjusting_the_playback_volume.html
+share/gnome/freeamp/help/appearance_topics.html
+share/gnome/freeamp/help/bw_logo.gif
+share/gnome/freeamp/help/changing_information_about_a_track.html
+share/gnome/freeamp/help/changing_the_order_of_tracks_in_a_playlist.html
+share/gnome/freeamp/help/changing_the_player_theme.html
+share/gnome/freeamp/help/changing_the_tool_view_in_my_music.html
+share/gnome/freeamp/help/clearing_a_playlist.html
+share/gnome/freeamp/help/configuring_player_settings.html
+share/gnome/freeamp/help/configuring_settings_topics.html
+share/gnome/freeamp/help/Copy of configuring_settings_topics.html
+share/gnome/freeamp/help/musicbro.gif
+share/gnome/freeamp/help/creating_a_new_playlist.html
+share/gnome/freeamp/help/creating_and_managing_topics.html
+share/gnome/freeamp/help/creating_and_modifying_topics.html
+share/gnome/freeamp/help/creating_custom_themes.html
+share/gnome/freeamp/help/creating_relatable_playlists.html
+share/gnome/freeamp/help/currentlylisten.gif
+share/gnome/freeamp/help/deleting_an_mp3_file_from_your_computer.html
+share/gnome/freeamp/help/download.gif
+share/gnome/freeamp/help/download_manager.html
+share/gnome/freeamp/help/download_manager_entry.html
+share/gnome/freeamp/help/downloading_mp3_files_from_a_web_site.html
+share/gnome/freeamp/help/drive_selection_entry.html
+share/gnome/freeamp/help/edit_info_entry.html
+share/gnome/freeamp/help/edit_track_info.html
+share/gnome/freeamp/help/editing_the_currently_playing_playlist.html
+share/gnome/freeamp/help/ejecting_audio_cds.html
+share/gnome/freeamp/help/equal.gif
+share/gnome/freeamp/help/files.gif
+share/gnome/freeamp/help/freeampmain_eq.jpg
+share/gnome/freeamp/help/freeampmain_eqclosed.gif
+share/gnome/freeamp/help/freeampmain_eqopen.gif
+share/gnome/freeamp/help/help.html
+share/gnome/freeamp/help/glossary.html
+share/gnome/freeamp/help/help.gif
+share/gnome/freeamp/help/helpstyle.css
+share/gnome/freeamp/help/adding_a_custom_theme.html
+share/gnome/freeamp/help/menu_topics.html
+share/gnome/freeamp/help/min.gif
+share/gnome/freeamp/help/moving_to_the_next_track.html
+share/gnome/freeamp/help/moving_to_the_previous_track.html
+share/gnome/freeamp/help/music_browser_entry.html
+share/gnome/freeamp/help/my_music.html
+share/gnome/freeamp/help/mymusic.gif
+share/gnome/freeamp/help/mymusicfolders.gif
+share/gnome/freeamp/help/nextrack.gif
+share/gnome/freeamp/help/opening_a_playlist.html
+share/gnome/freeamp/help/options.gif
+share/gnome/freeamp/help/overview_topics.html
+share/gnome/freeamp/help/pause.gif
+share/gnome/freeamp/help/pause2.gif
+share/gnome/freeamp/help/pausing_downloading.html
+share/gnome/freeamp/help/pausing_playback.html
+share/gnome/freeamp/help/play.gif
+share/gnome/freeamp/help/playing_audio_cds.html
+share/gnome/freeamp/help/playing_mp3_files.html
+share/gnome/freeamp/help/playing_streams.html
+share/gnome/freeamp/help/playing_topics.html
+share/gnome/freeamp/help/playing_tracks_in_random_order.html
+share/gnome/freeamp/help/postit.gif
+share/gnome/freeamp/help/preferences_about.html
+share/gnome/freeamp/help/preferences_about_entry.html
+share/gnome/freeamp/help/preferences_advanced.html
+share/gnome/freeamp/help/preferences_advanced_entry.html
+share/gnome/freeamp/help/preferences_directory_entry.html
+share/gnome/freeamp/help/preferences_folders.html
+share/gnome/freeamp/help/preferences_general.html
+share/gnome/freeamp/help/preferences_general_entry.html
+share/gnome/freeamp/help/preferences_plugins.html
+share/gnome/freeamp/help/preferences_plugins_entry.html
+share/gnome/freeamp/help/preferences_relatable.html
+share/gnome/freeamp/help/preferences_relatable_entry.html
+share/gnome/freeamp/help/preferences_streaming.html
+share/gnome/freeamp/help/preferences_streaming_entry.html
+share/gnome/freeamp/help/preferences_themes.html
+share/gnome/freeamp/help/preferences_themes_entry.html
+share/gnome/freeamp/help/what_are_relatable_features_entry.html
+share/gnome/freeamp/help/prev_track.gif
+share/gnome/freeamp/help/prevtrack.gif
+share/gnome/freeamp/help/quit.gif
+share/gnome/freeamp/help/random1.gif
+share/gnome/freeamp/help/random2.gif
+share/gnome/freeamp/help/relatable_button.gif
+share/gnome/freeamp/help/relatable_entry.html
+share/gnome/freeamp/help/relatable_eqclosed.gif
+share/gnome/freeamp/help/relatable_equopen.gif
+share/gnome/freeamp/help/relatable_profile.html
+share/gnome/freeamp/help/relatable_streams.html
+share/gnome/freeamp/help/relatable_suggest.gif
+share/gnome/freeamp/help/relatablelogo.gif
+share/gnome/freeamp/help/relatablesig.gif
+share/gnome/freeamp/help/removing_a_playlist_from_your_music_collection.html
+share/gnome/freeamp/help/removing_a_track_from_the_playlist.html
+share/gnome/freeamp/help/removing_a_track_from_your_music_collection.html
+share/gnome/freeamp/help/repeat1.gif
+share/gnome/freeamp/help/repeatall.gif
+share/gnome/freeamp/help/repeating_playback.html
+share/gnome/freeamp/help/repeatno.gif
+share/gnome/freeamp/help/resuming_downloading.html
+share/gnome/freeamp/help/resuming_playback.html
+share/gnome/freeamp/help/saving_a_playlist.html
+share/gnome/freeamp/help/saving_a_stream_on_your_computer.html
+share/gnome/freeamp/help/scroll.gif
+share/gnome/freeamp/help/search_computer_for_music.html
+share/gnome/freeamp/help/searching_for_music_on_your_computer.html
+share/gnome/freeamp/help/seeking_in_the_current_track.html
+share/gnome/freeamp/help/setting_file_associations_or_mime_types.html
+share/gnome/freeamp/help/setting_the_default_playlist_queue_option.html
+share/gnome/freeamp/help/setting_the_folder_location_to_save_your_music.html
+share/gnome/freeamp/help/Shortcut to preferences_advanced.html.lnk
+share/gnome/freeamp/help/stop.gif
+share/gnome/freeamp/help/spacetravel.gif
+share/gnome/freeamp/help/sorting_tracks_in_the_playlist.html
+share/gnome/freeamp/help/spacetravel_ret.gif
+share/gnome/freeamp/help/spacetraveleq.gif
+share/gnome/freeamp/help/spacetraveleq_ret.gif
+share/gnome/freeamp/help/spacetravelmed.gif
+share/gnome/freeamp/help/spacetravelsm.gif
+share/gnome/freeamp/help/stopping_playback.html
+share/gnome/freeamp/help/streaming_topics.html
+share/gnome/freeamp/help/taddfiles.gif
+share/gnome/freeamp/help/tadditems.gif
+share/gnome/freeamp/help/technical_support.html
+share/gnome/freeamp/help/teditinfo.gif
+share/gnome/freeamp/help/the_page_could_not_be_found.html
+share/gnome/freeamp/help/timportitems.gif
+share/gnome/freeamp/help/tnewplaylist.gif
+share/gnome/freeamp/help/tremoveitems.gif
+share/gnome/freeamp/help/tsaveplaylist.gif
+share/gnome/freeamp/help/update_topics.html
+share/gnome/freeamp/help/updating_the_player.html
+share/gnome/freeamp/help/view.gif
+share/gnome/freeamp/help/viewing_id3_topics.html
+share/gnome/freeamp/help/viewing_the_track_duration.html
+share/gnome/freeamp/help/viewing_the_track_name.html
+share/gnome/freeamp/help/volume.gif
+share/gnome/freeamp/help/what_are_id3_tags.html
+share/gnome/freeamp/help/what_are_relatable_features.html
+share/gnome/freeamp/help/what_are_themes.html
+share/gnome/freeamp/help/what_is_a_playlist.html
+share/gnome/freeamp/help/what_is_my_music.html
+share/gnome/freeamp/help/what_is_streaming.html
+share/gnome/freeamp/help/what_is_the_player.html
+share/gnome/freeamp/help/what_kind_of_mp3_files_can_i_play.html
+share/gnome/freeamp/help/working_with_the_my_music_collection_folders.html
+share/gnome/freeamp/help/main_window.html
+share/gnome/freeamp/help/contents.html
+share/gnome/freeamp/help/preferences_musicbrowser.html
+share/gnome/freeamp/help/preferences_musicbrowser_entry.html
+share/gnome/freeamp/help/setting_the_playlist_display_information.html
+share/gnome/freeamp/help/freeampmain_eq.gif
+share/gnome/freeamp/help/what_are_bitzi_features.html
+share/gnome/freeamp/help/preferences_musicbrainz.html
+share/gnome/freeamp/help/bitzilogo.gif
+@dirrm share/gnome/freeamp/help
+@dirrm share/gnome/freeamp/themes
+@dirrm share/gnome/freeamp
 @dirrm lib/freeamp/plugins
 @dirrm lib/freeamp
-@dirrm share/freeamp/help
-@dirrm share/freeamp/themes
-@dirrm share/freeamp
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index 70d766c4bb2e..a68258a7bb41 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	freeamp
-PORTVERSION=	2.1.rc5
+PORTVERSION=	2.1.0
 PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.freeamp.org/download/src/
 
 MAINTAINER=	ports@FreeBSD.org
 
-BROKEN=		"incompatibility with release versions of musicbrainz API."
-
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 LIB_DEPENDS=	musicbrainz.1:${PORTSDIR}/audio/musicbrainz \
 		id3:${PORTSDIR}/audio/id3lib \
@@ -25,7 +23,8 @@ USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GNOMECTRL=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOCONF	=yes
+
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 .include <bsd.port.pre.mk>
@@ -36,4 +35,11 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} -D_M_IX86"
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -D_M_ALPHA"
 .endif
 
+post-install:
+	if [ ! -d ... ]; then \
+		${MKDIR} ${LOCALBASE}/etc/sdr/plugins; \
+	fi;\
+	${INSTALL_DATA} ${FILESDIR}/sdr2.plugin.S100.audio.rtp.mpa.freeamp \
+		${LOCALBASE}/etc/sdr/plugins/
+
 .include <bsd.port.post.mk>
diff --git a/audio/zinf/distinfo b/audio/zinf/distinfo
index 9dfb8c7831b4..b022bc70cb1b 100644
--- a/audio/zinf/distinfo
+++ b/audio/zinf/distinfo
@@ -1 +1 @@
-MD5 (freeamp-2.1.rc5.tar.bz2) = be532e938a060372832b6a940f7b0837
+MD5 (freeamp-2.1.0.tar.bz2) = 58d4bfe12a58abc4ef33bbfc19e8b4a7
diff --git a/audio/zinf/files/patch-aa b/audio/zinf/files/patch-aa
new file mode 100644
index 000000000000..93832dff5bbf
--- /dev/null
+++ b/audio/zinf/files/patch-aa
@@ -0,0 +1,19 @@
+*** configure.in.orig	Sun Jul  1 15:31:13 2001
+--- configure.in	Sun Jul  1 15:32:03 2001
+***************
+*** 928,934 ****
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_CHECK_LIB(musicbrainz, mb_New, ,
+!   AC_MSG_ERROR([FreeAmp requires that the MusicBrainz client library be installed.]),-ldl)
+  AC_LANG_RESTORE
+  
+  AC_CONFIG_HEADER(config/config.h)
+--- 928,934 ----
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_CHECK_LIB(musicbrainz, mb_New, ,
+!   AC_MSG_ERROR([FreeAmp requires that the MusicBrainz client library be installed.]))
+  AC_LANG_RESTORE
+  
+  AC_CONFIG_HEADER(config/config.h)
diff --git a/audio/zinf/files/patch-ab b/audio/zinf/files/patch-ab
new file mode 100644
index 000000000000..74c70f279b31
--- /dev/null
+++ b/audio/zinf/files/patch-ab
@@ -0,0 +1,19 @@
+*** config/config.h.in.orig	Sun Jul  1 18:51:35 2001
+--- config/config.h.in	Sun Jul  1 18:51:49 2001
+***************
+*** 46,52 ****
+  #define BRANDING_UPDATE_SERVER "fatman.freeamp.org"
+  #define BRANDING_UPDATE_PATH "/update/freeamp/"
+  #define BRANDING_DEFAULT_THEME "FreeAmp.fat"
+! #define BRANDING_SHARE_PATH "/../share/freeamp"
+  #define BRANDING_APP_NAME "freeamp"
+  
+  #define FREEAMP_PATH_ENV "FREEAMP_PATH"
+--- 46,52 ----
+  #define BRANDING_UPDATE_SERVER "fatman.freeamp.org"
+  #define BRANDING_UPDATE_PATH "/update/freeamp/"
+  #define BRANDING_DEFAULT_THEME "FreeAmp.fat"
+! #define BRANDING_SHARE_PATH "/../share/gnome/freeamp"
+  #define BRANDING_APP_NAME "freeamp"
+  
+  #define FREEAMP_PATH_ENV "FREEAMP_PATH"
diff --git a/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.freeamp b/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.freeamp
new file mode 100644
index 000000000000..202e4cceee0e
--- /dev/null
+++ b/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.freeamp
@@ -0,0 +1,10 @@
+media:audio
+tool:freeamp
+proto:RTP/AVP
+protoname:RTP
+
+fmt:14
+{
+  fmtname:MPEG
+}
+flags:rtp://$(ADDRESS):$(PORT)
diff --git a/audio/zinf/pkg-plist b/audio/zinf/pkg-plist
index e4b2618825cd..d1207e1fa629 100644
--- a/audio/zinf/pkg-plist
+++ b/audio/zinf/pkg-plist
@@ -1,7 +1,13 @@
 bin/freeamp
+etc/sdr/plugins/sdr2.plugin.S100.audio.rtp.mpa.freeamp
+share/gnome/freeamp/themes/Aquatica.fat
+share/gnome/freeamp/themes/EMusic.fat
+share/gnome/freeamp/themes/FreeAmp.fat
+share/gnome/freeamp/themes/FreeAmpClassic.fat
+share/gnome/freeamp/themes/Relatable.fat
+share/gnome/freeamp/themes/Tommy.fat
 lib/freeamp/plugins/cd.lmc
 lib/freeamp/plugins/cd.pmo
-lib/freeamp/plugins/cddb.mdf
 lib/freeamp/plugins/corba.ui
 lib/freeamp/plugins/download.ui
 lib/freeamp/plugins/freeamp.ui
@@ -30,166 +36,169 @@ lib/freeamp/plugins/wavout.pmo
 lib/freeamp/plugins/winamp.ftf
 lib/freeamp/plugins/xingmp3.lmc
 lib/freeamp/plugins/winamp_theme.xml
-share/freeamp/themes/FreeAmp.fat
-share/freeamp/help/keyboard_shortcuts.html
-share/freeamp/help/adding_items_to_the_bottom_of_the_playlist_queue.html
-share/freeamp/help/adding_items_to_the_playlist_for_immediate_playback.html
-share/freeamp/help/adding_music_to_your_music_collection.html
-share/freeamp/help/adding_tracks_to_a_playlist.html
-share/freeamp/help/adjusting_the_playback_volume.html
-share/freeamp/help/appearance_topics.html
-share/freeamp/help/bw_logo.gif
-share/freeamp/help/changing_information_about_a_track.html
-share/freeamp/help/changing_the_order_of_tracks_in_a_playlist.html
-share/freeamp/help/musicbro.gif
-share/freeamp/help/changing_the_player_theme.html
-share/freeamp/help/changing_the_tool_view_in_my_music.html
-share/freeamp/help/clearing_a_playlist.html
-share/freeamp/help/configuring_player_settings.html
-share/freeamp/help/configuring_settings_topics.html
-share/freeamp/help/Copy of configuring_settings_topics.html
-share/freeamp/help/creating_a_new_playlist.html
-share/freeamp/help/creating_and_managing_topics.html
-share/freeamp/help/creating_and_modifying_topics.html
-share/freeamp/help/creating_custom_themes.html
-share/freeamp/help/creating_relatable_playlists.html
-share/freeamp/help/currentlylisten.gif
-share/freeamp/help/deleting_an_mp3_file_from_your_computer.html
-share/freeamp/help/download.gif
-share/freeamp/help/download_manager.html
-share/freeamp/help/download_manager_entry.html
-share/freeamp/help/downloading_mp3_files_from_a_web_site.html
-share/freeamp/help/drive_selection_entry.html
-share/freeamp/help/edit_info_entry.html
-share/freeamp/help/edit_track_info.html
-share/freeamp/help/editing_the_currently_playing_playlist.html
-share/freeamp/help/ejecting_audio_cds.html
-share/freeamp/help/equal.gif
-share/freeamp/help/files.gif
-share/freeamp/help/freeampmain_eq.jpg
-share/freeamp/help/freeampmain_eqclosed.gif
-share/freeamp/help/glossary.html
-share/freeamp/help/freeampmain_eqopen.gif
-share/freeamp/help/getting_help.html
-share/freeamp/help/help.gif
-share/freeamp/help/help.html
-share/freeamp/help/helpstyle.css
-share/freeamp/help/adding_a_custom_theme.html
-share/freeamp/help/menu_topics.html
-share/freeamp/help/min.gif
-share/freeamp/help/moving_to_the_next_track.html
-share/freeamp/help/moving_to_the_previous_track.html
-share/freeamp/help/music_browser_entry.html
-share/freeamp/help/my_music.html
-share/freeamp/help/mymusic.gif
-share/freeamp/help/mymusicfolders.gif
-share/freeamp/help/nextrack.gif
-share/freeamp/help/opening_a_playlist.html
-share/freeamp/help/options.gif
-share/freeamp/help/overview_topics.html
-share/freeamp/help/pause.gif
-share/freeamp/help/pause2.gif
-share/freeamp/help/pausing_downloading.html
-share/freeamp/help/pausing_playback.html
-share/freeamp/help/play.gif
-share/freeamp/help/playing_audio_cds.html
-share/freeamp/help/playing_mp3_files.html
-share/freeamp/help/playing_streams.html
-share/freeamp/help/playing_topics.html
-share/freeamp/help/playing_tracks_in_random_order.html
-share/freeamp/help/postit.gif
-share/freeamp/help/preferences_about.html
-share/freeamp/help/preferences_about_entry.html
-share/freeamp/help/preferences_advanced.html
-share/freeamp/help/preferences_advanced_entry.html
-share/freeamp/help/preferences_directory_entry.html
-share/freeamp/help/preferences_folders.html
-share/freeamp/help/preferences_general.html
-share/freeamp/help/preferences_general_entry.html
-share/freeamp/help/preferences_plugins.html
-share/freeamp/help/preferences_plugins_entry.html
-share/freeamp/help/preferences_relatable.html
-share/freeamp/help/preferences_relatable_entry.html
-share/freeamp/help/preferences_streaming.html
-share/freeamp/help/preferences_streaming_entry.html
-share/freeamp/help/preferences_themes.html
-share/freeamp/help/preferences_themes_entry.html
-share/freeamp/help/what_are_relatable_features_entry.html
-share/freeamp/help/prev_track.gif
-share/freeamp/help/quit.gif
-share/freeamp/help/prevtrack.gif
-share/freeamp/help/random1.gif
-share/freeamp/help/random2.gif
-share/freeamp/help/relatable_button.gif
-share/freeamp/help/relatable_entry.html
-share/freeamp/help/relatable_eqclosed.gif
-share/freeamp/help/relatable_equopen.gif
-share/freeamp/help/relatable_profile.html
-share/freeamp/help/relatable_streams.html
-share/freeamp/help/relatable_suggest.gif
-share/freeamp/help/relatablelogo.gif
-share/freeamp/help/relatablesig.gif
-share/freeamp/help/removing_a_playlist_from_your_music_collection.html
-share/freeamp/help/removing_a_track_from_the_playlist.html
-share/freeamp/help/removing_a_track_from_your_music_collection.html
-share/freeamp/help/repeat1.gif
-share/freeamp/help/repeatall.gif
-share/freeamp/help/repeating_playback.html
-share/freeamp/help/repeatno.gif
-share/freeamp/help/resuming_downloading.html
-share/freeamp/help/resuming_playback.html
-share/freeamp/help/saving_a_playlist.html
-share/freeamp/help/saving_a_stream_on_your_computer.html
-share/freeamp/help/scroll.gif
-share/freeamp/help/search_computer_for_music.html
-share/freeamp/help/searching_for_music_on_your_computer.html
-share/freeamp/help/seeking_in_the_current_track.html
-share/freeamp/help/setting_file_associations_or_mime_types.html
-share/freeamp/help/Shortcut to preferences_advanced.html.lnk
-share/freeamp/help/setting_the_default_playlist_queue_option.html
-share/freeamp/help/setting_the_folder_location_to_save_your_music.html
-share/freeamp/help/stop.gif
-share/freeamp/help/sorting_tracks_in_the_playlist.html
-share/freeamp/help/spacetravel.gif
-share/freeamp/help/spacetravel_ret.gif
-share/freeamp/help/spacetraveleq.gif
-share/freeamp/help/spacetraveleq_ret.gif
-share/freeamp/help/spacetravelmed.gif
-share/freeamp/help/spacetravelsm.gif
-share/freeamp/help/stopping_playback.html
-share/freeamp/help/streaming_topics.html
-share/freeamp/help/taddfiles.gif
-share/freeamp/help/tadditems.gif
-share/freeamp/help/technical_support.html
-share/freeamp/help/view.gif
-share/freeamp/help/teditinfo.gif
-share/freeamp/help/the_page_could_not_be_found.html
-share/freeamp/help/timportitems.gif
-share/freeamp/help/tnewplaylist.gif
-share/freeamp/help/tremoveitems.gif
-share/freeamp/help/tsaveplaylist.gif
-share/freeamp/help/update_topics.html
-share/freeamp/help/updating_the_player.html
-share/freeamp/help/viewing_id3_topics.html
-share/freeamp/help/viewing_the_track_duration.html
-share/freeamp/help/viewing_the_track_name.html
-share/freeamp/help/volume.gif
-share/freeamp/help/what_are_id3_tags.html
-share/freeamp/help/what_are_relatable_features.html
-share/freeamp/help/what_are_themes.html
-share/freeamp/help/what_is_a_playlist.html
-share/freeamp/help/what_is_my_music.html
-share/freeamp/help/what_is_streaming.html
-share/freeamp/help/what_is_the_player.html
-share/freeamp/help/what_kind_of_mp3_files_can_i_play.html
-share/freeamp/help/working_with_the_my_music_collection_folders.html
-share/freeamp/help/main_window.html
-share/freeamp/help/contents.html
-share/freeamp/help/preferences_musicbrowser.html
-share/freeamp/help/preferences_musicbrowser_entry.html
-share/freeamp/help/setting_the_playlist_display_information.html
+share/gnome/freeamp/help/getting_help.html
+share/gnome/freeamp/help/keyboard_shortcuts.html
+share/gnome/freeamp/help/adding_items_to_the_bottom_of_the_playlist_queue.html
+share/gnome/freeamp/help/adding_items_to_the_playlist_for_immediate_playback.html
+share/gnome/freeamp/help/adding_music_to_your_music_collection.html
+share/gnome/freeamp/help/adding_tracks_to_a_playlist.html
+share/gnome/freeamp/help/adjusting_the_playback_volume.html
+share/gnome/freeamp/help/appearance_topics.html
+share/gnome/freeamp/help/bw_logo.gif
+share/gnome/freeamp/help/changing_information_about_a_track.html
+share/gnome/freeamp/help/changing_the_order_of_tracks_in_a_playlist.html
+share/gnome/freeamp/help/changing_the_player_theme.html
+share/gnome/freeamp/help/changing_the_tool_view_in_my_music.html
+share/gnome/freeamp/help/clearing_a_playlist.html
+share/gnome/freeamp/help/configuring_player_settings.html
+share/gnome/freeamp/help/configuring_settings_topics.html
+share/gnome/freeamp/help/Copy of configuring_settings_topics.html
+share/gnome/freeamp/help/musicbro.gif
+share/gnome/freeamp/help/creating_a_new_playlist.html
+share/gnome/freeamp/help/creating_and_managing_topics.html
+share/gnome/freeamp/help/creating_and_modifying_topics.html
+share/gnome/freeamp/help/creating_custom_themes.html
+share/gnome/freeamp/help/creating_relatable_playlists.html
+share/gnome/freeamp/help/currentlylisten.gif
+share/gnome/freeamp/help/deleting_an_mp3_file_from_your_computer.html
+share/gnome/freeamp/help/download.gif
+share/gnome/freeamp/help/download_manager.html
+share/gnome/freeamp/help/download_manager_entry.html
+share/gnome/freeamp/help/downloading_mp3_files_from_a_web_site.html
+share/gnome/freeamp/help/drive_selection_entry.html
+share/gnome/freeamp/help/edit_info_entry.html
+share/gnome/freeamp/help/edit_track_info.html
+share/gnome/freeamp/help/editing_the_currently_playing_playlist.html
+share/gnome/freeamp/help/ejecting_audio_cds.html
+share/gnome/freeamp/help/equal.gif
+share/gnome/freeamp/help/files.gif
+share/gnome/freeamp/help/freeampmain_eq.jpg
+share/gnome/freeamp/help/freeampmain_eqclosed.gif
+share/gnome/freeamp/help/freeampmain_eqopen.gif
+share/gnome/freeamp/help/help.html
+share/gnome/freeamp/help/glossary.html
+share/gnome/freeamp/help/help.gif
+share/gnome/freeamp/help/helpstyle.css
+share/gnome/freeamp/help/adding_a_custom_theme.html
+share/gnome/freeamp/help/menu_topics.html
+share/gnome/freeamp/help/min.gif
+share/gnome/freeamp/help/moving_to_the_next_track.html
+share/gnome/freeamp/help/moving_to_the_previous_track.html
+share/gnome/freeamp/help/music_browser_entry.html
+share/gnome/freeamp/help/my_music.html
+share/gnome/freeamp/help/mymusic.gif
+share/gnome/freeamp/help/mymusicfolders.gif
+share/gnome/freeamp/help/nextrack.gif
+share/gnome/freeamp/help/opening_a_playlist.html
+share/gnome/freeamp/help/options.gif
+share/gnome/freeamp/help/overview_topics.html
+share/gnome/freeamp/help/pause.gif
+share/gnome/freeamp/help/pause2.gif
+share/gnome/freeamp/help/pausing_downloading.html
+share/gnome/freeamp/help/pausing_playback.html
+share/gnome/freeamp/help/play.gif
+share/gnome/freeamp/help/playing_audio_cds.html
+share/gnome/freeamp/help/playing_mp3_files.html
+share/gnome/freeamp/help/playing_streams.html
+share/gnome/freeamp/help/playing_topics.html
+share/gnome/freeamp/help/playing_tracks_in_random_order.html
+share/gnome/freeamp/help/postit.gif
+share/gnome/freeamp/help/preferences_about.html
+share/gnome/freeamp/help/preferences_about_entry.html
+share/gnome/freeamp/help/preferences_advanced.html
+share/gnome/freeamp/help/preferences_advanced_entry.html
+share/gnome/freeamp/help/preferences_directory_entry.html
+share/gnome/freeamp/help/preferences_folders.html
+share/gnome/freeamp/help/preferences_general.html
+share/gnome/freeamp/help/preferences_general_entry.html
+share/gnome/freeamp/help/preferences_plugins.html
+share/gnome/freeamp/help/preferences_plugins_entry.html
+share/gnome/freeamp/help/preferences_relatable.html
+share/gnome/freeamp/help/preferences_relatable_entry.html
+share/gnome/freeamp/help/preferences_streaming.html
+share/gnome/freeamp/help/preferences_streaming_entry.html
+share/gnome/freeamp/help/preferences_themes.html
+share/gnome/freeamp/help/preferences_themes_entry.html
+share/gnome/freeamp/help/what_are_relatable_features_entry.html
+share/gnome/freeamp/help/prev_track.gif
+share/gnome/freeamp/help/prevtrack.gif
+share/gnome/freeamp/help/quit.gif
+share/gnome/freeamp/help/random1.gif
+share/gnome/freeamp/help/random2.gif
+share/gnome/freeamp/help/relatable_button.gif
+share/gnome/freeamp/help/relatable_entry.html
+share/gnome/freeamp/help/relatable_eqclosed.gif
+share/gnome/freeamp/help/relatable_equopen.gif
+share/gnome/freeamp/help/relatable_profile.html
+share/gnome/freeamp/help/relatable_streams.html
+share/gnome/freeamp/help/relatable_suggest.gif
+share/gnome/freeamp/help/relatablelogo.gif
+share/gnome/freeamp/help/relatablesig.gif
+share/gnome/freeamp/help/removing_a_playlist_from_your_music_collection.html
+share/gnome/freeamp/help/removing_a_track_from_the_playlist.html
+share/gnome/freeamp/help/removing_a_track_from_your_music_collection.html
+share/gnome/freeamp/help/repeat1.gif
+share/gnome/freeamp/help/repeatall.gif
+share/gnome/freeamp/help/repeating_playback.html
+share/gnome/freeamp/help/repeatno.gif
+share/gnome/freeamp/help/resuming_downloading.html
+share/gnome/freeamp/help/resuming_playback.html
+share/gnome/freeamp/help/saving_a_playlist.html
+share/gnome/freeamp/help/saving_a_stream_on_your_computer.html
+share/gnome/freeamp/help/scroll.gif
+share/gnome/freeamp/help/search_computer_for_music.html
+share/gnome/freeamp/help/searching_for_music_on_your_computer.html
+share/gnome/freeamp/help/seeking_in_the_current_track.html
+share/gnome/freeamp/help/setting_file_associations_or_mime_types.html
+share/gnome/freeamp/help/setting_the_default_playlist_queue_option.html
+share/gnome/freeamp/help/setting_the_folder_location_to_save_your_music.html
+share/gnome/freeamp/help/Shortcut to preferences_advanced.html.lnk
+share/gnome/freeamp/help/stop.gif
+share/gnome/freeamp/help/spacetravel.gif
+share/gnome/freeamp/help/sorting_tracks_in_the_playlist.html
+share/gnome/freeamp/help/spacetravel_ret.gif
+share/gnome/freeamp/help/spacetraveleq.gif
+share/gnome/freeamp/help/spacetraveleq_ret.gif
+share/gnome/freeamp/help/spacetravelmed.gif
+share/gnome/freeamp/help/spacetravelsm.gif
+share/gnome/freeamp/help/stopping_playback.html
+share/gnome/freeamp/help/streaming_topics.html
+share/gnome/freeamp/help/taddfiles.gif
+share/gnome/freeamp/help/tadditems.gif
+share/gnome/freeamp/help/technical_support.html
+share/gnome/freeamp/help/teditinfo.gif
+share/gnome/freeamp/help/the_page_could_not_be_found.html
+share/gnome/freeamp/help/timportitems.gif
+share/gnome/freeamp/help/tnewplaylist.gif
+share/gnome/freeamp/help/tremoveitems.gif
+share/gnome/freeamp/help/tsaveplaylist.gif
+share/gnome/freeamp/help/update_topics.html
+share/gnome/freeamp/help/updating_the_player.html
+share/gnome/freeamp/help/view.gif
+share/gnome/freeamp/help/viewing_id3_topics.html
+share/gnome/freeamp/help/viewing_the_track_duration.html
+share/gnome/freeamp/help/viewing_the_track_name.html
+share/gnome/freeamp/help/volume.gif
+share/gnome/freeamp/help/what_are_id3_tags.html
+share/gnome/freeamp/help/what_are_relatable_features.html
+share/gnome/freeamp/help/what_are_themes.html
+share/gnome/freeamp/help/what_is_a_playlist.html
+share/gnome/freeamp/help/what_is_my_music.html
+share/gnome/freeamp/help/what_is_streaming.html
+share/gnome/freeamp/help/what_is_the_player.html
+share/gnome/freeamp/help/what_kind_of_mp3_files_can_i_play.html
+share/gnome/freeamp/help/working_with_the_my_music_collection_folders.html
+share/gnome/freeamp/help/main_window.html
+share/gnome/freeamp/help/contents.html
+share/gnome/freeamp/help/preferences_musicbrowser.html
+share/gnome/freeamp/help/preferences_musicbrowser_entry.html
+share/gnome/freeamp/help/setting_the_playlist_display_information.html
+share/gnome/freeamp/help/freeampmain_eq.gif
+share/gnome/freeamp/help/what_are_bitzi_features.html
+share/gnome/freeamp/help/preferences_musicbrainz.html
+share/gnome/freeamp/help/bitzilogo.gif
+@dirrm share/gnome/freeamp/help
+@dirrm share/gnome/freeamp/themes
+@dirrm share/gnome/freeamp
 @dirrm lib/freeamp/plugins
 @dirrm lib/freeamp
-@dirrm share/freeamp/help
-@dirrm share/freeamp/themes
-@dirrm share/freeamp