Index: head/net-p2p/amule/Makefile
===================================================================
--- head/net-p2p/amule/Makefile	(revision 231606)
+++ head/net-p2p/amule/Makefile	(revision 231607)
@@ -1,143 +1,133 @@
 # New ports collection makefile for:	amule2
 # Date created:		Wed Nov 05 09:30:00 UTC 2003
 # Whom:			Ganael LAPLANCHE <ganael.laplanche@martymac.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	aMule
-PORTVERSION=	2.2.3
+PORTVERSION=	2.2.4
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/amule
 
 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-1.*
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug \
 		--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
-		--enable-embedded_crypto
+		--with-crypto-prefix=${LOCALBASE} \
+		--disable-upnp \
+		--with-denoise-level=0
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 OPTIONS=	OPTIMIZE "Build with optimization" on \
 		ED2K "Compile aMule ed2k links handler" on \
 		AMULECMD "Compile aMule command line client" on \
 		AMULEWEBSRV "Compile aMule WebServer" on \
 		CAS "Compile C aMule Statistics (+GUI)" on \
 		ALC "Compile aMule Link Creator (+GUI)" on \
 		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off \
-		WXUNICODE "Enable Unicode support" on
+		WXUNICODE "Enable Unicode support" on \
+		GEOIP "Enable GeoIP IP2Country support" off
 
 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)
 USE_GETTEXT=	yes
 .else
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
 # Configure options
 .if !defined(WITHOUT_OPTIMIZE)
 CONFIGURE_ARGS+=	--enable-optimize
 .else
 CONFIGURE_ARGS+=	--disable-optimize
 .endif
 
 .if !defined(WITHOUT_ED2K)
 CONFIGURE_ARGS+=	--enable-ed2k
 PLIST_SUB+=		PL_ED2K=""
 .else
 CONFIGURE_ARGS+=	--disable-ed2k
 PLIST_SUB+=		PL_ED2K="@comment "
 .endif
 
 .if !defined(WITHOUT_AMULECMD)
 CONFIGURE_ARGS+=	--enable-amulecmd
 PLIST_SUB+=		PL_AMULECMD=""
 .else
 CONFIGURE_ARGS+=	--disable-amulecmd
 PLIST_SUB+=		PL_AMULECMD="@comment "
 .endif
 
 .if !defined(WITHOUT_AMULEWEBSRV)
 CONFIGURE_ARGS+=	--enable-webserver
 PLIST_SUB+=		PL_AMULEWEBSRV=""
 .else
 CONFIGURE_ARGS+=	--disable-webserver
 PLIST_SUB+=		PL_AMULEWEBSRV="@comment "
 .endif
 
 .if !defined(WITHOUT_CAS)
 CONFIGURE_ARGS+=	--enable-cas --enable-wxcas
 PLIST_SUB+=		PL_CAS=""
 .else
 CONFIGURE_ARGS+=	--disable-cas --disable-wxcas
 PLIST_SUB+=		PL_CAS="@comment "
 .endif
 
 .if !defined(WITHOUT_ALC)
 CONFIGURE_ARGS+=	--enable-alc --enable-alcc
 PLIST_SUB+=		PL_ALC=""
 .else
 CONFIGURE_ARGS+=	--disable-alc --disable-alcc
 PLIST_SUB+=		PL_ALC="@comment "
 .endif
 
 .if defined(WITH_AMULEDAEMON)
 CONFIGURE_ARGS+=	--enable-amule-daemon --enable-amule-gui
 PLIST_SUB+=		PL_AMULEDAEMON=""
 USE_RC_SUBR=		amuled.sh
 .else
 CONFIGURE_ARGS+=	--disable-amule-daemon --disable-amule-gui
 PLIST_SUB+=		PL_AMULEDAEMON="@comment "
 .endif
 
+.if defined(WITH_GEOIP)
+CONFIGURE_ARGS+=	--enable-geoip
+LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
+.else
+CONFIGURE_ARGS+=	--disable-geoip
+.endif
+
 .if !defined(WITHOUT_WXUNICODE)
 WX_UNICODE=yes
 .endif
 
 # Man pages management
 .include "Makefile.man"
-
-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
-.if defined(WITH_AMULEDAEMON)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/amuled.1
-.endif
-.if defined(WITH_ED2K)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/ed2k.1
-.endif
-.if defined(WITH_ALC)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/alcc.1
-.endif
 
 .include <bsd.port.post.mk>

Property changes on: head/net-p2p/amule/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.25
\ No newline at end of property
+1.26
\ No newline at end of property
Index: head/net-p2p/amule/Makefile.man
===================================================================
--- head/net-p2p/amule/Makefile.man	(revision 231606)
+++ head/net-p2p/amule/Makefile.man	(revision 231607)
@@ -1,46 +1,43 @@
 # TODO : Add fr here when pages are complete
-MANLANG=	"" de es eu hu
+MANLANG=	"" de es eu fr hu
 #MANCOMPRESSED=	no
 .if defined(WITH_CAS)
 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_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
+MAN1_DE+=	amulegui.1
 .endif
-MAN1+=	amule.1
+MAN1+=		amule.1
 MAN1_EN+=	xas.1
 MAN1_DE+=	xas.1
 MAN1_ES+=	xas.1
 MAN1_EU+=	xas.1
 MAN1_HU+=	xas.1

Property changes on: head/net-p2p/amule/Makefile.man
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net-p2p/amule/distinfo
===================================================================
--- head/net-p2p/amule/distinfo	(revision 231606)
+++ head/net-p2p/amule/distinfo	(revision 231607)
@@ -1,3 +1,3 @@
-MD5 (aMule-2.2.3.tar.bz2) = 64a0d41edbdd7cf36fa892e45a652bfd
-SHA256 (aMule-2.2.3.tar.bz2) = 8886215ae8b3aef74875cd1ace551109324649d1d353db6b0c1ac785f48dc44a
-SIZE (aMule-2.2.3.tar.bz2) = 4666001
+MD5 (aMule-2.2.4.tar.bz2) = 283c428dd2961a57f2691c455c845a42
+SHA256 (aMule-2.2.4.tar.bz2) = ff5c243a401ebde5ae40ffc72bb210f2cde2d0af1dffd76499188554e197d5da
+SIZE (aMule-2.2.4.tar.bz2) = 4705472

Property changes on: head/net-p2p/amule/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/net-p2p/amule/pkg-plist
===================================================================
--- head/net-p2p/amule/pkg-plist	(revision 231606)
+++ head/net-p2p/amule/pkg-plist	(revision 231607)
@@ -1,372 +1,371 @@
-%%PL_ALC%%man/fr/man1/alcc.1.gz
-%%PL_AMULEWEBSRV%%man/fr/man1/amuleweb.1.gz
-%%PL_AMULECMD%%man/fr/man1/amulecmd.1.gz
-%%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/ast/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/es/LC_MESSAGES/amule.mo
 share/locale/et_EE/LC_MESSAGES/amule.mo
 share/locale/eu/LC_MESSAGES/amule.mo
 share/locale/fi/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/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/ru/LC_MESSAGES/amule.mo
 share/locale/sl/LC_MESSAGES/amule.mo
 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/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @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
 @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
 %%PL_CAS%%share/pixmaps/wxcas.xpm
 %%PL_ALC%%share/pixmaps/alc.xpm
+%%PL_AMULEDAEMON%%share/pixmaps/amulegui.xpm
 share/pixmaps/amule.xpm
 %%PL_CAS%%share/applications/wxcas.desktop
 %%PL_ALC%%share/applications/alc.desktop
+%%PL_AMULEDAEMON%%share/applications/amulegui.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%%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
 %%PL_AMULECMD%%bin/amulecmd
 %%PL_ED2K%%bin/ed2k
 %%PL_AMULEDAEMON%%bin/amulegui
 %%PL_AMULEDAEMON%%bin/amuled
 bin/amule
 @dirrmtry share/applications

Property changes on: head/net-p2p/amule/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/net-p2p/amule-devel/Makefile
===================================================================
--- head/net-p2p/amule-devel/Makefile	(revision 231606)
+++ head/net-p2p/amule-devel/Makefile	(revision 231607)
@@ -1,143 +1,133 @@
 # New ports collection makefile for:	amule2
 # Date created:		Wed Nov 05 09:30:00 UTC 2003
 # Whom:			Ganael LAPLANCHE <ganael.laplanche@martymac.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	aMule
-PORTVERSION=	2.2.3
+PORTVERSION=	2.2.4
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/amule
 
 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-1.*
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug \
 		--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
-		--enable-embedded_crypto
+		--with-crypto-prefix=${LOCALBASE} \
+		--disable-upnp \
+		--with-denoise-level=0
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 OPTIONS=	OPTIMIZE "Build with optimization" on \
 		ED2K "Compile aMule ed2k links handler" on \
 		AMULECMD "Compile aMule command line client" on \
 		AMULEWEBSRV "Compile aMule WebServer" on \
 		CAS "Compile C aMule Statistics (+GUI)" on \
 		ALC "Compile aMule Link Creator (+GUI)" on \
 		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off \
-		WXUNICODE "Enable Unicode support" on
+		WXUNICODE "Enable Unicode support" on \
+		GEOIP "Enable GeoIP IP2Country support" off
 
 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)
 USE_GETTEXT=	yes
 .else
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
 # Configure options
 .if !defined(WITHOUT_OPTIMIZE)
 CONFIGURE_ARGS+=	--enable-optimize
 .else
 CONFIGURE_ARGS+=	--disable-optimize
 .endif
 
 .if !defined(WITHOUT_ED2K)
 CONFIGURE_ARGS+=	--enable-ed2k
 PLIST_SUB+=		PL_ED2K=""
 .else
 CONFIGURE_ARGS+=	--disable-ed2k
 PLIST_SUB+=		PL_ED2K="@comment "
 .endif
 
 .if !defined(WITHOUT_AMULECMD)
 CONFIGURE_ARGS+=	--enable-amulecmd
 PLIST_SUB+=		PL_AMULECMD=""
 .else
 CONFIGURE_ARGS+=	--disable-amulecmd
 PLIST_SUB+=		PL_AMULECMD="@comment "
 .endif
 
 .if !defined(WITHOUT_AMULEWEBSRV)
 CONFIGURE_ARGS+=	--enable-webserver
 PLIST_SUB+=		PL_AMULEWEBSRV=""
 .else
 CONFIGURE_ARGS+=	--disable-webserver
 PLIST_SUB+=		PL_AMULEWEBSRV="@comment "
 .endif
 
 .if !defined(WITHOUT_CAS)
 CONFIGURE_ARGS+=	--enable-cas --enable-wxcas
 PLIST_SUB+=		PL_CAS=""
 .else
 CONFIGURE_ARGS+=	--disable-cas --disable-wxcas
 PLIST_SUB+=		PL_CAS="@comment "
 .endif
 
 .if !defined(WITHOUT_ALC)
 CONFIGURE_ARGS+=	--enable-alc --enable-alcc
 PLIST_SUB+=		PL_ALC=""
 .else
 CONFIGURE_ARGS+=	--disable-alc --disable-alcc
 PLIST_SUB+=		PL_ALC="@comment "
 .endif
 
 .if defined(WITH_AMULEDAEMON)
 CONFIGURE_ARGS+=	--enable-amule-daemon --enable-amule-gui
 PLIST_SUB+=		PL_AMULEDAEMON=""
 USE_RC_SUBR=		amuled.sh
 .else
 CONFIGURE_ARGS+=	--disable-amule-daemon --disable-amule-gui
 PLIST_SUB+=		PL_AMULEDAEMON="@comment "
 .endif
 
+.if defined(WITH_GEOIP)
+CONFIGURE_ARGS+=	--enable-geoip
+LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
+.else
+CONFIGURE_ARGS+=	--disable-geoip
+.endif
+
 .if !defined(WITHOUT_WXUNICODE)
 WX_UNICODE=yes
 .endif
 
 # Man pages management
 .include "Makefile.man"
-
-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
-.if defined(WITH_AMULEDAEMON)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/amuled.1
-.endif
-.if defined(WITH_ED2K)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/ed2k.1
-.endif
-.if defined(WITH_ALC)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/alcc.1
-.endif
 
 .include <bsd.port.post.mk>

Property changes on: head/net-p2p/amule-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.25
\ No newline at end of property
+1.26
\ No newline at end of property
Index: head/net-p2p/amule-devel/Makefile.man
===================================================================
--- head/net-p2p/amule-devel/Makefile.man	(revision 231606)
+++ head/net-p2p/amule-devel/Makefile.man	(revision 231607)
@@ -1,46 +1,43 @@
 # TODO : Add fr here when pages are complete
-MANLANG=	"" de es eu hu
+MANLANG=	"" de es eu fr hu
 #MANCOMPRESSED=	no
 .if defined(WITH_CAS)
 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_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
+MAN1_DE+=	amulegui.1
 .endif
-MAN1+=	amule.1
+MAN1+=		amule.1
 MAN1_EN+=	xas.1
 MAN1_DE+=	xas.1
 MAN1_ES+=	xas.1
 MAN1_EU+=	xas.1
 MAN1_HU+=	xas.1

Property changes on: head/net-p2p/amule-devel/Makefile.man
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net-p2p/amule-devel/distinfo
===================================================================
--- head/net-p2p/amule-devel/distinfo	(revision 231606)
+++ head/net-p2p/amule-devel/distinfo	(revision 231607)
@@ -1,3 +1,3 @@
-MD5 (aMule-2.2.3.tar.bz2) = 64a0d41edbdd7cf36fa892e45a652bfd
-SHA256 (aMule-2.2.3.tar.bz2) = 8886215ae8b3aef74875cd1ace551109324649d1d353db6b0c1ac785f48dc44a
-SIZE (aMule-2.2.3.tar.bz2) = 4666001
+MD5 (aMule-2.2.4.tar.bz2) = 283c428dd2961a57f2691c455c845a42
+SHA256 (aMule-2.2.4.tar.bz2) = ff5c243a401ebde5ae40ffc72bb210f2cde2d0af1dffd76499188554e197d5da
+SIZE (aMule-2.2.4.tar.bz2) = 4705472

Property changes on: head/net-p2p/amule-devel/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/net-p2p/amule-devel/pkg-plist
===================================================================
--- head/net-p2p/amule-devel/pkg-plist	(revision 231606)
+++ head/net-p2p/amule-devel/pkg-plist	(revision 231607)
@@ -1,372 +1,371 @@
-%%PL_ALC%%man/fr/man1/alcc.1.gz
-%%PL_AMULEWEBSRV%%man/fr/man1/amuleweb.1.gz
-%%PL_AMULECMD%%man/fr/man1/amulecmd.1.gz
-%%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/ast/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/es/LC_MESSAGES/amule.mo
 share/locale/et_EE/LC_MESSAGES/amule.mo
 share/locale/eu/LC_MESSAGES/amule.mo
 share/locale/fi/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/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/ru/LC_MESSAGES/amule.mo
 share/locale/sl/LC_MESSAGES/amule.mo
 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/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @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
 @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
 %%PL_CAS%%share/pixmaps/wxcas.xpm
 %%PL_ALC%%share/pixmaps/alc.xpm
+%%PL_AMULEDAEMON%%share/pixmaps/amulegui.xpm
 share/pixmaps/amule.xpm
 %%PL_CAS%%share/applications/wxcas.desktop
 %%PL_ALC%%share/applications/alc.desktop
+%%PL_AMULEDAEMON%%share/applications/amulegui.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%%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
 %%PL_AMULECMD%%bin/amulecmd
 %%PL_ED2K%%bin/ed2k
 %%PL_AMULEDAEMON%%bin/amulegui
 %%PL_AMULEDAEMON%%bin/amuled
 bin/amule
 @dirrmtry share/applications

Property changes on: head/net-p2p/amule-devel/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/net-p2p/amule2/Makefile
===================================================================
--- head/net-p2p/amule2/Makefile	(revision 231606)
+++ head/net-p2p/amule2/Makefile	(revision 231607)
@@ -1,143 +1,133 @@
 # New ports collection makefile for:	amule2
 # Date created:		Wed Nov 05 09:30:00 UTC 2003
 # Whom:			Ganael LAPLANCHE <ganael.laplanche@martymac.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	aMule
-PORTVERSION=	2.2.3
+PORTVERSION=	2.2.4
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/amule
 
 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-1.*
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug \
 		--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
-		--enable-embedded_crypto
+		--with-crypto-prefix=${LOCALBASE} \
+		--disable-upnp \
+		--with-denoise-level=0
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 OPTIONS=	OPTIMIZE "Build with optimization" on \
 		ED2K "Compile aMule ed2k links handler" on \
 		AMULECMD "Compile aMule command line client" on \
 		AMULEWEBSRV "Compile aMule WebServer" on \
 		CAS "Compile C aMule Statistics (+GUI)" on \
 		ALC "Compile aMule Link Creator (+GUI)" on \
 		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off \
-		WXUNICODE "Enable Unicode support" on
+		WXUNICODE "Enable Unicode support" on \
+		GEOIP "Enable GeoIP IP2Country support" off
 
 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)
 USE_GETTEXT=	yes
 .else
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
 # Configure options
 .if !defined(WITHOUT_OPTIMIZE)
 CONFIGURE_ARGS+=	--enable-optimize
 .else
 CONFIGURE_ARGS+=	--disable-optimize
 .endif
 
 .if !defined(WITHOUT_ED2K)
 CONFIGURE_ARGS+=	--enable-ed2k
 PLIST_SUB+=		PL_ED2K=""
 .else
 CONFIGURE_ARGS+=	--disable-ed2k
 PLIST_SUB+=		PL_ED2K="@comment "
 .endif
 
 .if !defined(WITHOUT_AMULECMD)
 CONFIGURE_ARGS+=	--enable-amulecmd
 PLIST_SUB+=		PL_AMULECMD=""
 .else
 CONFIGURE_ARGS+=	--disable-amulecmd
 PLIST_SUB+=		PL_AMULECMD="@comment "
 .endif
 
 .if !defined(WITHOUT_AMULEWEBSRV)
 CONFIGURE_ARGS+=	--enable-webserver
 PLIST_SUB+=		PL_AMULEWEBSRV=""
 .else
 CONFIGURE_ARGS+=	--disable-webserver
 PLIST_SUB+=		PL_AMULEWEBSRV="@comment "
 .endif
 
 .if !defined(WITHOUT_CAS)
 CONFIGURE_ARGS+=	--enable-cas --enable-wxcas
 PLIST_SUB+=		PL_CAS=""
 .else
 CONFIGURE_ARGS+=	--disable-cas --disable-wxcas
 PLIST_SUB+=		PL_CAS="@comment "
 .endif
 
 .if !defined(WITHOUT_ALC)
 CONFIGURE_ARGS+=	--enable-alc --enable-alcc
 PLIST_SUB+=		PL_ALC=""
 .else
 CONFIGURE_ARGS+=	--disable-alc --disable-alcc
 PLIST_SUB+=		PL_ALC="@comment "
 .endif
 
 .if defined(WITH_AMULEDAEMON)
 CONFIGURE_ARGS+=	--enable-amule-daemon --enable-amule-gui
 PLIST_SUB+=		PL_AMULEDAEMON=""
 USE_RC_SUBR=		amuled.sh
 .else
 CONFIGURE_ARGS+=	--disable-amule-daemon --disable-amule-gui
 PLIST_SUB+=		PL_AMULEDAEMON="@comment "
 .endif
 
+.if defined(WITH_GEOIP)
+CONFIGURE_ARGS+=	--enable-geoip
+LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
+.else
+CONFIGURE_ARGS+=	--disable-geoip
+.endif
+
 .if !defined(WITHOUT_WXUNICODE)
 WX_UNICODE=yes
 .endif
 
 # Man pages management
 .include "Makefile.man"
-
-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
-.if defined(WITH_AMULEDAEMON)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/amuled.1
-.endif
-.if defined(WITH_ED2K)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/ed2k.1
-.endif
-.if defined(WITH_ALC)
-	${GZIP_CMD} ${PREFIX}/man/fr/man1/alcc.1
-.endif
 
 .include <bsd.port.post.mk>

Property changes on: head/net-p2p/amule2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.25
\ No newline at end of property
+1.26
\ No newline at end of property
Index: head/net-p2p/amule2/Makefile.man
===================================================================
--- head/net-p2p/amule2/Makefile.man	(revision 231606)
+++ head/net-p2p/amule2/Makefile.man	(revision 231607)
@@ -1,46 +1,43 @@
 # TODO : Add fr here when pages are complete
-MANLANG=	"" de es eu hu
+MANLANG=	"" de es eu fr hu
 #MANCOMPRESSED=	no
 .if defined(WITH_CAS)
 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_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
+MAN1_DE+=	amulegui.1
 .endif
-MAN1+=	amule.1
+MAN1+=		amule.1
 MAN1_EN+=	xas.1
 MAN1_DE+=	xas.1
 MAN1_ES+=	xas.1
 MAN1_EU+=	xas.1
 MAN1_HU+=	xas.1

Property changes on: head/net-p2p/amule2/Makefile.man
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net-p2p/amule2/distinfo
===================================================================
--- head/net-p2p/amule2/distinfo	(revision 231606)
+++ head/net-p2p/amule2/distinfo	(revision 231607)
@@ -1,3 +1,3 @@
-MD5 (aMule-2.2.3.tar.bz2) = 64a0d41edbdd7cf36fa892e45a652bfd
-SHA256 (aMule-2.2.3.tar.bz2) = 8886215ae8b3aef74875cd1ace551109324649d1d353db6b0c1ac785f48dc44a
-SIZE (aMule-2.2.3.tar.bz2) = 4666001
+MD5 (aMule-2.2.4.tar.bz2) = 283c428dd2961a57f2691c455c845a42
+SHA256 (aMule-2.2.4.tar.bz2) = ff5c243a401ebde5ae40ffc72bb210f2cde2d0af1dffd76499188554e197d5da
+SIZE (aMule-2.2.4.tar.bz2) = 4705472

Property changes on: head/net-p2p/amule2/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/net-p2p/amule2/pkg-plist
===================================================================
--- head/net-p2p/amule2/pkg-plist	(revision 231606)
+++ head/net-p2p/amule2/pkg-plist	(revision 231607)
@@ -1,372 +1,371 @@
-%%PL_ALC%%man/fr/man1/alcc.1.gz
-%%PL_AMULEWEBSRV%%man/fr/man1/amuleweb.1.gz
-%%PL_AMULECMD%%man/fr/man1/amulecmd.1.gz
-%%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/ast/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/es/LC_MESSAGES/amule.mo
 share/locale/et_EE/LC_MESSAGES/amule.mo
 share/locale/eu/LC_MESSAGES/amule.mo
 share/locale/fi/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/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/ru/LC_MESSAGES/amule.mo
 share/locale/sl/LC_MESSAGES/amule.mo
 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/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @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
 @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
 %%PL_CAS%%share/pixmaps/wxcas.xpm
 %%PL_ALC%%share/pixmaps/alc.xpm
+%%PL_AMULEDAEMON%%share/pixmaps/amulegui.xpm
 share/pixmaps/amule.xpm
 %%PL_CAS%%share/applications/wxcas.desktop
 %%PL_ALC%%share/applications/alc.desktop
+%%PL_AMULEDAEMON%%share/applications/amulegui.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%%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
 %%PL_AMULECMD%%bin/amulecmd
 %%PL_ED2K%%bin/ed2k
 %%PL_AMULEDAEMON%%bin/amulegui
 %%PL_AMULEDAEMON%%bin/amuled
 bin/amule
 @dirrmtry share/applications

Property changes on: head/net-p2p/amule2/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property