- Split amule into amule and amule-devel

PR:             ports/150985
Submitted by:   swell.k@gmail.com (maintainer)

8 files changed, 395 insertions, 196 deletions

diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 077324f14f40..862b2fc929f7 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	amule2
+# New ports collection makefile for:	amule-devel
 # Date created:		Wed Nov 05 09:30:00 UTC 2003
 # Whom:			Ganael LAPLANCHE <ganael.laplanche@martymac.org>
 #
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	amule
-PORTVERSION=	10275
+PORTVERSION=	10305
 CATEGORIES=	net-p2p
-MASTER_SITES=	LOCAL/pav \
-		http://repo.or.cz/w/${PORTNAME}.git/snapshot/
-DISTNAME=	${PORTNAME}-svn-r${PORTVERSION}
+MASTER_SITES=	http://amule.sourceforge.net/tarballs/
+PKGNAMESUFFIX=	-devel
+DISTNAME=	aMule-SVN-r${PORTVERSION}
 
 MAINTAINER=	swell.k@gmail.com
 COMMENT=	The all-platform eMule p2p client
@@ -18,11 +18,9 @@ COMMENT=	The all-platform eMule p2p client
 BUILD_DEPENDS=	${FLEX}:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
 
-LATEST_LINK=	amule2
-CONFLICTS=	aMule-[0-9]* aMule-devel-[0-9]* ed2k-hash-[0-9]*
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
+CONFLICTS=	amule-[0-9]*
 
+USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
 USE_GMAKE=	yes
 USE_KDE4=	# empty
@@ -40,17 +38,21 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
-OPTIONS=	ALC "Compile aMule Link Creator (+GUI)" on \
+OPTIONS=	ALC "Compile aMule Link Creator for GUI" on \
+		ALCC "Compile aMule Link Creator for console" on \
 		AMULECMD "Compile aMule command line client" on \
 		AMULEDAEMON "Compile aMule daemon version" on \
 		AMULEGUI "Compile aMule remote GUI (EXPERIMENTAL)" on \
-		CAS "Compile C aMule Statistics (+GUI)" on \
+		CAS "Compile aMule Statistics for console" on \
 		ED2K "Compile aMule ed2k links handler" on \
+		FILEVIEW "Compile file viewer for console (EXPERIMENTAL)" on \
 		GEOIP "Enable GeoIP IP2Country support" off \
 		MMAP "Enable using mapped memory" off \
+		MONOLITHIC "Compile monolithic aMule" on \
 		PLASMAMULE "Compile aMule plasma applet and engine" off \
 		UPNP "Enable Universal Plug and Play support" off \
 		WEBSERVER "Compile aMule WebServer" on \
+		WXCAS "Compile aMule Statistics for GUI" on \
 		WXUNICODE "Enable Unicode support" on \
 		XAS "Install XChat2 plugin" on
 
@@ -76,13 +78,21 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if !defined(WITHOUT_ALC)
-CONFIGURE_ARGS+=	--enable-alc --enable-alcc
+CONFIGURE_ARGS+=	--enable-alc
 PLIST_SUB+=		ALC=""
 .else
-CONFIGURE_ARGS+=	--disable-alc --disable-alcc
+CONFIGURE_ARGS+=	--disable-alc
 PLIST_SUB+=		ALC="@comment "
 .endif
 
+.if !defined(WITHOUT_ALCC)
+CONFIGURE_ARGS+=	--enable-alcc
+PLIST_SUB+=		ALCC=""
+.else
+CONFIGURE_ARGS+=	--disable-alcc
+PLIST_SUB+=		ALCC="@comment "
+.endif
+
 .if !defined(WITHOUT_AMULECMD)
 CONFIGURE_ARGS+=	--enable-amulecmd
 PLIST_SUB+=		AMULECMD=""
@@ -109,15 +119,16 @@ PLIST_SUB+=		AMULEGUI="@comment "
 .endif
 
 .if !defined(WITHOUT_CAS)
-CONFIGURE_ARGS+=	--enable-cas --enable-wxcas
+CONFIGURE_ARGS+=	--enable-cas
 LIB_DEPENDS+=		gd.4:${PORTSDIR}/graphics/gd
 PLIST_SUB+=		CAS=""
 .else
-CONFIGURE_ARGS+=	--disable-cas --disable-wxcas
+CONFIGURE_ARGS+=	--disable-cas
 PLIST_SUB+=		CAS="@comment "
 .endif
 
 .if !defined(WITHOUT_ED2K)
+CONFLICTS+=		ed2k-hash-[0-9]*
 CONFIGURE_ARGS+=	--enable-ed2k
 PLIST_SUB+=		ED2K=""
 .else
@@ -125,6 +136,14 @@ CONFIGURE_ARGS+=	--disable-ed2k
 PLIST_SUB+=		ED2K="@comment "
 .endif
 
+.if !defined(WITHOUT_FILEVIEW)
+CONFIGURE_ARGS+=	--enable-fileview
+PLIST_SUB+=		FILEVIEW=""
+.else
+CONFIGURE_ARGS+=	--disable-fileview
+PLIST_SUB+=		FILEVIEW="@comment "
+.endif
+
 .if !defined(WITHOUT_GEOIP)
 CONFIGURE_ARGS+=	--enable-geoip
 LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
@@ -138,6 +157,14 @@ CONFIGURE_ARGS+=	--enable-mmap
 CONFIGURE_ARGS+=	--disable-mmap
 .endif
 
+.if !defined(WITHOUT_MONOLITHIC)
+CONFIGURE_ARGS+=	--enable-monolithic
+PLIST_SUB+=		MONOLITHIC=""
+.else
+CONFIGURE_ARGS+=	--disable-monolithic
+PLIST_SUB+=		MONOLITHIC="@comment "
+.endif
+
 .if !defined(WITHOUT_PLASMAMULE)
 CONFIGURE_ENV+=		ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config
 CONFIGURE_ARGS+=	--enable-plasmamule
@@ -163,6 +190,14 @@ CONFIGURE_ARGS+=	--disable-webserver
 PLIST_SUB+=		WEBSERVER="@comment "
 .endif
 
+.if !defined(WITHOUT_WXCAS)
+CONFIGURE_ARGS+=	--enable-wxcas
+PLIST_SUB+=		WXCAS=""
+.else
+CONFIGURE_ARGS+=	--disable-wxcas
+PLIST_SUB+=		WXCAS="@comment "
+.endif
+
 .if !defined(WITHOUT_WXUNICODE)
 WX_UNICODE=		yes
 .endif
@@ -183,7 +218,8 @@ post-patch:	.SILENT
 		-e 's/test.*-print-file-name.*`/true/' \
 		${WRKSRC}/configure
 .if defined(NOPORTDOCS)
-	${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' ${WRKSRC}/docs/Makefile.in
+	${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \
+		${WRKSRC}/docs/Makefile.in
 .endif
 .if !defined(WITHOUT_PLASMAMULE)
 	${REINPLACE_CMD} -e 's|@prefix@|${KDE4_PREFIX}|' \
@@ -194,6 +230,9 @@ post-patch:	.SILENT
 .endif
 
 post-install:
+.if !defined(WITHOUT_FILEVIEW)
+	${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${PREFIX}/bin
+.endif
 .if !defined(WITHOUT_PLASMAMULE)
 	-update-desktop-database ${KDE4_PREFIX}/share/applications
 	-update-mime-database ${KDE4_PREFIX}/share/mime
diff --git a/net-p2p/amule-devel/Makefile.man b/net-p2p/amule-devel/Makefile.man
index 24ae456e5b5e..741e8ecc2338 100644
--- a/net-p2p/amule-devel/Makefile.man
+++ b/net-p2p/amule-devel/Makefile.man
@@ -3,15 +3,25 @@ MANLANG=	"" de es eu fr hu it
 #MANCOMPRESSED=	no
 
 .if !defined(WITHOUT_NLS)
+. if !defined(WITHOUT_MONOLITHIC)
 MAN1+=		amule.1
+. endif
 . if !defined(WITHOUT_ALC)
-MAN1_EN+=	alc.1 alcc.1
-MAN1_DE+=	alc.1 alcc.1
-MAN1_ES+=	alc.1 alcc.1
-MAN1_EU+=	alc.1 alcc.1
+MAN1_EN+=	alc.1
+MAN1_DE+=	alc.1
+MAN1_ES+=	alc.1
+MAN1_EU+=	alc.1
+MAN1_HU+=	alc.1
+MAN1_IT+=	alc.1
+. endif
+. if !defined(WITHOUT_ALCC)
+MAN1_EN+=	alcc.1
+MAN1_DE+=	alcc.1
+MAN1_ES+=	alcc.1
+MAN1_EU+=	alcc.1
 MAN1_FR+=	alcc.1
-MAN1_HU+=	alc.1 alcc.1
-MAN1_IT+=	alc.1 alcc.1
+MAN1_HU+=	alcc.1
+MAN1_IT+=	alcc.1
 . endif
 . if !defined(WITHOUT_AMULECMD)
 MAN1+=		amulecmd.1
@@ -27,12 +37,12 @@ MAN1_HU+=	amulegui.1
 MAN1_IT+=	amulegui.1
 . endif
 . if !defined(WITHOUT_CAS)
-MAN1_EN+=	cas.1 wxcas.1
-MAN1_DE+=	cas.1 wxcas.1
-MAN1_ES+=	cas.1 wxcas.1
-MAN1_EU+=	cas.1 wxcas.1
-MAN1_HU+=	cas.1 wxcas.1
-MAN1_IT+=	cas.1 wxcas.1
+MAN1_EN+=	cas.1
+MAN1_DE+=	cas.1
+MAN1_ES+=	cas.1
+MAN1_EU+=	cas.1
+MAN1_HU+=	cas.1
+MAN1_IT+=	cas.1
 . endif
 . if !defined(WITHOUT_ED2K)
 MAN1+=		ed2k.1
@@ -40,6 +50,14 @@ MAN1+=		ed2k.1
 . if !defined(WITHOUT_WEBSERVER)
 MAN1+=		amuleweb.1
 . endif
+. if !defined(WITHOUT_WXCAS)
+MAN1_EN+=	wxcas.1
+MAN1_DE+=	wxcas.1
+MAN1_ES+=	wxcas.1
+MAN1_EU+=	wxcas.1
+MAN1_HU+=	wxcas.1
+MAN1_IT+=	wxcas.1
+. endif
 .endif # !WITHOUT_NLS
 
 .if !defined(WITHOUT_XAS)
diff --git a/net-p2p/amule-devel/distinfo b/net-p2p/amule-devel/distinfo
index b0cf410dcf9d..7c8cd3e2b6e0 100644
--- a/net-p2p/amule-devel/distinfo
+++ b/net-p2p/amule-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (amule-svn-r10275.tar.gz) = 892753e2ce41c0be0c47c2168fc2415d
-SHA256 (amule-svn-r10275.tar.gz) = 24807b9ce7cfdd311a96feb988a8580b93570746ba957035dba8112532f7119b
-SIZE (amule-svn-r10275.tar.gz) = 5950845
+MD5 (aMule-SVN-r10305.tar.bz2) = 86bf1474af7acb097843e4521d2774de
+SHA256 (aMule-SVN-r10305.tar.bz2) = d0bfc9667c4528510e1690c3d7b903c912386e16451ef552a9b9e02112319ff9
+SIZE (aMule-SVN-r10305.tar.bz2) = 4506472
diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index bb481de6b17d..c96654038be8 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -15,8 +15,8 @@
 %%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true
 %%PLASMAMULE%%@cwd
 %%ALC%%bin/alc
-%%ALC%%bin/alcc
-bin/amule
+%%ALCC%%bin/alcc
+%%MONOLITHIC%%bin/amule
 %%AMULECMD%%bin/amulecmd
 %%AMULEDAEMON%%bin/amuled
 %%AMULEGUI%%bin/amulegui
@@ -24,7 +24,8 @@ bin/amule
 %%XAS%%bin/autostart-xas
 %%CAS%%bin/cas
 %%ED2K%%bin/ed2k
-%%CAS%%bin/wxcas
+%%FILEVIEW%%bin/mulefileview
+%%WXCAS%%bin/wxcas
 %%XAS%%lib/xchat/plugins/xas.pl
 %%DATADIR%%/skins/Mac_Gray.zip
 %%DATADIR%%/skins/gnome.zip
@@ -101,9 +102,9 @@ bin/amule
 %%WEBSERVER%%%%DATADIR%%/webserver/default/up.png
 %%WEBSERVER%%%%DATADIR%%/webserver/default/yellow.gif
 %%ALC%%share/applications/alc.desktop
-share/applications/amule.desktop
+%%MONOLITHIC%%share/applications/amule.desktop
 %%AMULEGUI%%share/applications/amulegui.desktop
-%%CAS%%share/applications/wxcas.desktop
+%%WXCAS%%share/applications/wxcas.desktop
 %%CAS%%share/cas/stat.png
 %%CAS%%share/cas/tmp.html
 %%NLS%%share/locale/ar/LC_MESSAGES/amule.mo
@@ -144,9 +145,9 @@ share/applications/amule.desktop
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/amule.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/amule.mo
 %%ALC%%share/pixmaps/alc.xpm
-share/pixmaps/amule.xpm
+%%MONOLITHIC%%share/pixmaps/amule.xpm
 %%AMULEGUI%%share/pixmaps/amulegui.xpm
-%%CAS%%share/pixmaps/wxcas.xpm
+%%WXCAS%%share/pixmaps/wxcas.xpm
 %%XAS%%@dirrmtry lib/xchat/plugins
 %%XAS%%@dirrmtry lib/xchat
 @dirrmtry man/de/man1
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 077324f14f40..7244ec9aa378 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	amule2
+# New ports collection makefile for:	amule
 # Date created:		Wed Nov 05 09:30:00 UTC 2003
 # Whom:			Ganael LAPLANCHE <ganael.laplanche@martymac.org>
 #
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	amule
-PORTVERSION=	10275
+PORTVERSION=	2.2.6
 CATEGORIES=	net-p2p
-MASTER_SITES=	LOCAL/pav \
-		http://repo.or.cz/w/${PORTNAME}.git/snapshot/
-DISTNAME=	${PORTNAME}-svn-r${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/aMule/${PORTVERSION}
+DISTNAME=	aMule-${PORTVERSION}
 
 MAINTAINER=	swell.k@gmail.com
 COMMENT=	The all-platform eMule p2p client
@@ -18,15 +17,11 @@ COMMENT=	The all-platform eMule p2p client
 BUILD_DEPENDS=	${FLEX}:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
 
-LATEST_LINK=	amule2
-CONFLICTS=	aMule-[0-9]* aMule-devel-[0-9]* ed2k-hash-[0-9]*
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
+CONFLICTS=	amule-devel-[0-9]*
 
+USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
 USE_GMAKE=	yes
-USE_KDE4=	# empty
-USE_QT_VER=	4
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
@@ -34,25 +29,25 @@ CONFIGURE_ARGS=	--with-denoise-level=0
 
 CONFIGURE_ENV=	LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
 		docdir='$${prefix}/${DOCSDIR_REL}' \
-		LDFLAGS="${LDFLAGS}"
+		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
-OPTIONS=	ALC "Compile aMule Link Creator (+GUI)" on \
+OPTIONS=	ALC "Compile aMule Link Creator for GUI" on \
+		ALCC "Compile aMule Link Creator for console" on \
 		AMULECMD "Compile aMule command line client" on \
 		AMULEDAEMON "Compile aMule daemon version" on \
 		AMULEGUI "Compile aMule remote GUI (EXPERIMENTAL)" on \
-		CAS "Compile C aMule Statistics (+GUI)" on \
+		CAS "Compile aMule Statistics for console" on \
 		ED2K "Compile aMule ed2k links handler" on \
 		GEOIP "Enable GeoIP IP2Country support" off \
-		MMAP "Enable using mapped memory" off \
-		PLASMAMULE "Compile aMule plasma applet and engine" off \
+		MONOLITHIC "Compile monolithic aMule" on \
 		UPNP "Enable Universal Plug and Play support" off \
 		WEBSERVER "Compile aMule WebServer" on \
-		WXUNICODE "Enable Unicode support" on \
-		XAS "Install XChat2 plugin" on
+		WXCAS "Compile aMule Statistics for GUI" on \
+		WXUNICODE "Enable Unicode support" on
 
 PORTDOCS=	ABOUT-NLS Changelog EC_Protocol.txt \
 		ED2K-Links.HOWTO INSTALL README TODO \
@@ -76,13 +71,21 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if !defined(WITHOUT_ALC)
-CONFIGURE_ARGS+=	--enable-alc --enable-alcc
+CONFIGURE_ARGS+=	--enable-alc
 PLIST_SUB+=		ALC=""
 .else
-CONFIGURE_ARGS+=	--disable-alc --disable-alcc
+CONFIGURE_ARGS+=	--disable-alc
 PLIST_SUB+=		ALC="@comment "
 .endif
 
+.if !defined(WITHOUT_ALCC)
+CONFIGURE_ARGS+=	--enable-alcc
+PLIST_SUB+=		ALCC=""
+.else
+CONFIGURE_ARGS+=	--disable-alcc
+PLIST_SUB+=		ALCC="@comment "
+.endif
+
 .if !defined(WITHOUT_AMULECMD)
 CONFIGURE_ARGS+=	--enable-amulecmd
 PLIST_SUB+=		AMULECMD=""
@@ -109,15 +112,16 @@ PLIST_SUB+=		AMULEGUI="@comment "
 .endif
 
 .if !defined(WITHOUT_CAS)
-CONFIGURE_ARGS+=	--enable-cas --enable-wxcas
+CONFIGURE_ARGS+=	--enable-cas
 LIB_DEPENDS+=		gd.4:${PORTSDIR}/graphics/gd
 PLIST_SUB+=		CAS=""
 .else
-CONFIGURE_ARGS+=	--disable-cas --disable-wxcas
+CONFIGURE_ARGS+=	--disable-cas
 PLIST_SUB+=		CAS="@comment "
 .endif
 
 .if !defined(WITHOUT_ED2K)
+CONFLICTS+=		ed2k-hash-[0-9]*
 CONFIGURE_ARGS+=	--enable-ed2k
 PLIST_SUB+=		ED2K=""
 .else
@@ -132,21 +136,12 @@ LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
 CONFIGURE_ARGS+=	--disable-geoip
 .endif
 
-.if !defined(WITHOUT_MMAP)
-CONFIGURE_ARGS+=	--enable-mmap
+.if !defined(WITHOUT_MONOLITHIC)
+CONFIGURE_ARGS+=	--enable-monolithic
+PLIST_SUB+=		MONOLITHIC=""
 .else
-CONFIGURE_ARGS+=	--disable-mmap
-.endif
-
-.if !defined(WITHOUT_PLASMAMULE)
-CONFIGURE_ENV+=		ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config
-CONFIGURE_ARGS+=	--enable-plasmamule
-USE_KDE4+=		kdelibs
-QT_COMPONENTS+=		dbus gui moc_build
-PLIST_SUB+=		PLASMAMULE=""
-.else
-CONFIGURE_ARGS+=	--disable-plasmamule
-PLIST_SUB+=		PLASMAMULE="@comment "
+CONFIGURE_ARGS+=	--disable-monolithic
+PLIST_SUB+=		MONOLITHIC="@comment "
 .endif
 
 .if !defined(WITHOUT_UPNP)
@@ -163,16 +158,16 @@ CONFIGURE_ARGS+=	--disable-webserver
 PLIST_SUB+=		WEBSERVER="@comment "
 .endif
 
-.if !defined(WITHOUT_WXUNICODE)
-WX_UNICODE=		yes
+.if !defined(WITHOUT_WXCAS)
+CONFIGURE_ARGS+=	--enable-wxcas
+PLIST_SUB+=		WXCAS=""
+.else
+CONFIGURE_ARGS+=	--disable-wxcas
+PLIST_SUB+=		WXCAS="@comment "
 .endif
 
-.if !defined(WITHOUT_XAS)
-CONFIGURE_ARGS+=	--enable-xas
-PLIST_SUB+=		XAS=""
-.else
-CONFIGURE_ARGS+=	--disable-xas
-PLIST_SUB+=		XAS="@comment "
+.if !defined(WITHOUT_WXUNICODE)
+WX_UNICODE=		yes
 .endif
 
 # Man pages management
@@ -183,21 +178,11 @@ post-patch:	.SILENT
 		-e 's/test.*-print-file-name.*`/true/' \
 		${WRKSRC}/configure
 .if defined(NOPORTDOCS)
-	${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' ${WRKSRC}/docs/Makefile.in
-.endif
-.if !defined(WITHOUT_PLASMAMULE)
-	${REINPLACE_CMD} -e 's|@prefix@|${KDE4_PREFIX}|' \
-		-e 's|LDFLAGS =|& -L${KDE4_PREFIX}/lib |' \
-		-e '/plasma.*feeder.*LDFLAGS/s/=/& -lQtDBus /' \
-		-e 's/\(plasmamule_so_\)LDFLAGS/\1CXXFLAGS/' \
-		${WRKSRC}/src/utils/plasmamule/Makefile.in
+	${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \
+		${WRKSRC}/docs/Makefile.in
 .endif
 
 post-install:
-.if !defined(WITHOUT_PLASMAMULE)
-	-update-desktop-database ${KDE4_PREFIX}/share/applications
-	-update-mime-database ${KDE4_PREFIX}/share/mime
-.endif
 	-update-desktop-database ${PREFIX}/share/applications
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/amule/Makefile.man b/net-p2p/amule/Makefile.man
index 24ae456e5b5e..c456eda21ddf 100644
--- a/net-p2p/amule/Makefile.man
+++ b/net-p2p/amule/Makefile.man
@@ -3,15 +3,23 @@ MANLANG=	"" de es eu fr hu it
 #MANCOMPRESSED=	no
 
 .if !defined(WITHOUT_NLS)
+. if !defined(WITHOUT_MONOLITHIC)
 MAN1+=		amule.1
+. endif
 . if !defined(WITHOUT_ALC)
-MAN1_EN+=	alc.1 alcc.1
-MAN1_DE+=	alc.1 alcc.1
-MAN1_ES+=	alc.1 alcc.1
-MAN1_EU+=	alc.1 alcc.1
+MAN1_EN+=	alc.1
+MAN1_DE+=	alc.1
+MAN1_ES+=	alc.1
+MAN1_EU+=	alc.1
+MAN1_HU+=	alc.1
+. endif
+. if !defined(WITHOUT_ALCC)
+MAN1_EN+=	alcc.1
+MAN1_DE+=	alcc.1
+MAN1_ES+=	alcc.1
+MAN1_EU+=	alcc.1
 MAN1_FR+=	alcc.1
-MAN1_HU+=	alc.1 alcc.1
-MAN1_IT+=	alc.1 alcc.1
+MAN1_HU+=	alcc.1
 . endif
 . if !defined(WITHOUT_AMULECMD)
 MAN1+=		amulecmd.1
@@ -22,17 +30,14 @@ MAN1+=		amuled.1
 . if !defined(WITHOUT_AMULEGUI)
 MAN1_EN+=	amulegui.1
 MAN1_DE+=	amulegui.1
-MAN1_ES+=	amulegui.1
-MAN1_HU+=	amulegui.1
 MAN1_IT+=	amulegui.1
 . endif
 . if !defined(WITHOUT_CAS)
-MAN1_EN+=	cas.1 wxcas.1
-MAN1_DE+=	cas.1 wxcas.1
-MAN1_ES+=	cas.1 wxcas.1
-MAN1_EU+=	cas.1 wxcas.1
-MAN1_HU+=	cas.1 wxcas.1
-MAN1_IT+=	cas.1 wxcas.1
+MAN1_EN+=	cas.1
+MAN1_DE+=	cas.1
+MAN1_ES+=	cas.1
+MAN1_EU+=	cas.1
+MAN1_HU+=	cas.1
 . endif
 . if !defined(WITHOUT_ED2K)
 MAN1+=		ed2k.1
@@ -40,6 +45,13 @@ MAN1+=		ed2k.1
 . if !defined(WITHOUT_WEBSERVER)
 MAN1+=		amuleweb.1
 . endif
+. if !defined(WITHOUT_WXCAS)
+MAN1_EN+=	wxcas.1
+MAN1_DE+=	wxcas.1
+MAN1_ES+=	wxcas.1
+MAN1_EU+=	wxcas.1
+MAN1_HU+=	wxcas.1
+. endif
 .endif # !WITHOUT_NLS
 
 .if !defined(WITHOUT_XAS)
@@ -48,5 +60,4 @@ MAN1_DE+=	xas.1
 MAN1_ES+=	xas.1
 MAN1_EU+=	xas.1
 MAN1_HU+=	xas.1
-MAN1_IT+=	xas.1
 .endif
diff --git a/net-p2p/amule/distinfo b/net-p2p/amule/distinfo
index b0cf410dcf9d..33d7c91eee6f 100644
--- a/net-p2p/amule/distinfo
+++ b/net-p2p/amule/distinfo
@@ -1,3 +1,3 @@
-MD5 (amule-svn-r10275.tar.gz) = 892753e2ce41c0be0c47c2168fc2415d
-SHA256 (amule-svn-r10275.tar.gz) = 24807b9ce7cfdd311a96feb988a8580b93570746ba957035dba8112532f7119b
-SIZE (amule-svn-r10275.tar.gz) = 5950845
+MD5 (aMule-2.2.6.tar.bz2) = 530d9b48187e36f78fc21bb19e94326d
+SHA256 (aMule-2.2.6.tar.bz2) = 6ce32b5f1d8113a224a8e850639d957656623a04a73fb83d52313c06c3488122
+SIZE (aMule-2.2.6.tar.bz2) = 4722143
diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
index bb481de6b17d..36e6f8ae7799 100644
--- a/net-p2p/amule/pkg-plist
+++ b/net-p2p/amule/pkg-plist
@@ -1,109 +1,252 @@
-%%PLASMAMULE%%@cwd %%KDE4_PREFIX%%
-%%PLASMAMULE%%bin/plasmamule-engine-feeder
-%%PLASMAMULE%%lib/kde4/plasma-applet-plasmamule.so
-%%PLASMAMULE%%lib/kde4/plasma-engine-plasmamule.so
-%%PLASMAMULE%%share/applications/plasmamule-engine-feeder.desktop
-%%PLASMAMULE%%share/icons/hicolor/scalable/mimetypes/application-x-emulecollection.svg
-%%PLASMAMULE%%share/kde4/services/ed2k.protocol
-%%PLASMAMULE%%share/kde4/services/magnet.protocol
-%%PLASMAMULE%%share/kde4/services/plasma-applet-plasmamule.desktop
-%%PLASMAMULE%%share/kde4/services/plasma-engine-plasmamule.desktop
-%%PLASMAMULE%%share/mime/amule.xml
-%%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
-%%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
-%%PLASMAMULE%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true
-%%PLASMAMULE%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime 2>/dev/null || true
-%%PLASMAMULE%%@cwd
 %%ALC%%bin/alc
-%%ALC%%bin/alcc
-bin/amule
+%%ALCC%%bin/alcc
+%%MONOLITHIC%%bin/amule
 %%AMULECMD%%bin/amulecmd
 %%AMULEDAEMON%%bin/amuled
 %%AMULEGUI%%bin/amulegui
 %%WEBSERVER%%bin/amuleweb
-%%XAS%%bin/autostart-xas
+bin/autostart-xas
 %%CAS%%bin/cas
 %%ED2K%%bin/ed2k
-%%CAS%%bin/wxcas
-%%XAS%%lib/xchat/plugins/xas.pl
-%%DATADIR%%/skins/Mac_Gray.zip
+%%WXCAS%%bin/wxcas
+lib/xchat/plugins/xas.pl
 %%DATADIR%%/skins/gnome.zip
 %%DATADIR%%/skins/kde4.zip
-%%DATADIR%%/skins/priscilla.zip
 %%DATADIR%%/skins/tango.zip
 %%DATADIR%%/skins/xfce.zip
-%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-dload.php
-%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-kad.php
-%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-log.php
-%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-prefs.php
-%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-search.php
-%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-servers.php
-%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-shared.php
-%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-stats.php
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/aMule.tmpl
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/add_server.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/arrow_down.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/arrow_down_logout.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/arrow_right.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/arrow_up.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/back.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/black.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blank1x1.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blue1.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blue2.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blue3.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blue4.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blue5.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blue6.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_download.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_kad.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_search.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_servers.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_settings.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_shared.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_stats.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/downloads.php
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/emule.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/favicon.ico
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/green.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/greenpercent.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/index.php
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_cancel.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_connect.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_down.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_ed2klink.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_info.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_pause.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_resume.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_up.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/log.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login.php
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_bottom.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_downmain.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_lefttop.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_righttop.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_top.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_topdown.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_topseperator.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/logo.jpg
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/main_bg.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/main_top_bg.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/main_topbar.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/main_topbardarker.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/main_topbarseperator.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/phpamule.png
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/preferences.php
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/red.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/search.php
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/servers.php
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/shared.php
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/stat_graphs.php
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/stat_tree.php
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/transparent.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/tree-closed.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/tree-leaf.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/tree-open.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/chicane/yellow.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/aMule.tmpl
+%%WEBSERVER%%%%DATADIR%%/webserver/default/add_server.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/arrow_down.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/arrow_right.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/arrow_up.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/back.gif
 %%WEBSERVER%%%%DATADIR%%/webserver/default/black.gif
-%%WEBSERVER%%%%DATADIR%%/webserver/default/blank1x1.gif
 %%WEBSERVER%%%%DATADIR%%/webserver/default/blue1.gif
 %%WEBSERVER%%%%DATADIR%%/webserver/default/blue2.gif
 %%WEBSERVER%%%%DATADIR%%/webserver/default/blue3.gif
 %%WEBSERVER%%%%DATADIR%%/webserver/default/blue4.gif
 %%WEBSERVER%%%%DATADIR%%/webserver/default/blue5.gif
 %%WEBSERVER%%%%DATADIR%%/webserver/default/blue6.gif
-%%WEBSERVER%%%%DATADIR%%/webserver/default/cancel.gif
-%%WEBSERVER%%%%DATADIR%%/webserver/default/close.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/col.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/connect.gif
-%%WEBSERVER%%%%DATADIR%%/webserver/default/down.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/edkserv_0.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/edkserv_1.png
+%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_download.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_kad.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_search.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_servers.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_settings.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_shared.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_stats.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/downloads.php
+%%WEBSERVER%%%%DATADIR%%/webserver/default/emule.gif
 %%WEBSERVER%%%%DATADIR%%/webserver/default/favicon.ico
-%%WEBSERVER%%%%DATADIR%%/webserver/default/filter.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/fond.gif
-%%WEBSERVER%%%%DATADIR%%/webserver/default/fond_haut.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/footer.php
-%%WEBSERVER%%%%DATADIR%%/webserver/default/index.html
-%%WEBSERVER%%%%DATADIR%%/webserver/default/log.php
+%%WEBSERVER%%%%DATADIR%%/webserver/default/green.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/greenpercent.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/index.php
+%%WEBSERVER%%%%DATADIR%%/webserver/default/l_cancel.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/l_connect.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/l_down.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/l_ed2klink.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/l_info.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/l_pause.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/l_resume.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/l_up.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/default/log.gif
 %%WEBSERVER%%%%DATADIR%%/webserver/default/login.php
-%%WEBSERVER%%%%DATADIR%%/webserver/default/loginfond.gif
-%%WEBSERVER%%%%DATADIR%%/webserver/default/loginfond_haut.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/loginlogo.jpg
-%%WEBSERVER%%%%DATADIR%%/webserver/default/loginlogo.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/logo.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/maquette.dwt
-%%WEBSERVER%%%%DATADIR%%/webserver/default/ok.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/pause.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/play.png
+%%WEBSERVER%%%%DATADIR%%/webserver/default/logo.jpg
+%%WEBSERVER%%%%DATADIR%%/webserver/default/phpamule.png
+%%WEBSERVER%%%%DATADIR%%/webserver/default/preferences.php
 %%WEBSERVER%%%%DATADIR%%/webserver/default/red.gif
-%%WEBSERVER%%%%DATADIR%%/webserver/default/refresh.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/search_0.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/search_1.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/shared_0.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/shared_1.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/sheserv_0.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/sheserv_1.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/stats.php
-%%WEBSERVER%%%%DATADIR%%/webserver/default/stats_0.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/stats_1.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/stats_tree.php
-%%WEBSERVER%%%%DATADIR%%/webserver/default/style.css
-%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_bottom.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_bottom_left.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_bottom_right.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_left.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_right.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_top.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_top_left.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_top_right.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/transf_0.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/transf_1.png
+%%WEBSERVER%%%%DATADIR%%/webserver/default/search.php
+%%WEBSERVER%%%%DATADIR%%/webserver/default/servers.php
+%%WEBSERVER%%%%DATADIR%%/webserver/default/shared.php
+%%WEBSERVER%%%%DATADIR%%/webserver/default/stat_graphs.php
+%%WEBSERVER%%%%DATADIR%%/webserver/default/stat_tree.php
+%%WEBSERVER%%%%DATADIR%%/webserver/default/transparent.gif
 %%WEBSERVER%%%%DATADIR%%/webserver/default/tree-closed.gif
 %%WEBSERVER%%%%DATADIR%%/webserver/default/tree-leaf.gif
 %%WEBSERVER%%%%DATADIR%%/webserver/default/tree-open.gif
-%%WEBSERVER%%%%DATADIR%%/webserver/default/up.png
 %%WEBSERVER%%%%DATADIR%%/webserver/default/yellow.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-dload.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-kad.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-log.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-prefs.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-search.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-servers.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-shared.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-stats.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/black.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blank1x1.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blue1.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blue2.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blue3.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blue4.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blue5.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blue6.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/cancel.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/close.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/col.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/connect.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/down.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/edkserv_0.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/edkserv_1.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/favicon.ico
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/filter.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/fond.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/fond_haut.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/footer.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/index.html
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/kitty.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/log.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/login.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/loginfond.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/loginfond_haut.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/loginlogo.jpg
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/loginlogo.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/logo.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/maquette.dwt
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/ok.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/pause.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/play.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/red.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/refresh.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/search_0.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/search_1.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/shared_0.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/shared_1.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/sheserv_0.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/sheserv_1.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/stats.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/stats_0.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/stats_1.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/stats_tree.php
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/style.css
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_bottom.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_bottom_left.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_bottom_right.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_left.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_right.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_top.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_top_left.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_top_right.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/transf_0.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/transf_1.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tree-closed.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tree-leaf.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tree-open.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/up.png
+%%WEBSERVER%%%%DATADIR%%/webserver/litoral/yellow.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-dload.php
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-kad.php
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-prefs.php
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-search.php
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-servers.php
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-shared.php
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-stats.php
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/apply.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/arrow-r.png
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/cancel.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/connect.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/delete.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/down.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/favicon.ico
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/footer.php
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/index.html
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/login.php
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/pause.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/phpamule.png
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/resume.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/stats.php
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/stats_tree.php
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-connect.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-download-pressed.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-download.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-filter.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-kad-pressed.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-kad.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-logout-pressed.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-logout.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-reload.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-search-pressed.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-search.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-servers-pressed.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-servers.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-settings-pressed.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-settings.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-shared-pressed.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-shared.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-stats-pressed.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-stats.jpeg
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/top.html
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/tree-closed.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/tree-leaf.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/tree-open.gif
+%%WEBSERVER%%%%DATADIR%%/webserver/php-default/up.jpeg
 %%ALC%%share/applications/alc.desktop
-share/applications/amule.desktop
+%%MONOLITHIC%%share/applications/amule.desktop
 %%AMULEGUI%%share/applications/amulegui.desktop
-%%CAS%%share/applications/wxcas.desktop
+%%WXCAS%%share/applications/wxcas.desktop
 %%CAS%%share/cas/stat.png
 %%CAS%%share/cas/tmp.html
 %%NLS%%share/locale/ar/LC_MESSAGES/amule.mo
@@ -134,7 +277,6 @@ share/applications/amule.desktop
 %%NLS%%share/locale/pl/LC_MESSAGES/amule.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/amule.mo
 %%NLS%%share/locale/pt_PT/LC_MESSAGES/amule.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/amule.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/amule.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/amule.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/amule.mo
@@ -144,11 +286,11 @@ share/applications/amule.desktop
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/amule.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/amule.mo
 %%ALC%%share/pixmaps/alc.xpm
-share/pixmaps/amule.xpm
+%%MONOLITHIC%%share/pixmaps/amule.xpm
 %%AMULEGUI%%share/pixmaps/amulegui.xpm
-%%CAS%%share/pixmaps/wxcas.xpm
-%%XAS%%@dirrmtry lib/xchat/plugins
-%%XAS%%@dirrmtry lib/xchat
+%%WXCAS%%share/pixmaps/wxcas.xpm
+@dirrmtry lib/xchat/plugins
+@dirrmtry lib/xchat
 @dirrmtry man/de/man1
 @dirrmtry man/de
 @dirrmtry man/es/man1
@@ -162,7 +304,10 @@ share/pixmaps/amule.xpm
 @dirrmtry man/it/man1
 @dirrmtry man/it
 @dirrm %%DATADIR%%/skins
+%%WEBSERVER%%@dirrm %%DATADIR%%/webserver/chicane
 %%WEBSERVER%%@dirrm %%DATADIR%%/webserver/default
+%%WEBSERVER%%@dirrm %%DATADIR%%/webserver/litoral
+%%WEBSERVER%%@dirrm %%DATADIR%%/webserver/php-default
 %%WEBSERVER%%@dirrm %%DATADIR%%/webserver
 @dirrm %%DATADIR%%
 @dirrmtry share/applications