3 files changed, 291 insertions, 194 deletions

diff --git a/comms/anyremote/Makefile b/comms/anyremote/Makefile
index 0adebdf8602b..2d26a60cfdcf 100644
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@@ -6,32 +6,32 @@
 #
 
 PORTNAME=	anyremote
-PORTVERSION=	5.4.2
+PORTVERSION=	6.0
 CATEGORIES=	comms
 MASTER_SITES=	SF
 
 MAINTAINER=	samm@os2.kiev.ua
 COMMENT=	Remote control service over Bluetooth, infrared, or TCP/IP networking
 
+LICENSE=	GPLv2
+
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-LICENSE=	GPLv2
-
-OPTIONS=	DBUS		"Build with DBUS support" on \
-		X11		"Build with X11 library" on
+OPTIONS_DEFINE=	DBUS X11
+OPTIONS_DEFAULT=	DBUS X11
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_DBUS)
+.if empty(PORT_OPTIONS:MDBUS)
 CONFIGURE_ARGS+=--disable-dbus
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 .endif
 
-.if defined(WITHOUT_X11)
+.if empty(PORT_OPTIONS:MX11)
 CONFIGURE_ARGS+=--disable-xtest
 .else
 USE_XORG=	x11 xtst
@@ -44,7 +44,7 @@ MANCOMPRESSED=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|(datadir)/man/man1|(mandir)/man1|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|xtext|xtest|g' ${WRKSRC}/configure
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/doc\/${PORTNAME}/d' ${WRKSRC}/Makefile.in
 .endif
 
diff --git a/comms/anyremote/distinfo b/comms/anyremote/distinfo
index a5f069677b7e..e021984722ff 100644
--- a/comms/anyremote/distinfo
+++ b/comms/anyremote/distinfo
@@ -1,2 +1,2 @@
-SHA256 (anyremote-5.4.2.tar.gz) = 7eacdd001bd2ae9c11966ec2d18ce0698a30b651f12c43468893e7a14b2d5670
-SIZE (anyremote-5.4.2.tar.gz) = 1714090
+SHA256 (anyremote-6.0.tar.gz) = 4bfbda7dcd8c9ef3c0372f276e4b083e5a3d6fead61980cc1998057fb762a808
+SIZE (anyremote-6.0.tar.gz) = 2144431
diff --git a/comms/anyremote/pkg-plist b/comms/anyremote/pkg-plist
index a5bd98bab7a0..81c54e9313c3 100644
--- a/comms/anyremote/pkg-plist
+++ b/comms/anyremote/pkg-plist
@@ -1,210 +1,305 @@
 @comment $FreeBSD$
 bin/anyremote
-%%DATADIR%%/cfg-data/Server-mode/comix.cfg
-%%DATADIR%%/cfg-data/Server-mode/freevo.cfg
-%%DATADIR%%/cfg-data/Server-mode/aqualung.cfg
-%%DATADIR%%/cfg-data/Server-mode/gthumb.cfg
-%%DATADIR%%/cfg-data/Server-mode/xfmedia.cfg
-%%DATADIR%%/cfg-data/Server-mode/mouse.cfg
-%%DATADIR%%/cfg-data/Server-mode/fileManager2.cfg
-%%DATADIR%%/cfg-data/Server-mode/evince.cfg
-%%DATADIR%%/cfg-data/Server-mode/customizeClient3.cfg
-%%DATADIR%%/cfg-data/Server-mode/xine.cfg
-%%DATADIR%%/cfg-data/Server-mode/customizeClient5.cfg
-%%DATADIR%%/cfg-data/Server-mode/ooimpress.cfg
-%%DATADIR%%/cfg-data/Server-mode/imageViewer.cfg
-%%DATADIR%%/cfg-data/Server-mode/all-in-one.cfg
-%%DATADIR%%/cfg-data/Server-mode/gmusicbrowser.cfg
-%%DATADIR%%/cfg-data/Server-mode/fileManager.cfg
-%%DATADIR%%/cfg-data/Server-mode/mpd.cfg
-%%DATADIR%%/cfg-data/Server-mode/rssReader.cfg
-%%DATADIR%%/cfg-data/Server-mode/fileManager3.cfg
-%%DATADIR%%/cfg-data/Server-mode/xmms2.cfg
-%%DATADIR%%/cfg-data/Server-mode/amarok-v2.cfg
-%%DATADIR%%/cfg-data/Server-mode/juk.cfg
-%%DATADIR%%/cfg-data/Server-mode/quodlibet.cfg
-%%DATADIR%%/cfg-data/Server-mode/gnomeradio.cfg
-%%DATADIR%%/cfg-data/Server-mode/customizeClient2.cfg
-%%DATADIR%%/cfg-data/Server-mode/xmms.cfg
-%%DATADIR%%/cfg-data/Server-mode/kmplayer.cfg
-%%DATADIR%%/cfg-data/Server-mode/iconUpload.cfg
-%%DATADIR%%/cfg-data/Server-mode/banshee.cfg
-%%DATADIR%%/cfg-data/Server-mode/rhythmbox.cfg
-%%DATADIR%%/cfg-data/Server-mode/autolock.cfg
-%%DATADIR%%/cfg-data/Server-mode/mplayer.cfg
-%%DATADIR%%/cfg-data/Server-mode/totem.cfg
-%%DATADIR%%/cfg-data/Server-mode/xdtv.cfg
-%%DATADIR%%/cfg-data/Server-mode/keyboard.cfg
-%%DATADIR%%/cfg-data/Server-mode/kmid.cfg
-%%DATADIR%%/cfg-data/Server-mode/amarok.cfg
-%%DATADIR%%/cfg-data/Server-mode/adminExample.cfg
-%%DATADIR%%/cfg-data/Server-mode/customizeClient.cfg
-%%DATADIR%%/cfg-data/Server-mode/nokia-e70.cfg
-%%DATADIR%%/cfg-data/Server-mode/customizeClient4.cfg
-%%DATADIR%%/cfg-data/Server-mode/nokia-e61.cfg
-%%DATADIR%%/cfg-data/Server-mode/bmp.cfg
-%%DATADIR%%/cfg-data/Server-mode/kdetv.cfg
-%%DATADIR%%/cfg-data/Server-mode/kdialog.cfg
-%%DATADIR%%/cfg-data/Server-mode/vlc.cfg
-%%DATADIR%%/cfg-data/Server-mode/kscd.cfg
-%%DATADIR%%/cfg-data/Server-mode/multimode.cfg
-%%DATADIR%%/cfg-data/Server-mode/all-in-one2.cfg
-%%DATADIR%%/cfg-data/Server-mode/moc.cfg
-%%DATADIR%%/cfg-data/Server-mode/smplayer.cfg
-%%DATADIR%%/cfg-data/Server-mode/audacious.cfg
-%%DATADIR%%/cfg-data/Server-mode/tvtime.cfg
-%%DATADIR%%/cfg-data/Server-mode/amarok-v3.cfg
-%%DATADIR%%/cfg-data/Server-mode/winManager.cfg
-%%DATADIR%%/cfg-data/Server-mode/myth-tv.cfg
-%%DATADIR%%/cfg-data/Server-mode/gwenview.cfg
-%%DATADIR%%/cfg-data/Server-mode/kplayer.cfg
-%%DATADIR%%/cfg-data/Server-mode/decibel.cfg
-%%DATADIR%%/cfg-data/Server-mode/kaffeine.cfg
-%%DATADIR%%/cfg-data/Server-mode/listen.cfg
-%%DATADIR%%/cfg-data/Server-mode/exaile.cfg
-%%DATADIR%%/cfg-data/Server-mode/banshee-v2.cfg
-%%DATADIR%%/cfg-data/Server-mode/okular.cfg
-%%DATADIR%%/cfg-data/Server-mode/wmctrl.cfg
-%%DATADIR%%/cfg-data/Server-mode/xbmc.cfg
-%%DATADIR%%/cfg-data/Server-mode/alsaplayer.cfg
-%%DATADIR%%/cfg-data/Server-mode/digikam.cfg
-%%DATADIR%%/cfg-data/Server-mode/gpicview.cfg
-%%DATADIR%%/cfg-data/Server-mode/xmultimedia.cfg
-%%DATADIR%%/cfg-data/Server-mode/eog.cfg
-%%DATADIR%%/cfg-data/Server-mode/impressive.cfg
-%%DATADIR%%/cfg-data/Server-mode/autoUpload.cfg
-%%DATADIR%%/cfg-data/Server-mode/moovida.cfg
-%%DATADIR%%/cfg-data/Server-mode/amarok-v4.cfg
-%%DATADIR%%/cfg-data/Server-mode/boxee.cfg
-%%DATADIR%%/cfg-data/Server-mode/dragon.cfg
-%%DATADIR%%/cfg-data/Server-mode/keyboard-mouse.cfg
-%%DATADIR%%/cfg-data/Server-mode/nokia-e75.cfg
-%%DATADIR%%/cfg-data/Server-mode/qmmp.cfg
-%%DATADIR%%/cfg-data/Server-mode/qwerty-device-test.cfg
-%%DATADIR%%/cfg-data/Server-mode/amixer.cfg
-%%DATADIR%%/cfg-data/Server-mode/miro.cfg
-%%DATADIR%%/cfg-data/Server-mode/mpris.cfg
-%%DATADIR%%/cfg-data/Server-mode/cmus.cfg
-%%DATADIR%%/cfg-data/Server-mode/clementine.cfg
-%%DATADIR%%/cfg-data/Server-mode/deadbeef.cfg
-%%DATADIR%%/cfg-data/Utils/gradient.png
-%%DATADIR%%/cfg-data/Utils/message.sh
-%%DATADIR%%/cfg-data/Utils/all-in-1.py
-%%DATADIR%%/cfg-data/Utils/xmms_is_playing
-%%DATADIR%%/cfg-data/Utils/aliases-at.cfg
 %%DATADIR%%/cfg-data/Utils/aliases-bemused.cfg
 %%DATADIR%%/cfg-data/Utils/aliases-server.cfg
-%%DATADIR%%/cfg-data/Utils/getPlayList.sh
 %%DATADIR%%/cfg-data/Utils/aliases-iviewer.cfg
+%%DATADIR%%/cfg-data/Utils/getPlayList.sh
+%%DATADIR%%/cfg-data/Utils/aliases-server-presentation.cfg
+%%DATADIR%%/cfg-data/Utils/xmms_is_playing
+%%DATADIR%%/cfg-data/Utils/aliases-server-pix-viewer.cfg
+%%DATADIR%%/cfg-data/Utils/aliases-server-player.cfg
+%%DATADIR%%/cfg-data/Utils/aliases-at.cfg
 %%DATADIR%%/cfg-data/Utils/pulse-audio-ctl.sh
-%%DATADIR%%/cfg-data/Bemused-emulation/exaile.cfg
-%%DATADIR%%/cfg-data/Bemused-emulation/quodlibet.cfg
-%%DATADIR%%/cfg-data/Bemused-emulation/xmms.cfg
-%%DATADIR%%/cfg-data/Bemused-emulation/rhythmbox.cfg
-%%DATADIR%%/cfg-data/Bemused-emulation/totem.cfg
-%%DATADIR%%/cfg-data/Bemused-emulation/template.cfg
-%%DATADIR%%/cfg-data/Bemused-emulation/amarok.cfg
-%%DATADIR%%/cfg-data/Bemused-emulation/kdetv.cfg
-%%DATADIR%%/cfg-data/Bemused-emulation/tvtime.cfg
-%%DATADIR%%/cfg-data/Bemused-emulation/mpd.cfg
-%%DATADIR%%/cfg-data/AT-mode/aqualung.cfg
-%%DATADIR%%/cfg-data/AT-mode/xfmedia.cfg
-%%DATADIR%%/cfg-data/AT-mode/mouse.cfg
-%%DATADIR%%/cfg-data/AT-mode/kdialog.se.cfg
-%%DATADIR%%/cfg-data/AT-mode/keyboard.cfg
-%%DATADIR%%/cfg-data/AT-mode/all-in-one.cfg
-%%DATADIR%%/cfg-data/AT-mode/xineForDvd.cfg
-%%DATADIR%%/cfg-data/AT-mode/gmusicbrowser.cfg
-%%DATADIR%%/cfg-data/AT-mode/mpd.cfg
-%%DATADIR%%/cfg-data/AT-mode/quodlibet.cfg
-%%DATADIR%%/cfg-data/AT-mode/kdialog.sagem.cfg
-%%DATADIR%%/cfg-data/AT-mode/elisa.cfg
-%%DATADIR%%/cfg-data/AT-mode/xmms.cfg
-%%DATADIR%%/cfg-data/AT-mode/kdialog.motorola.cfg
-%%DATADIR%%/cfg-data/AT-mode/banshee.cfg
-%%DATADIR%%/cfg-data/AT-mode/rhythmbox.cfg
-%%DATADIR%%/cfg-data/AT-mode/bmp.cfg
-%%DATADIR%%/cfg-data/AT-mode/autolock.cfg
-%%DATADIR%%/cfg-data/AT-mode/totem.cfg
-%%DATADIR%%/cfg-data/AT-mode/xdtv.cfg
-%%DATADIR%%/cfg-data/AT-mode/amarok.cfg
-%%DATADIR%%/cfg-data/AT-mode/kdetv.cfg
-%%DATADIR%%/cfg-data/AT-mode/kdialog.cfg
-%%DATADIR%%/cfg-data/AT-mode/multimode.cfg
-%%DATADIR%%/cfg-data/AT-mode/moc.cfg
-%%DATADIR%%/cfg-data/AT-mode/audacious.cfg
-%%DATADIR%%/cfg-data/AT-mode/tvtime.cfg
-%%DATADIR%%/cfg-data/AT-mode/kdialog.siemens.cfg
-%%DATADIR%%/cfg-data/AT-mode/kaffeine.cfg
-%%DATADIR%%/cfg-data/AT-mode/listen.cfg
-%%DATADIR%%/cfg-data/AT-mode/exaile.cfg
-%%DATADIR%%/cfg-data/AT-mode/freevo.cfg
-%%DATADIR%%/cfg-data/AT-mode/amixer.cfg
-%%DATADIR%%/cfg-data/Icons/16/favorites.png
-%%DATADIR%%/cfg-data/Icons/16/bottom.png
+%%DATADIR%%/cfg-data/Utils/aliases-server-fbrowser-v3.cfg
+%%DATADIR%%/cfg-data/Utils/message.sh
+%%DATADIR%%/cfg-data/Utils/all-in-1.py
+%%DATADIR%%/cfg-data/Utils/aliases-server-video-player.cfg
+%%DATADIR%%/cfg-data/Utils/aliases-server-fbrowser-v3i.cfg
+%%DATADIR%%/cfg-data/Utils/gradient.png
+%%DATADIR%%/cfg-data/Utils/run-or-switch-to.sh
+%%DATADIR%%/cfg-data/Icons/128/favorites.png
+%%DATADIR%%/cfg-data/Icons/128/minus.png
+%%DATADIR%%/cfg-data/Icons/128/right.png
+%%DATADIR%%/cfg-data/Icons/128/up.png
+%%DATADIR%%/cfg-data/Icons/128/rewind.png
+%%DATADIR%%/cfg-data/Icons/128/no.png
+%%DATADIR%%/cfg-data/Icons/128/info.png
+%%DATADIR%%/cfg-data/Icons/128/launch.png
+%%DATADIR%%/cfg-data/Icons/128/exit.png
+%%DATADIR%%/cfg-data/Icons/128/forward.png
+%%DATADIR%%/cfg-data/Icons/128/prev.png
+%%DATADIR%%/cfg-data/Icons/128/left.png
+%%DATADIR%%/cfg-data/Icons/128/record.png
+%%DATADIR%%/cfg-data/Icons/128/question.png
+%%DATADIR%%/cfg-data/Icons/128/top.png
+%%DATADIR%%/cfg-data/Icons/128/mute.png
+%%DATADIR%%/cfg-data/Icons/128/default.png
+%%DATADIR%%/cfg-data/Icons/128/plus.png
+%%DATADIR%%/cfg-data/Icons/128/down.png
+%%DATADIR%%/cfg-data/Icons/128/fit.png
+%%DATADIR%%/cfg-data/Icons/128/eject.png
+%%DATADIR%%/cfg-data/Icons/128/bottom.png
+%%DATADIR%%/cfg-data/Icons/128/click_icon.png
+%%DATADIR%%/cfg-data/Icons/128/vol_up.png
+%%DATADIR%%/cfg-data/Icons/128/ok.png
+%%DATADIR%%/cfg-data/Icons/128/pause.png
+%%DATADIR%%/cfg-data/Icons/128/fullscreen.png
+%%DATADIR%%/cfg-data/Icons/128/stop.png
+%%DATADIR%%/cfg-data/Icons/128/folder.png
+%%DATADIR%%/cfg-data/Icons/128/refresh.png
+%%DATADIR%%/cfg-data/Icons/128/play.png
+%%DATADIR%%/cfg-data/Icons/128/next.png
+%%DATADIR%%/cfg-data/Icons/128/vol_down.png
+%%DATADIR%%/cfg-data/Icons/128/first.png
+%%DATADIR%%/cfg-data/Icons/128/file.png
+%%DATADIR%%/cfg-data/Icons/128/last.png
+%%DATADIR%%/cfg-data/Icons/16/record.png
+%%DATADIR%%/cfg-data/Icons/16/first.png
 %%DATADIR%%/cfg-data/Icons/16/eject.png
-%%DATADIR%%/cfg-data/Icons/16/top.png
+%%DATADIR%%/cfg-data/Icons/16/favorites.png
 %%DATADIR%%/cfg-data/Icons/16/launch.png
-%%DATADIR%%/cfg-data/Icons/16/last.png
-%%DATADIR%%/cfg-data/Icons/16/ok.png
-%%DATADIR%%/cfg-data/Icons/16/first.png
-%%DATADIR%%/cfg-data/Icons/16/record.png
 %%DATADIR%%/cfg-data/Icons/16/exit.png
 %%DATADIR%%/cfg-data/Icons/16/info.png
-%%DATADIR%%/cfg-data/Icons/32/favorites.png
-%%DATADIR%%/cfg-data/Icons/32/bottom.png
-%%DATADIR%%/cfg-data/Icons/32/eject.png
-%%DATADIR%%/cfg-data/Icons/32/top.png
-%%DATADIR%%/cfg-data/Icons/32/launch.png
-%%DATADIR%%/cfg-data/Icons/32/last.png
-%%DATADIR%%/cfg-data/Icons/32/ok.png
-%%DATADIR%%/cfg-data/Icons/32/first.png
-%%DATADIR%%/cfg-data/Icons/32/record.png
-%%DATADIR%%/cfg-data/Icons/32/exit.png
-%%DATADIR%%/cfg-data/Icons/32/info.png
+%%DATADIR%%/cfg-data/Icons/16/ok.png
+%%DATADIR%%/cfg-data/Icons/16/last.png
+%%DATADIR%%/cfg-data/Icons/16/top.png
+%%DATADIR%%/cfg-data/Icons/16/bottom.png
+%%DATADIR%%/cfg-data/Icons/anyRemote.png
 %%DATADIR%%/cfg-data/Icons/48/bottom.png
-%%DATADIR%%/cfg-data/Icons/48/eject.png
-%%DATADIR%%/cfg-data/Icons/48/exit.png
-%%DATADIR%%/cfg-data/Icons/48/favorites.png
+%%DATADIR%%/cfg-data/Icons/48/vol_up.png
+%%DATADIR%%/cfg-data/Icons/48/prev.png
+%%DATADIR%%/cfg-data/Icons/48/vol_down.png
+%%DATADIR%%/cfg-data/Icons/48/left.png
 %%DATADIR%%/cfg-data/Icons/48/first.png
+%%DATADIR%%/cfg-data/Icons/48/mute.png
+%%DATADIR%%/cfg-data/Icons/48/default.png
+%%DATADIR%%/cfg-data/Icons/48/down.png
+%%DATADIR%%/cfg-data/Icons/48/plus.png
+%%DATADIR%%/cfg-data/Icons/48/eject.png
+%%DATADIR%%/cfg-data/Icons/48/ok.png
+%%DATADIR%%/cfg-data/Icons/48/pause.png
+%%DATADIR%%/cfg-data/Icons/48/folder.png
+%%DATADIR%%/cfg-data/Icons/48/top.png
+%%DATADIR%%/cfg-data/Icons/48/click_icon.png
+%%DATADIR%%/cfg-data/Icons/48/forward.png
 %%DATADIR%%/cfg-data/Icons/48/info.png
-%%DATADIR%%/cfg-data/Icons/48/last.png
+%%DATADIR%%/cfg-data/Icons/48/exit.png
+%%DATADIR%%/cfg-data/Icons/48/fullscreen.png
+%%DATADIR%%/cfg-data/Icons/48/stop.png
+%%DATADIR%%/cfg-data/Icons/48/refresh.png
+%%DATADIR%%/cfg-data/Icons/48/fit.png
+%%DATADIR%%/cfg-data/Icons/48/play.png
+%%DATADIR%%/cfg-data/Icons/48/question.png
+%%DATADIR%%/cfg-data/Icons/48/next.png
 %%DATADIR%%/cfg-data/Icons/48/launch.png
-%%DATADIR%%/cfg-data/Icons/48/ok.png
+%%DATADIR%%/cfg-data/Icons/48/rewind.png
+%%DATADIR%%/cfg-data/Icons/48/last.png
+%%DATADIR%%/cfg-data/Icons/48/file.png
+%%DATADIR%%/cfg-data/Icons/48/right.png
+%%DATADIR%%/cfg-data/Icons/48/minus.png
+%%DATADIR%%/cfg-data/Icons/48/no.png
+%%DATADIR%%/cfg-data/Icons/48/favorites.png
+%%DATADIR%%/cfg-data/Icons/48/up.png
 %%DATADIR%%/cfg-data/Icons/48/record.png
-%%DATADIR%%/cfg-data/Icons/48/top.png
-%%DATADIR%%/cfg-data/Icons/64/favorites.png
+%%DATADIR%%/cfg-data/Icons/32/plus.png
+%%DATADIR%%/cfg-data/Icons/32/down.png
+%%DATADIR%%/cfg-data/Icons/32/mute.png
+%%DATADIR%%/cfg-data/Icons/32/no.png
+%%DATADIR%%/cfg-data/Icons/32/first.png
+%%DATADIR%%/cfg-data/Icons/32/rewind.png
+%%DATADIR%%/cfg-data/Icons/32/refresh.png
+%%DATADIR%%/cfg-data/Icons/32/left.png
+%%DATADIR%%/cfg-data/Icons/32/up.png
+%%DATADIR%%/cfg-data/Icons/32/favorites.png
+%%DATADIR%%/cfg-data/Icons/32/prev.png
+%%DATADIR%%/cfg-data/Icons/32/launch.png
+%%DATADIR%%/cfg-data/Icons/32/exit.png
+%%DATADIR%%/cfg-data/Icons/32/info.png
+%%DATADIR%%/cfg-data/Icons/32/fit.png
+%%DATADIR%%/cfg-data/Icons/32/pause.png
+%%DATADIR%%/cfg-data/Icons/32/record.png
+%%DATADIR%%/cfg-data/Icons/32/eject.png
+%%DATADIR%%/cfg-data/Icons/32/vol_down.png
+%%DATADIR%%/cfg-data/Icons/32/last.png
+%%DATADIR%%/cfg-data/Icons/32/file.png
+%%DATADIR%%/cfg-data/Icons/32/ok.png
+%%DATADIR%%/cfg-data/Icons/32/bottom.png
+%%DATADIR%%/cfg-data/Icons/32/top.png
+%%DATADIR%%/cfg-data/Icons/32/vol_up.png
+%%DATADIR%%/cfg-data/Icons/32/next.png
+%%DATADIR%%/cfg-data/Icons/32/play.png
+%%DATADIR%%/cfg-data/Icons/32/default.png
+%%DATADIR%%/cfg-data/Icons/32/stop.png
+%%DATADIR%%/cfg-data/Icons/32/folder.png
+%%DATADIR%%/cfg-data/Icons/32/fullscreen.png
+%%DATADIR%%/cfg-data/Icons/32/question.png
+%%DATADIR%%/cfg-data/Icons/32/forward.png
+%%DATADIR%%/cfg-data/Icons/32/right.png
+%%DATADIR%%/cfg-data/Icons/32/click_icon.png
+%%DATADIR%%/cfg-data/Icons/32/minus.png
+%%DATADIR%%/cfg-data/Icons/64/first.png
+%%DATADIR%%/cfg-data/Icons/64/folder.png
+%%DATADIR%%/cfg-data/Icons/64/up.png
+%%DATADIR%%/cfg-data/Icons/64/vol_down.png
+%%DATADIR%%/cfg-data/Icons/64/no.png
+%%DATADIR%%/cfg-data/Icons/64/pause.png
+%%DATADIR%%/cfg-data/Icons/64/file.png
+%%DATADIR%%/cfg-data/Icons/64/last.png
+%%DATADIR%%/cfg-data/Icons/64/fit.png
+%%DATADIR%%/cfg-data/Icons/64/stop.png
+%%DATADIR%%/cfg-data/Icons/64/vol_up.png
 %%DATADIR%%/cfg-data/Icons/64/bottom.png
 %%DATADIR%%/cfg-data/Icons/64/eject.png
-%%DATADIR%%/cfg-data/Icons/64/top.png
-%%DATADIR%%/cfg-data/Icons/64/launch.png
-%%DATADIR%%/cfg-data/Icons/64/last.png
-%%DATADIR%%/cfg-data/Icons/64/ok.png
-%%DATADIR%%/cfg-data/Icons/64/first.png
+%%DATADIR%%/cfg-data/Icons/64/play.png
+%%DATADIR%%/cfg-data/Icons/64/refresh.png
+%%DATADIR%%/cfg-data/Icons/64/next.png
+%%DATADIR%%/cfg-data/Icons/64/forward.png
+%%DATADIR%%/cfg-data/Icons/64/info.png
 %%DATADIR%%/cfg-data/Icons/64/record.png
+%%DATADIR%%/cfg-data/Icons/64/question.png
 %%DATADIR%%/cfg-data/Icons/64/exit.png
-%%DATADIR%%/cfg-data/Icons/64/info.png
-%%DATADIR%%/cfg-data/Icons/128/bottom.png
-%%DATADIR%%/cfg-data/Icons/128/eject.png
-%%DATADIR%%/cfg-data/Icons/128/exit.png
-%%DATADIR%%/cfg-data/Icons/128/favorites.png
-%%DATADIR%%/cfg-data/Icons/128/first.png
-%%DATADIR%%/cfg-data/Icons/128/info.png
-%%DATADIR%%/cfg-data/Icons/128/last.png
-%%DATADIR%%/cfg-data/Icons/128/launch.png
-%%DATADIR%%/cfg-data/Icons/128/ok.png
-%%DATADIR%%/cfg-data/Icons/128/record.png
-%%DATADIR%%/cfg-data/Icons/128/top.png
+%%DATADIR%%/cfg-data/Icons/64/ok.png
+%%DATADIR%%/cfg-data/Icons/64/top.png
+%%DATADIR%%/cfg-data/Icons/64/default.png
+%%DATADIR%%/cfg-data/Icons/64/mute.png
+%%DATADIR%%/cfg-data/Icons/64/rewind.png
+%%DATADIR%%/cfg-data/Icons/64/favorites.png
+%%DATADIR%%/cfg-data/Icons/64/down.png
+%%DATADIR%%/cfg-data/Icons/64/plus.png
+%%DATADIR%%/cfg-data/Icons/64/prev.png
+%%DATADIR%%/cfg-data/Icons/64/right.png
+%%DATADIR%%/cfg-data/Icons/64/fullscreen.png
+%%DATADIR%%/cfg-data/Icons/64/minus.png
+%%DATADIR%%/cfg-data/Icons/64/left.png
+%%DATADIR%%/cfg-data/Icons/64/launch.png
+%%DATADIR%%/cfg-data/Icons/64/click_icon.png
+%%DATADIR%%/cfg-data/Bemused-emulation/rhythmbox.cfg
+%%DATADIR%%/cfg-data/Bemused-emulation/quodlibet.cfg
+%%DATADIR%%/cfg-data/Bemused-emulation/exaile.cfg
+%%DATADIR%%/cfg-data/Bemused-emulation/amarok.cfg
+%%DATADIR%%/cfg-data/Bemused-emulation/template.cfg
+%%DATADIR%%/cfg-data/Bemused-emulation/totem.cfg
+%%DATADIR%%/cfg-data/Bemused-emulation/tvtime.cfg
+%%DATADIR%%/cfg-data/Bemused-emulation/mpd.cfg
+%%DATADIR%%/cfg-data/Bemused-emulation/kdetv.cfg
 %%DATADIR%%/cfg-data/iViewer/amarok.cfg
-%%DATADIR%%/cfg-data/iViewer/kaffeine.cfg
-%%DATADIR%%/cfg-data/iViewer/xine.cfg
-%%DATADIR%%/cfg-data/iViewer/xmms.cfg
 %%DATADIR%%/cfg-data/iViewer/banshee.cfg
 %%DATADIR%%/cfg-data/iViewer/rhythmbox.cfg
-%%DATADIR%%/cfg-data/iViewer/totem.cfg
-%%DATADIR%%/cfg-data/iViewer/iviewer-template.cfg
-%%DATADIR%%/cfg-data/iViewer/juk.cfg
+%%DATADIR%%/cfg-data/iViewer/kaffeine.cfg
+%%DATADIR%%/cfg-data/iViewer/xine.cfg
 %%DATADIR%%/cfg-data/iViewer/vlc.cfg
+%%DATADIR%%/cfg-data/iViewer/juk.cfg
+%%DATADIR%%/cfg-data/iViewer/iviewer-template.cfg
+%%DATADIR%%/cfg-data/iViewer/totem.cfg
+%%DATADIR%%/cfg-data/AT-mode/kaffeine.cfg
+%%DATADIR%%/cfg-data/AT-mode/autolock.cfg
+%%DATADIR%%/cfg-data/AT-mode/aqualung.cfg
+%%DATADIR%%/cfg-data/AT-mode/rhythmbox.cfg
+%%DATADIR%%/cfg-data/AT-mode/example-se.cfg
+%%DATADIR%%/cfg-data/AT-mode/exaile.cfg
+%%DATADIR%%/cfg-data/AT-mode/gmusicbrowser.cfg
+%%DATADIR%%/cfg-data/AT-mode/example-kdialog.cfg
+%%DATADIR%%/cfg-data/AT-mode/quodlibet.cfg
+%%DATADIR%%/cfg-data/AT-mode/example-siemens.cfg
+%%DATADIR%%/cfg-data/AT-mode/all-in-one.cfg
+%%DATADIR%%/cfg-data/AT-mode/mpd.cfg
+%%DATADIR%%/cfg-data/AT-mode/example-sagem.cfg
+%%DATADIR%%/cfg-data/AT-mode/amixer.cfg
+%%DATADIR%%/cfg-data/AT-mode/mouse.cfg
+%%DATADIR%%/cfg-data/AT-mode/amarok.cfg
+%%DATADIR%%/cfg-data/AT-mode/keyboard.cfg
+%%DATADIR%%/cfg-data/AT-mode/tvtime.cfg
+%%DATADIR%%/cfg-data/AT-mode/moc.cfg
+%%DATADIR%%/cfg-data/AT-mode/banshee.cfg
+%%DATADIR%%/cfg-data/AT-mode/kdetv.cfg
+%%DATADIR%%/cfg-data/AT-mode/example-motorola.cfg
+%%DATADIR%%/cfg-data/AT-mode/listen.cfg
+%%DATADIR%%/cfg-data/AT-mode/audacious.cfg
+%%DATADIR%%/cfg-data/AT-mode/totem.cfg
+%%DATADIR%%/cfg-data/Server-mode/qwerty-device-test.cfg
+%%DATADIR%%/cfg-data/Server-mode/mpd.cfg
+%%DATADIR%%/cfg-data/Server-mode/xbmc.cfg
+%%DATADIR%%/cfg-data/Server-mode/alsaplayer.cfg
+%%DATADIR%%/cfg-data/Server-mode/rhythmbox.cfg
+%%DATADIR%%/cfg-data/Server-mode/exampleIcons.cfg
+%%DATADIR%%/cfg-data/Server-mode/vlc.cfg
+%%DATADIR%%/cfg-data/Server-mode/keyboard.cfg
+%%DATADIR%%/cfg-data/Server-mode/kscd.cfg
+%%DATADIR%%/cfg-data/Server-mode/kmplayer.cfg
+%%DATADIR%%/cfg-data/Server-mode/nokia-e70.cfg
+%%DATADIR%%/cfg-data/Server-mode/xine.cfg
+%%DATADIR%%/cfg-data/Server-mode/exampleFont.cfg
+%%DATADIR%%/cfg-data/Server-mode/amarok-v3.cfg
+%%DATADIR%%/cfg-data/Server-mode/totem.cfg
+%%DATADIR%%/cfg-data/Server-mode/nokia-e61.cfg
+%%DATADIR%%/cfg-data/Server-mode/fileManager3.cfg
+%%DATADIR%%/cfg-data/Server-mode/amarok-v4.cfg
+%%DATADIR%%/cfg-data/Server-mode/amixer.cfg
+%%DATADIR%%/cfg-data/Server-mode/quodlibet.cfg
+%%DATADIR%%/cfg-data/Server-mode/impress.cfg
+%%DATADIR%%/cfg-data/Server-mode/amarok.cfg
+%%DATADIR%%/cfg-data/Server-mode/iconUpload.cfg
+%%DATADIR%%/cfg-data/Server-mode/template-player.cfg
+%%DATADIR%%/cfg-data/Server-mode/xmms2.cfg
+%%DATADIR%%/cfg-data/Server-mode/gthumb.cfg
+%%DATADIR%%/cfg-data/Server-mode/smplayer.cfg
+%%DATADIR%%/cfg-data/Server-mode/gmusicbrowser.cfg
+%%DATADIR%%/cfg-data/Server-mode/exaile.cfg
+%%DATADIR%%/cfg-data/Server-mode/qmmp.cfg
+%%DATADIR%%/cfg-data/Server-mode/exampleList.cfg
+%%DATADIR%%/cfg-data/Server-mode/aqualung.cfg
+%%DATADIR%%/cfg-data/Server-mode/autolock.cfg
+%%DATADIR%%/cfg-data/Server-mode/kaffeine.cfg
+%%DATADIR%%/cfg-data/Server-mode/freevo.cfg
+%%DATADIR%%/cfg-data/Server-mode/cmus.cfg
+%%DATADIR%%/cfg-data/Server-mode/kdetv.cfg
+%%DATADIR%%/cfg-data/Server-mode/gpicview.cfg
+%%DATADIR%%/cfg-data/Server-mode/fileManager2.cfg
+%%DATADIR%%/cfg-data/Server-mode/evince.cfg
+%%DATADIR%%/cfg-data/Server-mode/amarok-v2.cfg
+%%DATADIR%%/cfg-data/Server-mode/autoUpload.cfg
+%%DATADIR%%/cfg-data/Server-mode/winManager.cfg
+%%DATADIR%%/cfg-data/Server-mode/imageViewer.cfg
+%%DATADIR%%/cfg-data/Server-mode/decibel.cfg
+%%DATADIR%%/cfg-data/Server-mode/listen.cfg
+%%DATADIR%%/cfg-data/Server-mode/keyboard-mouse.cfg
+%%DATADIR%%/cfg-data/Server-mode/comix.cfg
+%%DATADIR%%/cfg-data/Server-mode/all-in-one.cfg
+%%DATADIR%%/cfg-data/Server-mode/dragon.cfg
+%%DATADIR%%/cfg-data/Server-mode/mpris.cfg
+%%DATADIR%%/cfg-data/Server-mode/digikam.cfg
+%%DATADIR%%/cfg-data/Server-mode/all-in-one2.cfg
+%%DATADIR%%/cfg-data/Server-mode/moovida.cfg
+%%DATADIR%%/cfg-data/Server-mode/nokia-e75.cfg
+%%DATADIR%%/cfg-data/Server-mode/template-pix-viewer.cfg
+%%DATADIR%%/cfg-data/Server-mode/fileManager.cfg
+%%DATADIR%%/cfg-data/Server-mode/miro.cfg
+%%DATADIR%%/cfg-data/Server-mode/exampleModes.cfg
+%%DATADIR%%/cfg-data/Server-mode/eog.cfg
+%%DATADIR%%/cfg-data/Server-mode/impressive.cfg
+%%DATADIR%%/cfg-data/Server-mode/xmultimedia.cfg
+%%DATADIR%%/cfg-data/Server-mode/exampleLayout.cfg
+%%DATADIR%%/cfg-data/Server-mode/mouse.cfg
+%%DATADIR%%/cfg-data/Server-mode/boxee.cfg
+%%DATADIR%%/cfg-data/Server-mode/layoutSetup.cfg
+%%DATADIR%%/cfg-data/Server-mode/kplayer.cfg
+%%DATADIR%%/cfg-data/Server-mode/tvtime.cfg
+%%DATADIR%%/cfg-data/Server-mode/guayadeque.cfg
+%%DATADIR%%/cfg-data/Server-mode/okular.cfg
+%%DATADIR%%/cfg-data/Server-mode/moc.cfg
+%%DATADIR%%/cfg-data/Server-mode/juk.cfg
+%%DATADIR%%/cfg-data/Server-mode/clementine.cfg
+%%DATADIR%%/cfg-data/Server-mode/exampleText.cfg
+%%DATADIR%%/cfg-data/Server-mode/banshee.cfg
+%%DATADIR%%/cfg-data/Server-mode/gwenview.cfg
+%%DATADIR%%/cfg-data/Server-mode/myth-tv.cfg
+%%DATADIR%%/cfg-data/Server-mode/audacious.cfg
+%%DATADIR%%/cfg-data/Server-mode/kdialog.cfg
+%%DATADIR%%/cfg-data/Server-mode/deadbeef.cfg
+%%DATADIR%%/cfg-data/Server-mode/mplayer.cfg
+%%DATADIR%%/cfg-data/Server-mode/wmctrl.cfg
+%%DATADIR%%/cfg-data/Server-mode/banshee-v2.cfg
+%%DATADIR%%/cfg-data/Server-mode/template-presentation.cfg
 @dirrm %%DATADIR%%/cfg-data/AT-mode
 @dirrm %%DATADIR%%/cfg-data/Bemused-emulation
 @dirrm %%DATADIR%%/cfg-data/Icons/16
@@ -356,6 +451,8 @@ bin/anyremote
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/ganyremote-devbr.jpg
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/any6.jpg
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/iviewer.png
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/aac-cf.jpg
+%%PORTDOCS%%%%DOCSDIR%%/doc-html/data/aac-search.jpg
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/man.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/dcop.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/cfg-howto.html