5 files changed, 205 insertions, 78 deletions

diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 714bba907d01..6897cdeb6a49 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	aMule
-PORTVERSION=	2.1.3
-PORTREVISION=	7
+PORTVERSION=	2.2.3
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/amule
 
-PATCH_SITES=	http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/
-PATCHFILES=	aMule-wx.patch?rev=1.2
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	boris@tagnet.ru
 COMMENT=	The all-platform eMule p2p client
 
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
+		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
+LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl
+
 LATEST_LINK=	aMule2
-CONFLICTS=	aMule-1.* aMule-devel-[0-9]* ed2k-hash-*
+CONFLICTS=	aMule-1.* aMule-devel-[0-9]* ed2k-hash-1.*
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
@@ -45,6 +44,11 @@ OPTIONS=	OPTIMIZE "Build with optimization" on \
 		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off \
 		WXUNICODE "Enable Unicode support" on
 
+DOCSDIR=	${PREFIX}/share/doc/aMule-${PORTVERSION}
+PORTDOCS=	ABOUT-NLS Changelog EC_Protocol.txt \
+		ED2K-Links.HOWTO INSTALL README TODO \
+		amule-win32.HOWTO.txt amulesig.txt license.txt socks4.protocol
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_NLS)
@@ -119,13 +123,13 @@ WX_UNICODE=yes
 post-install:
 # fr manpages are still incomplete and can't be managed
 # by MANLANG. Will be done when pages are complete.
+	${GZIP_CMD} ${PREFIX}/man/fr/man1/amule.1
 .if defined(WITH_AMULECMD)
 	${GZIP_CMD} ${PREFIX}/man/fr/man1/amulecmd.1
 .endif
 .if defined(WITH_AMULEWEBSRV)
 	${GZIP_CMD} ${PREFIX}/man/fr/man1/amuleweb.1
 .endif
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/amule.1
 .if defined(WITH_AMULEDAEMON)
 	${GZIP_CMD} ${PREFIX}/man/fr/man1/amuled.1
 .endif
diff --git a/net-p2p/amule/Makefile.man b/net-p2p/amule/Makefile.man
index 586cf50ea099..86506f0998be 100644
--- a/net-p2p/amule/Makefile.man
+++ b/net-p2p/amule/Makefile.man
@@ -1,25 +1,46 @@
 # TODO : Add fr here when pages are complete
-MANLANG=	"" de es hu
-MANCOMPRESSED=	no
+MANLANG=	"" de es eu hu
+#MANCOMPRESSED=	no
 .if defined(WITH_CAS)
-MAN1+=	cas.1
-MAN1+=	wxcas.1
+MAN1_EN+=	cas.1
+MAN1_EN+=	wxcas.1
+MAN1_DE+=	cas.1
+MAN1_DE+=	wxcas.1
+MAN1_ES+=	cas.1
+MAN1_ES+=	wxcas.1
+MAN1_EU+=	cas.1
+MAN1_EU+=	wxcas.1
+MAN1_HU+=	cas.1
+MAN1_HU+=	wxcas.1
 .endif
 .if defined(WITH_ALC)
-MAN1+=	alc.1
+MAN1_EN+=	alc.1
+MAN1_DE+=	alc.1
+MAN1_ES+=	alc.1
+MAN1_EU+=	alc.1
+MAN1_HU+=	alc.1
 MAN1+=	alcc.1
+MAN1_FR+=	alcc.1
 .endif
 .if defined(WITH_AMULEWEBSRV)
 MAN1+=	amuleweb.1
+MAN1_FR+=	amuleweb.1
 .endif
 .if defined(WITH_AMULECMD)
 MAN1+=	amulecmd.1
+MAN1_FR+=	amulecmd.1
 .endif
 .if defined(WITH_ED2K)
 MAN1+=	ed2k.1
+MAN1_FR+=	ed2k.1
 .endif
 .if defined(WITH_AMULEDAEMON)
 MAN1+=	amuled.1
+MAN1_EN+=	amulegui.1
 .endif
 MAN1+=	amule.1
-MAN1+=	xas.1
+MAN1_EN+=	xas.1
+MAN1_DE+=	xas.1
+MAN1_ES+=	xas.1
+MAN1_EU+=	xas.1
+MAN1_HU+=	xas.1
diff --git a/net-p2p/amule/distinfo b/net-p2p/amule/distinfo
index f4d9ebe17f39..eb5f8c59c6a1 100644
--- a/net-p2p/amule/distinfo
+++ b/net-p2p/amule/distinfo
@@ -1,6 +1,3 @@
-MD5 (aMule-2.1.3.tar.bz2) = 0aafdd159edb8ad5f0064da87998b47d
-SHA256 (aMule-2.1.3.tar.bz2) = 6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
-SIZE (aMule-2.1.3.tar.bz2) = 3248530
-MD5 (aMule-wx.patch?rev=1.2) = 7b61651b0abdee7dc577a03dad8025c1
-SHA256 (aMule-wx.patch?rev=1.2) = c0c0a55fb437fdf618137f2cb0c5ff59a1595aeddf5455a1bad2b2ab11b0a244
-SIZE (aMule-wx.patch?rev=1.2) = 4943
+MD5 (aMule-2.2.3.tar.bz2) = 64a0d41edbdd7cf36fa892e45a652bfd
+SHA256 (aMule-2.2.3.tar.bz2) = 8886215ae8b3aef74875cd1ace551109324649d1d353db6b0c1ac785f48dc44a
+SIZE (aMule-2.2.3.tar.bz2) = 4666001
diff --git a/net-p2p/amule/files/patch-amuleDlg.cpp b/net-p2p/amule/files/patch-amuleDlg.cpp
deleted file mode 100644
index 5ef977954dc5..000000000000
--- a/net-p2p/amule/files/patch-amuleDlg.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/amuleDlg.cpp.orig	Sun Jan  1 06:17:25 2006
-+++ src/amuleDlg.cpp	Tue Jan  3 19:12:04 2006
-@@ -413,9 +413,9 @@
- {
- 	wxString msg = wxT(" ");
- #ifdef CLIENT_GUI
--	msg << _("aMule remote control ") << wxT(VERSION);
-+	msg << _("aMule remote control ") << wxT(VERSION) << wxT(" for FreeBSD");
- #else
--	msg << wxT("aMule ") << wxT(VERSION);
-+	msg << wxT("aMule ") << wxT(VERSION) << wxT(" for FreeBSD");
- #endif
- 	msg << wxT(" ");
- #ifdef CVSDATE
-@@ -425,7 +425,8 @@
- 		" 'All-Platform' p2p client based on eMule \n\n"
- 		" Website: http://www.amule.org \n"
- 		" Forum: http://forum.amule.org \n"
--		" FAQ: http://wiki.amule.org \n\n"
-+		" FAQ: http://wiki.amule.org \n"
-+		" FreeBSD port: http://contribs.martymac.com \n\n"
- 		" Contact: admin@amule.org (administrative issues) \n"
- 		" Copyright (C) 2003-2006 aMule Team \n\n"
- 		" Part of aMule is based on \n"
diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
index aacd1a4949a0..0cbec9cad0e1 100644
--- a/net-p2p/amule/pkg-plist
+++ b/net-p2p/amule/pkg-plist
@@ -4,55 +4,107 @@
 %%PL_ED2K%%man/fr/man1/ed2k.1.gz
 %%PL_AMULEDAEMON%%man/fr/man1/amuled.1.gz
 man/fr/man1/amule.1.gz
+share/locale/ar/LC_MESSAGES/amule.mo
+share/locale/bg/LC_MESSAGES/amule.mo
+share/locale/ca/LC_MESSAGES/amule.mo
+share/locale/cs/LC_MESSAGES/amule.mo
+share/locale/da/LC_MESSAGES/amule.mo
+share/locale/de/LC_MESSAGES/amule.mo
+share/locale/el/LC_MESSAGES/amule.mo
 share/locale/en_GB/LC_MESSAGES/amule.mo
-share/locale/en_US/LC_MESSAGES/amule.mo
 share/locale/es/LC_MESSAGES/amule.mo
-share/locale/de/LC_MESSAGES/amule.mo
-share/locale/fr/LC_MESSAGES/amule.mo
-share/locale/it/LC_MESSAGES/amule.mo
-share/locale/ko_KR/LC_MESSAGES/amule.mo
-share/locale/pl/LC_MESSAGES/amule.mo
 share/locale/et_EE/LC_MESSAGES/amule.mo
-share/locale/ru/LC_MESSAGES/amule.mo
-share/locale/bg/LC_MESSAGES/amule.mo
-share/locale/es_MX/LC_MESSAGES/amule.mo
-share/locale/pt_BR/LC_MESSAGES/amule.mo
-share/locale/gl/LC_MESSAGES/amule.mo
 share/locale/eu/LC_MESSAGES/amule.mo
-share/locale/nl/LC_MESSAGES/amule.mo
-share/locale/ar/LC_MESSAGES/amule.mo
 share/locale/fi/LC_MESSAGES/amule.mo
-share/locale/zh_CN/LC_MESSAGES/amule.mo
-share/locale/zh_TW/LC_MESSAGES/amule.mo
-share/locale/da/LC_MESSAGES/amule.mo
+share/locale/fr/LC_MESSAGES/amule.mo
+share/locale/gl/LC_MESSAGES/amule.mo
+share/locale/he/LC_MESSAGES/amule.mo
+share/locale/hr/LC_MESSAGES/amule.mo
 share/locale/hu/LC_MESSAGES/amule.mo
-share/locale/ca/LC_MESSAGES/amule.mo
+share/locale/it/LC_MESSAGES/amule.mo
 share/locale/it_CH/LC_MESSAGES/amule.mo
+share/locale/ja/LC_MESSAGES/amule.mo
+share/locale/ko_KR/LC_MESSAGES/amule.mo
+share/locale/lt/LC_MESSAGES/amule.mo
+share/locale/nl/LC_MESSAGES/amule.mo
+share/locale/nn/LC_MESSAGES/amule.mo
+share/locale/pl/LC_MESSAGES/amule.mo
+share/locale/pt_BR/LC_MESSAGES/amule.mo
 share/locale/pt_PT/LC_MESSAGES/amule.mo
-share/locale/hr/LC_MESSAGES/amule.mo
+share/locale/ru/LC_MESSAGES/amule.mo
 share/locale/sl/LC_MESSAGES/amule.mo
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US
+share/locale/sq/LC_MESSAGES/amule.mo
+share/locale/sv/LC_MESSAGES/amule.mo
+share/locale/tr/LC_MESSAGES/amule.mo
+share/locale/uk/LC_MESSAGES/amule.mo
+share/locale/zh_CN/LC_MESSAGES/amule.mo
+share/locale/zh_TW/LC_MESSAGES/amule.mo
+@dirrmtry share/locale/ar/LC_MESSAGES
+@dirrmtry share/locale/ar
+@dirrmtry share/locale/bg/LC_MESSAGES
+@dirrmtry share/locale/bg
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/da/LC_MESSAGES
+@dirrmtry share/locale/da
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/en_GB/LC_MESSAGES
+@dirrmtry share/locale/en_GB
+@dirrmtry share/locale/es/LC_MESSAGES
+@dirrmtry share/locale/es
 @dirrmtry share/locale/et_EE/LC_MESSAGES
 @dirrmtry share/locale/et_EE
+@dirrmtry share/locale/eu/LC_MESSAGES
+@dirrmtry share/locale/eu
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/he/LC_MESSAGES
+@dirrmtry share/locale/he
+@dirrmtry share/locale/hr/LC_MESSAGES
+@dirrmtry share/locale/hr
+@dirrmtry share/locale/hu/LC_MESSAGES
+@dirrmtry share/locale/hu
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/it
 @dirrmtry share/locale/it_CH/LC_MESSAGES
 @dirrmtry share/locale/it_CH
+@dirrmtry share/locale/ja/LC_MESSAGES
+@dirrmtry share/locale/ja
 @dirrmtry share/locale/ko_KR/LC_MESSAGES
 @dirrmtry share/locale/ko_KR
-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
+@dirrmtry share/locale/lt/LC_MESSAGES
+@dirrmtry share/locale/lt
+@dirrmtry share/locale/nl/LC_MESSAGES
+@dirrmtry share/locale/nl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/pt_BR/LC_MESSAGES
+@dirrmtry share/locale/pt_BR
+@dirrmtry share/locale/ru/LC_MESSAGES
+@dirrmtry share/locale/ru
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sq/LC_MESSAGES
+@dirrmtry share/locale/sq
+@dirrmtry share/locale/sv/LC_MESSAGES
+@dirrmtry share/locale/sv
+@dirrmtry share/locale/tr/LC_MESSAGES
+@dirrmtry share/locale/tr
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 %%PL_CAS%%share/cas/tmp.html
 %%PL_CAS%%share/cas/stat.png
 %%PL_CAS%%@dirrmtry share/cas
@@ -222,16 +274,93 @@ share/applications/amule.desktop
 %%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%%share/amule/webserver/litoral/amuleweb-main-dload.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-kad.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-log.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-prefs.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-search.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-servers.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-shared.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/amuleweb-main-stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/black.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blank1x1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue1.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue2.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue3.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue4.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue5.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/blue6.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/cancel.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/close.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/col.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/connect.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/down.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/edkserv_0.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/edkserv_1.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/favicon.ico
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/filter.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/fond.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/fond_haut.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/footer.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/index.html
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/kitty.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/log.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/login.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/loginfond.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/loginfond_haut.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/loginlogo.jpg
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/loginlogo.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/logo.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/maquette.dwt
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/ok.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/pause.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/play.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/red.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/refresh.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/search_0.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/search_1.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/shared_0.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/shared_1.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/sheserv_0.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/sheserv_1.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/stats.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/stats_0.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/stats_1.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/stats_tree.php
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/style.css
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_bottom.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_bottom_left.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_bottom_right.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_left.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_right.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_top.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_top_left.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tab_top_right.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/transf_0.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/transf_1.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tree-closed.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tree-leaf.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/tree-open.gif
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/up.png
+%%PL_AMULEWEBSRV%%share/amule/webserver/litoral/yellow.gif
 %%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/litoral
 %%PL_AMULEWEBSRV%%@dirrmtry share/amule/webserver
 %%PL_AMULEWEBSRV%%@dirrmtry share/amule
+share/amule/skins/gnome.zip
+share/amule/skins/kde4.zip
+share/amule/skins/tango.zip
+share/amule/skins/xfce.zip
+@dirrm share/amule/skins
+@dirrm share/amule
 lib/xchat/plugins/xas.pl
 @dirrmtry lib/xchat/plugins
 @dirrmtry lib/xchat
 %%PL_CAS%%bin/cas
 %%PL_CAS%%bin/wxcas
+%%PL_CAS%%bin/autostart-xas
 %%PL_ALC%%bin/alc
 %%PL_ALC%%bin/alcc
 %%PL_AMULEWEBSRV%%bin/amuleweb