Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

18 files changed, 630 insertions, 625 deletions

diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index d3f8c5b150a..4c03a526eed 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amule
diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index 63f3714bb70..aacd1a4949a 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -39,195 +39,194 @@ share/locale/sl/LC_MESSAGES/amule.mo
 @dirrmtry share/locale/it_CH
 @dirrmtry share/locale/ko_KR/LC_MESSAGES
 @dirrmtry share/locale/ko_KR
-share/gnome/doc/aMule-2.1.3/ABOUT-NLS
-share/gnome/doc/aMule-2.1.3/amulesig.txt
-share/gnome/doc/aMule-2.1.3/amule-win32.HOWTO.txt
-share/gnome/doc/aMule-2.1.3/Changelog
-share/gnome/doc/aMule-2.1.3/Doxyfile
-share/gnome/doc/aMule-2.1.3/ED2K-Links.HOWTO
-share/gnome/doc/aMule-2.1.3/INSTALL
-share/gnome/doc/aMule-2.1.3/license.txt
-share/gnome/doc/aMule-2.1.3/README
-share/gnome/doc/aMule-2.1.3/TODO
-share/gnome/doc/aMule-2.1.3/EC_Protocol.txt
-share/gnome/doc/aMule-2.1.3/socks4.protocol
-@dirrmtry share/gnome/doc/aMule-2.1.3
-@dirrmtry share/gnome/doc
-%%PL_CAS%%share/gnome/cas/tmp.html
-%%PL_CAS%%share/gnome/cas/stat.png
-%%PL_CAS%%@dirrmtry share/gnome/cas
-%%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
-%%PL_ALC%%share/gnome/pixmaps/alc.xpm
-share/gnome/pixmaps/amule.xpm
-@dirrmtry share/gnome/pixmaps
-%%PL_CAS%%share/gnome/applications/wxcas.desktop
-%%PL_ALC%%share/gnome/applications/alc.desktop
-share/gnome/applications/amule.desktop
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/aMule.tmpl
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/add_server.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_right.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/back.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/black.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue2.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue3.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue4.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue5.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue6.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_download.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_kad.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_search.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_servers.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_settings.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_shared.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_stats.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/emule.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/green.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/greenpercent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_ed2klink.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_info.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_pause.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_resume.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/log.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/logo.jpg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/red.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/transparent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/yellow.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/downloads.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/preferences.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_graphs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/index.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-dload.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-stats.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-prefs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-kad.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/top.html
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/footer.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-reload.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-connect.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-filter.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/arrow-r.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/up.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/down.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/pause.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/resume.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/apply.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/delete.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/index.html
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/aMule.tmpl
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/add_server.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down_logout.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_right.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/back.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/black.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blank1x1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue2.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue3.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue4.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue5.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue6.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_download.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_kad.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_search.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_servers.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_settings.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_shared.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/log.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_stats.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/emule.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/green.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/greenpercent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_ed2klink.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_info.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_pause.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_resume.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_bottom.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_downmain.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_lefttop.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_righttop.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_top.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_topdown.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_topseperator.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/logo.jpg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_bg.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_top_bg.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbar.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbardarker.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbarseperator.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/red.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/transparent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/yellow.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/downloads.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/preferences.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_graphs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/index.php
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/default
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/php-default
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/chicane
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule
+share/doc/aMule-2.1.3/ABOUT-NLS
+share/doc/aMule-2.1.3/amulesig.txt
+share/doc/aMule-2.1.3/amule-win32.HOWTO.txt
+share/doc/aMule-2.1.3/Changelog
+share/doc/aMule-2.1.3/Doxyfile
+share/doc/aMule-2.1.3/ED2K-Links.HOWTO
+share/doc/aMule-2.1.3/INSTALL
+share/doc/aMule-2.1.3/license.txt
+share/doc/aMule-2.1.3/README
+share/doc/aMule-2.1.3/TODO
+share/doc/aMule-2.1.3/EC_Protocol.txt
+share/doc/aMule-2.1.3/socks4.protocol
+@dirrmtry share/doc/aMule-2.1.3
+@dirrmtry share/doc
+%%PL_CAS%%share/cas/tmp.html
+%%PL_CAS%%share/cas/stat.png
+%%PL_CAS%%@dirrmtry share/cas
+%%PL_CAS%%share/pixmaps/wxcas.xpm
+%%PL_ALC%%share/pixmaps/alc.xpm
+share/pixmaps/amule.xpm
+%%PL_CAS%%share/applications/wxcas.desktop
+%%PL_ALC%%share/applications/alc.desktop
+share/applications/amule.desktop
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/aMule.tmpl
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/add_server.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_right.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/back.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_download.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_kad.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_search.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_servers.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_settings.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_shared.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_stats.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/emule.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/green.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/greenpercent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_ed2klink.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_info.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_pause.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_resume.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/log.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/logo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/transparent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/yellow.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/downloads.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/preferences.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_graphs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/index.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-dload.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-prefs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-kad.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/top.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/footer.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-reload.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-connect.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-filter.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/arrow-r.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/up.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/down.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/pause.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/resume.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/apply.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/delete.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/index.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/aMule.tmpl
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/add_server.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down_logout.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_right.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/back.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blank1x1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_download.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_kad.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_search.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_servers.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_settings.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_shared.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/log.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_stats.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/emule.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/green.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/greenpercent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_ed2klink.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_info.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_pause.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_resume.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_bottom.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_downmain.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_lefttop.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_righttop.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_top.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topdown.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topseperator.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/logo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_bg.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_top_bg.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbar.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbardarker.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbarseperator.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/transparent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/yellow.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/downloads.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/preferences.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_graphs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/index.php
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/default
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/php-default
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/chicane
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule
 lib/xchat/plugins/xas.pl
 @dirrmtry lib/xchat/plugins
 @dirrmtry lib/xchat
@@ -241,3 +240,4 @@ lib/xchat/plugins/xas.pl
 %%PL_AMULEDAEMON%%bin/amulegui
 %%PL_AMULEDAEMON%%bin/amuled
 bin/amule
+@dirrmtry share/applications
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index d3f8c5b150a..4c03a526eed 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amule
diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
index 63f3714bb70..aacd1a4949a 100644
--- a/net-p2p/amule/pkg-plist
+++ b/net-p2p/amule/pkg-plist
@@ -39,195 +39,194 @@ share/locale/sl/LC_MESSAGES/amule.mo
 @dirrmtry share/locale/it_CH
 @dirrmtry share/locale/ko_KR/LC_MESSAGES
 @dirrmtry share/locale/ko_KR
-share/gnome/doc/aMule-2.1.3/ABOUT-NLS
-share/gnome/doc/aMule-2.1.3/amulesig.txt
-share/gnome/doc/aMule-2.1.3/amule-win32.HOWTO.txt
-share/gnome/doc/aMule-2.1.3/Changelog
-share/gnome/doc/aMule-2.1.3/Doxyfile
-share/gnome/doc/aMule-2.1.3/ED2K-Links.HOWTO
-share/gnome/doc/aMule-2.1.3/INSTALL
-share/gnome/doc/aMule-2.1.3/license.txt
-share/gnome/doc/aMule-2.1.3/README
-share/gnome/doc/aMule-2.1.3/TODO
-share/gnome/doc/aMule-2.1.3/EC_Protocol.txt
-share/gnome/doc/aMule-2.1.3/socks4.protocol
-@dirrmtry share/gnome/doc/aMule-2.1.3
-@dirrmtry share/gnome/doc
-%%PL_CAS%%share/gnome/cas/tmp.html
-%%PL_CAS%%share/gnome/cas/stat.png
-%%PL_CAS%%@dirrmtry share/gnome/cas
-%%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
-%%PL_ALC%%share/gnome/pixmaps/alc.xpm
-share/gnome/pixmaps/amule.xpm
-@dirrmtry share/gnome/pixmaps
-%%PL_CAS%%share/gnome/applications/wxcas.desktop
-%%PL_ALC%%share/gnome/applications/alc.desktop
-share/gnome/applications/amule.desktop
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/aMule.tmpl
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/add_server.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_right.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/back.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/black.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue2.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue3.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue4.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue5.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue6.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_download.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_kad.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_search.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_servers.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_settings.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_shared.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_stats.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/emule.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/green.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/greenpercent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_ed2klink.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_info.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_pause.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_resume.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/log.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/logo.jpg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/red.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/transparent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/yellow.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/downloads.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/preferences.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_graphs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/index.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-dload.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-stats.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-prefs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-kad.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/top.html
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/footer.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-reload.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-connect.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-filter.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/arrow-r.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/up.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/down.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/pause.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/resume.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/apply.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/delete.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/index.html
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/aMule.tmpl
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/add_server.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down_logout.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_right.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/back.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/black.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blank1x1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue2.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue3.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue4.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue5.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue6.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_download.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_kad.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_search.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_servers.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_settings.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_shared.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/log.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_stats.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/emule.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/green.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/greenpercent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_ed2klink.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_info.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_pause.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_resume.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_bottom.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_downmain.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_lefttop.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_righttop.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_top.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_topdown.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_topseperator.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/logo.jpg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_bg.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_top_bg.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbar.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbardarker.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbarseperator.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/red.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/transparent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/yellow.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/downloads.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/preferences.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_graphs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/index.php
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/default
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/php-default
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/chicane
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule
+share/doc/aMule-2.1.3/ABOUT-NLS
+share/doc/aMule-2.1.3/amulesig.txt
+share/doc/aMule-2.1.3/amule-win32.HOWTO.txt
+share/doc/aMule-2.1.3/Changelog
+share/doc/aMule-2.1.3/Doxyfile
+share/doc/aMule-2.1.3/ED2K-Links.HOWTO
+share/doc/aMule-2.1.3/INSTALL
+share/doc/aMule-2.1.3/license.txt
+share/doc/aMule-2.1.3/README
+share/doc/aMule-2.1.3/TODO
+share/doc/aMule-2.1.3/EC_Protocol.txt
+share/doc/aMule-2.1.3/socks4.protocol
+@dirrmtry share/doc/aMule-2.1.3
+@dirrmtry share/doc
+%%PL_CAS%%share/cas/tmp.html
+%%PL_CAS%%share/cas/stat.png
+%%PL_CAS%%@dirrmtry share/cas
+%%PL_CAS%%share/pixmaps/wxcas.xpm
+%%PL_ALC%%share/pixmaps/alc.xpm
+share/pixmaps/amule.xpm
+%%PL_CAS%%share/applications/wxcas.desktop
+%%PL_ALC%%share/applications/alc.desktop
+share/applications/amule.desktop
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/aMule.tmpl
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/add_server.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_right.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/back.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_download.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_kad.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_search.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_servers.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_settings.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_shared.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_stats.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/emule.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/green.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/greenpercent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_ed2klink.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_info.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_pause.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_resume.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/log.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/logo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/transparent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/yellow.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/downloads.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/preferences.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_graphs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/index.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-dload.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-prefs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-kad.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/top.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/footer.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-reload.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-connect.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-filter.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/arrow-r.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/up.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/down.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/pause.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/resume.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/apply.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/delete.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/index.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/aMule.tmpl
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/add_server.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down_logout.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_right.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/back.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blank1x1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_download.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_kad.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_search.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_servers.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_settings.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_shared.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/log.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_stats.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/emule.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/green.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/greenpercent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_ed2klink.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_info.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_pause.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_resume.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_bottom.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_downmain.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_lefttop.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_righttop.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_top.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topdown.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topseperator.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/logo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_bg.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_top_bg.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbar.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbardarker.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbarseperator.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/transparent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/yellow.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/downloads.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/preferences.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_graphs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/index.php
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/default
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/php-default
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/chicane
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule
 lib/xchat/plugins/xas.pl
 @dirrmtry lib/xchat/plugins
 @dirrmtry lib/xchat
@@ -241,3 +240,4 @@ lib/xchat/plugins/xas.pl
 %%PL_AMULEDAEMON%%bin/amulegui
 %%PL_AMULEDAEMON%%bin/amuled
 bin/amule
+@dirrmtry share/applications
diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile
index d3f8c5b150a..4c03a526eed 100644
--- a/net-p2p/amule2/Makefile
+++ b/net-p2p/amule2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amule
diff --git a/net-p2p/amule2/pkg-plist b/net-p2p/amule2/pkg-plist
index 63f3714bb70..aacd1a4949a 100644
--- a/net-p2p/amule2/pkg-plist
+++ b/net-p2p/amule2/pkg-plist
@@ -39,195 +39,194 @@ share/locale/sl/LC_MESSAGES/amule.mo
 @dirrmtry share/locale/it_CH
 @dirrmtry share/locale/ko_KR/LC_MESSAGES
 @dirrmtry share/locale/ko_KR
-share/gnome/doc/aMule-2.1.3/ABOUT-NLS
-share/gnome/doc/aMule-2.1.3/amulesig.txt
-share/gnome/doc/aMule-2.1.3/amule-win32.HOWTO.txt
-share/gnome/doc/aMule-2.1.3/Changelog
-share/gnome/doc/aMule-2.1.3/Doxyfile
-share/gnome/doc/aMule-2.1.3/ED2K-Links.HOWTO
-share/gnome/doc/aMule-2.1.3/INSTALL
-share/gnome/doc/aMule-2.1.3/license.txt
-share/gnome/doc/aMule-2.1.3/README
-share/gnome/doc/aMule-2.1.3/TODO
-share/gnome/doc/aMule-2.1.3/EC_Protocol.txt
-share/gnome/doc/aMule-2.1.3/socks4.protocol
-@dirrmtry share/gnome/doc/aMule-2.1.3
-@dirrmtry share/gnome/doc
-%%PL_CAS%%share/gnome/cas/tmp.html
-%%PL_CAS%%share/gnome/cas/stat.png
-%%PL_CAS%%@dirrmtry share/gnome/cas
-%%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
-%%PL_ALC%%share/gnome/pixmaps/alc.xpm
-share/gnome/pixmaps/amule.xpm
-@dirrmtry share/gnome/pixmaps
-%%PL_CAS%%share/gnome/applications/wxcas.desktop
-%%PL_ALC%%share/gnome/applications/alc.desktop
-share/gnome/applications/amule.desktop
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/aMule.tmpl
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/add_server.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_right.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/arrow_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/back.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/black.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue2.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue3.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue4.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue5.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/blue6.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_download.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_kad.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_search.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_servers.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_settings.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_shared.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/cp_stats.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/emule.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/green.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/greenpercent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_ed2klink.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_info.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_pause.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_resume.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/l_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/log.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/logo.jpg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/red.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/transparent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/yellow.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/downloads.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/preferences.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_graphs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/index.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-dload.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-stats.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-prefs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-kad.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/top.html
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/footer.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-reload.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-connect.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-filter.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/arrow-r.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/up.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/down.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/pause.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/resume.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/apply.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/delete.jpeg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/index.html
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/aMule.tmpl
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/add_server.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down_logout.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_right.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/back.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/black.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blank1x1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue1.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue2.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue3.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue4.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue5.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/blue6.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_download.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_kad.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_search.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_servers.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_settings.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_shared.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/log.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/cp_stats.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/emule.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/green.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/greenpercent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_cancel.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_connect.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_down.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_ed2klink.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_info.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_pause.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_resume.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/l_up.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_bottom.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_downmain.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_lefttop.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_righttop.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_top.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_topdown.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login_topseperator.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/logo.jpg
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_bg.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_top_bg.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbar.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbardarker.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/main_topbarseperator.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/red.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/transparent.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/yellow.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/phpamule.png
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-leaf.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-open.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-closed.gif
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/favicon.ico
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/downloads.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/preferences.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/search.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/servers.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/shared.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_graphs.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_tree.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login.php
-%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/index.php
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/default
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/php-default
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/chicane
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver
-%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule
+share/doc/aMule-2.1.3/ABOUT-NLS
+share/doc/aMule-2.1.3/amulesig.txt
+share/doc/aMule-2.1.3/amule-win32.HOWTO.txt
+share/doc/aMule-2.1.3/Changelog
+share/doc/aMule-2.1.3/Doxyfile
+share/doc/aMule-2.1.3/ED2K-Links.HOWTO
+share/doc/aMule-2.1.3/INSTALL
+share/doc/aMule-2.1.3/license.txt
+share/doc/aMule-2.1.3/README
+share/doc/aMule-2.1.3/TODO
+share/doc/aMule-2.1.3/EC_Protocol.txt
+share/doc/aMule-2.1.3/socks4.protocol
+@dirrmtry share/doc/aMule-2.1.3
+@dirrmtry share/doc
+%%PL_CAS%%share/cas/tmp.html
+%%PL_CAS%%share/cas/stat.png
+%%PL_CAS%%@dirrmtry share/cas
+%%PL_CAS%%share/pixmaps/wxcas.xpm
+%%PL_ALC%%share/pixmaps/alc.xpm
+share/pixmaps/amule.xpm
+%%PL_CAS%%share/applications/wxcas.desktop
+%%PL_ALC%%share/applications/alc.desktop
+share/applications/amule.desktop
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/aMule.tmpl
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/add_server.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_right.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/arrow_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/back.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_download.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_kad.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_search.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_servers.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_settings.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_shared.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/cp_stats.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/emule.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/green.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/greenpercent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_ed2klink.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_info.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_pause.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_resume.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/l_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/log.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/logo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/transparent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/yellow.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/downloads.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/preferences.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_graphs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/stat_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/default/index.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-dload.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-prefs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/amuleweb-main-kad.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/stats_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/top.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/footer.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-reload.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-search-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-download-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-connect.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/toolbutton-filter.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/arrow-r.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/up.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/down.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/pause.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/resume.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/apply.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/delete.jpeg
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/php-default/index.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/aMule.tmpl
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/add_server.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_down_logout.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_right.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/arrow_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/back.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blank1x1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_download.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_kad.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_search.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_servers.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_settings.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_shared.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/log.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/cp_stats.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/emule.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/green.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/greenpercent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_down.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_ed2klink.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_info.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_pause.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_resume.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/l_up.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_bottom.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_downmain.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_lefttop.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_righttop.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_top.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topdown.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login_topseperator.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/logo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_bg.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_top_bg.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbar.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbardarker.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/main_topbarseperator.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/transparent.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/yellow.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/phpamule.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/downloads.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/preferences.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_graphs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/stat_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/chicane/index.php
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/default
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/php-default
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver/chicane
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver
+%%PL_AMULEWEBSRV%%@dirrmtry share/amule
 lib/xchat/plugins/xas.pl
 @dirrmtry lib/xchat/plugins
 @dirrmtry lib/xchat
@@ -241,3 +240,4 @@ lib/xchat/plugins/xas.pl
 %%PL_AMULEDAEMON%%bin/amulegui
 %%PL_AMULEDAEMON%%bin/amuled
 bin/amule
+@dirrmtry share/applications
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index a9a588cde69..255b969c281 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dctc
 PORTVERSION=	0.66
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p gnome
 MASTER_SITES=	http://unixpages.org/distfiles/
 PKGNAMESUFFIX=	-gui
diff --git a/net-p2p/dctc-gui/pkg-plist b/net-p2p/dctc-gui/pkg-plist
index 6bccd651205..a171e8456de 100644
--- a/net-p2p/dctc-gui/pkg-plist
+++ b/net-p2p/dctc-gui/pkg-plist
@@ -9,25 +9,25 @@ share/gnome/help/dc_gui/es/index.html
 share/gnome/help/dc_gui/es/topic.dat
 share/gnome/help/dc_gui/nl/index.html
 share/gnome/help/dc_gui/nl/topic.dat
-share/gnome/pixmaps/dc_gui/icon_folder_add.xpm
-share/gnome/pixmaps/dc_gui/icon_folder_del.xpm
-share/gnome/pixmaps/dc_gui/icon_kill.xpm
-share/gnome/pixmaps/dc_gui/icon_refresh.xpm
-share/gnome/pixmaps/dc_gui/icon_remove_all.xpm
-share/gnome/pixmaps/dc_gui/icon_remove_selected.xpm
 share/locale/de/LC_MESSAGES/dc_gui.mo
 share/locale/fr/LC_MESSAGES/dc_gui.mo
 share/locale/nl/LC_MESSAGES/dc_gui.mo
 share/locale/sv/LC_MESSAGES/dc_gui.mo
-@unexec %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec %D/share/locale/sv 2>/dev/null || true
-@unexec %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec %D/share/locale/nl 2>/dev/null || true
-@unexec %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec %D/share/locale/fr 2>/dev/null || true
-@unexec %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec %D/share/locale/de 2>/dev/null || true
-@dirrm share/gnome/pixmaps/dc_gui
+share/pixmaps/dc_gui/icon_folder_add.xpm
+share/pixmaps/dc_gui/icon_folder_del.xpm
+share/pixmaps/dc_gui/icon_kill.xpm
+share/pixmaps/dc_gui/icon_refresh.xpm
+share/pixmaps/dc_gui/icon_remove_all.xpm
+share/pixmaps/dc_gui/icon_remove_selected.xpm
+@dirrm share/pixmaps/dc_gui
+@dirrmtry share/locale/sv/LC_MESSAGES 
+@dirrmtry share/locale/sv 
+@dirrmtry share/locale/nl/LC_MESSAGES 
+@dirrmtry share/locale/nl 
+@dirrmtry share/locale/fr/LC_MESSAGES 
+@dirrmtry share/locale/fr 
+@dirrmtry share/locale/de/LC_MESSAGES 
+@dirrmtry share/locale/de 
 @dirrmtry share/gnome/help/dc_gui/nl/images
 @dirrm share/gnome/help/dc_gui/nl
 @dirrmtry share/gnome/help/dc_gui/es/images
diff --git a/net-p2p/fidelio/Makefile b/net-p2p/fidelio/Makefile
index 3330cc371c3..8ed82697225 100644
--- a/net-p2p/fidelio/Makefile
+++ b/net-p2p/fidelio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fidelio
 PORTVERSION=	1.0.b1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-p2p/fidelio/pkg-plist b/net-p2p/fidelio/pkg-plist
index 823d8829731..38eec7542de 100644
--- a/net-p2p/fidelio/pkg-plist
+++ b/net-p2p/fidelio/pkg-plist
@@ -1,5 +1,5 @@
 bin/fidelio
-share/gnome/fidelio.default
+share/fidelio.default
 share/locale/de/LC_MESSAGES/fidelio.mo
 share/locale/el/LC_MESSAGES/fidelio.mo
 share/locale/fr/LC_MESSAGES/fidelio.mo
diff --git a/net-p2p/giftoxic/Makefile b/net-p2p/giftoxic/Makefile
index 57a8bab2962..871b526ff03 100644
--- a/net-p2p/giftoxic/Makefile
+++ b/net-p2p/giftoxic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giFToxic
 PORTVERSION=	0.0.9
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	giftoxic
diff --git a/net-p2p/giftoxic/pkg-plist b/net-p2p/giftoxic/pkg-plist
index a570dc6a9ff..32a4bb571ed 100644
--- a/net-p2p/giftoxic/pkg-plist
+++ b/net-p2p/giftoxic/pkg-plist
@@ -1,8 +1,9 @@
 bin/giFToxic
-share/gnome/applications/giFToxic.desktop
-share/gnome/giFToxic/logo.png
-share/gnome/pixmaps/giFToxic-48.png
+share/applications/giFToxic.desktop
+share/giFToxic/logo.png
+share/pixmaps/giFToxic-48.png
 share/locale/de/LC_MESSAGES/giFToxic.mo
 share/locale/es/LC_MESSAGES/giFToxic.mo
 share/locale/nl/LC_MESSAGES/giFToxic.mo
-@dirrm share/gnome/giFToxic
+@dirrm share/giFToxic
+@dirrmtry share/applications
diff --git a/net-p2p/giftui/Makefile b/net-p2p/giftui/Makefile
index 668eec258ff..d9f7d57211a 100644
--- a/net-p2p/giftui/Makefile
+++ b/net-p2p/giftui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giFTui
 PORTVERSION=	0.4.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	giftui
diff --git a/net-p2p/giftui/pkg-plist b/net-p2p/giftui/pkg-plist
index c52cc2709cd..40cabc74bff 100644
--- a/net-p2p/giftui/pkg-plist
+++ b/net-p2p/giftui/pkg-plist
@@ -1,21 +1,22 @@
 bin/giftui
-share/gnome/applications/giftui.desktop
-share/gnome/giftui/icons/fasttrack-down.png
-share/gnome/giftui/icons/fasttrack-network.png
-share/gnome/giftui/icons/fasttrack-search.png
-share/gnome/giftui/icons/fasttrack-up.png
-share/gnome/giftui/icons/gnutella-down.png
-share/gnome/giftui/icons/gnutella-network.png
-share/gnome/giftui/icons/gnutella-search.png
-share/gnome/giftui/icons/gnutella-up.png
-share/gnome/giftui/icons/openft-down.png
-share/gnome/giftui/icons/openft-network.png
-share/gnome/giftui/icons/openft-search.png
-share/gnome/giftui/icons/openft-up.png
-share/gnome/giftui/icons/opennap-down.png
-share/gnome/giftui/icons/opennap-network.png
-share/gnome/giftui/icons/opennap-search.png
-share/gnome/giftui/icons/opennap-up.png
-share/gnome/pixmaps/giftui.png
-@dirrm share/gnome/giftui/icons
-@dirrm share/gnome/giftui
+share/applications/giftui.desktop
+share/giftui/icons/fasttrack-down.png
+share/giftui/icons/fasttrack-network.png
+share/giftui/icons/fasttrack-search.png
+share/giftui/icons/fasttrack-up.png
+share/giftui/icons/gnutella-down.png
+share/giftui/icons/gnutella-network.png
+share/giftui/icons/gnutella-search.png
+share/giftui/icons/gnutella-up.png
+share/giftui/icons/openft-down.png
+share/giftui/icons/openft-network.png
+share/giftui/icons/openft-search.png
+share/giftui/icons/openft-up.png
+share/giftui/icons/opennap-down.png
+share/giftui/icons/opennap-network.png
+share/giftui/icons/opennap-search.png
+share/giftui/icons/opennap-up.png
+share/pixmaps/giftui.png
+@dirrm share/giftui/icons
+@dirrm share/giftui
+@dirrmtry share/applications
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index 3692ee21452..04ecda575b9 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Michael Johnson <ahze@ahze.net>
 #
 # $FreeBSD$
-#    $MCom: ports/net-p2p/gtorrentviewer/Makefile,v 1.2 2006/09/30 01:22:35 ahze Exp $
+#   $MCom: ports/net-p2p/gtorrentviewer/Makefile,v 1.4 2007/08/06 17:16:29 mezz Exp $
+#
 
 PORTNAME=	gtorrentviewer
 PORTVERSION=	0.2b
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,8 +26,8 @@ GNU_CONFIGURE=	yes
 USE_GETOPT_LONG=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-pixmapsdir=${PREFIX}/share/gnome/pixmaps \
-		--with-desktopdir=${PREFIX}/share/gnome/applications
+CONFIGURE_ARGS=	--with-pixmapsdir=${PREFIX}/share/pixmaps \
+		--with-desktopdir=${PREFIX}/share/applications
 
 MAN1=		gtorrentviewer.1
 DOCS=		AUTHORS COPYING ChangeLog README
diff --git a/net-p2p/gtorrentviewer/pkg-plist b/net-p2p/gtorrentviewer/pkg-plist
index d09d2ed6ce5..5fccb68c11b 100644
--- a/net-p2p/gtorrentviewer/pkg-plist
+++ b/net-p2p/gtorrentviewer/pkg-plist
@@ -16,9 +16,10 @@ share/GTorrentViewer/pixmaps/warning.png
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
-share/gnome/applications/gtorrentviewer.desktop
-share/gnome/pixmaps/gtorrentviewer.png
-share/gnome/pixmaps/gtorrentviewer.xpm
+share/applications/gtorrentviewer.desktop
+share/pixmaps/gtorrentviewer.png
+share/pixmaps/gtorrentviewer.xpm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/GTorrentViewer/pixmaps
 @dirrm share/GTorrentViewer
+@dirrmtry share/applications
diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile
index 7d61e9f4103..c9daf955d9c 100644
--- a/net-p2p/xmule/Makefile
+++ b/net-p2p/xmule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmule
 PORTVERSION=	1.12.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 #MASTER_SITES=	http://download.berlios.de/%SUBDIR%/
diff --git a/net-p2p/xmule/pkg-plist b/net-p2p/xmule/pkg-plist
index 2a4a5d69d73..0a897333fb5 100644
--- a/net-p2p/xmule/pkg-plist
+++ b/net-p2p/xmule/pkg-plist
@@ -1,7 +1,7 @@
 bin/xmule
 bin/xmule-ed2k-handler
-share/gnome/applications/xmule.desktop
-share/gnome/icons/xmule.xpm
+share/applications/xmule.desktop
+share/icons/xmule.xpm
 share/locale/de/LC_MESSAGES/xmule.mo
 share/locale/ee/LC_MESSAGES/xmule.mo
 share/locale/es/LC_MESSAGES/xmule.mo
@@ -11,4 +11,5 @@ share/locale/it/LC_MESSAGES/xmule.mo
 share/locale/ko/LC_MESSAGES/xmule.mo
 share/locale/pl/LC_MESSAGES/xmule.mo
 share/locale/tr/LC_MESSAGES/xmule.mo
-@dirrmtry share/gnome/locale
+@dirrmtry share/icons
+@dirrmtry share/applications