amule, maj 10429-1

3 files changed, 205 insertions, 25 deletions

diff --git a/extra/amule/.footprint b/extra/amule/.footprint
index dca006457..87c3bd674 100644
--- a/extra/amule/.footprint
+++ b/extra/amule/.footprint
@@ -11,6 +11,84 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ed2k
 -rwxr-xr-x	root/root	usr/bin/wxcas
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/amule/
+drwxr-xr-x	root/root	usr/share/amule/skins/
+-rw-r--r--	root/root	usr/share/amule/skins/Mac_Gray.zip
+-rw-r--r--	root/root	usr/share/amule/skins/gnome.zip
+-rw-r--r--	root/root	usr/share/amule/skins/kde4.zip
+-rw-r--r--	root/root	usr/share/amule/skins/priscilla.zip
+-rw-r--r--	root/root	usr/share/amule/skins/tango.zip
+-rw-r--r--	root/root	usr/share/amule/skins/xfce.zip
+drwxr-xr-x	root/root	usr/share/amule/webserver/
+drwxr-xr-x	root/root	usr/share/amule/webserver/default/
+-rw-r--r--	root/root	usr/share/amule/webserver/default/amuleweb-main-dload.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/amuleweb-main-kad.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/amuleweb-main-log.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/amuleweb-main-prefs.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/amuleweb-main-search.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/amuleweb-main-servers.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/amuleweb-main-shared.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/amuleweb-main-stats.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/black.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/blank1x1.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/blue1.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/blue2.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/blue3.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/blue4.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/blue5.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/blue6.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/cancel.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/close.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/col.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/connect.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/down.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/edkserv_0.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/edkserv_1.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/favicon.ico
+-rw-r--r--	root/root	usr/share/amule/webserver/default/filter.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/fond.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/fond_haut.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/footer.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/index.html
+-rw-r--r--	root/root	usr/share/amule/webserver/default/log.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/login.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/loginfond.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/loginfond_haut.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/loginlogo.jpg
+-rw-r--r--	root/root	usr/share/amule/webserver/default/loginlogo.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/logo.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/maquette.dwt
+-rw-r--r--	root/root	usr/share/amule/webserver/default/ok.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/pause.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/play.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/red.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/refresh.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/search_0.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/search_1.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/shared_0.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/shared_1.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/sheserv_0.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/sheserv_1.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/stats.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/stats_0.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/stats_1.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/stats_tree.php
+-rw-r--r--	root/root	usr/share/amule/webserver/default/style.css
+-rw-r--r--	root/root	usr/share/amule/webserver/default/tab_bottom.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/tab_bottom_left.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/tab_bottom_right.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/tab_left.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/tab_right.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/tab_top.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/tab_top_left.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/tab_top_right.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/transf_0.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/transf_1.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/tree-closed.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/tree-leaf.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/tree-open.gif
+-rw-r--r--	root/root	usr/share/amule/webserver/default/up.png
+-rw-r--r--	root/root	usr/share/amule/webserver/default/yellow.gif
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/alc.desktop
 -rw-r--r--	root/root	usr/share/applications/amule.desktop
@@ -19,10 +97,116 @@ drwxr-xr-x	root/root	usr/share/applications/
 drwxr-xr-x	root/root	usr/share/cas/
 -rw-r--r--	root/root	usr/share/cas/stat.png
 -rw-r--r--	root/root	usr/share/cas/tmp.html
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/amule/
+-rw-r--r--	root/root	usr/share/doc/amule/ABOUT-NLS
+-rw-r--r--	root/root	usr/share/doc/amule/Changelog
+-rw-r--r--	root/root	usr/share/doc/amule/EC_Protocol.txt
+-rw-r--r--	root/root	usr/share/doc/amule/ED2K-Links.HOWTO
+-rw-r--r--	root/root	usr/share/doc/amule/INSTALL
+-rw-r--r--	root/root	usr/share/doc/amule/README
+-rw-r--r--	root/root	usr/share/doc/amule/TODO
+-rw-r--r--	root/root	usr/share/doc/amule/amule-win32.HOWTO.txt
+-rw-r--r--	root/root	usr/share/doc/amule/amulesig.txt
+-rw-r--r--	root/root	usr/share/doc/amule/license.txt
+-rw-r--r--	root/root	usr/share/doc/amule/socks4.protocol
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
 drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
 -rw-r--r--	root/root	usr/share/locale/fr/LC_MESSAGES/amule.mo
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/de/
+drwxr-xr-x	root/root	usr/share/man/de/man1/
+-rw-r--r--	root/root	usr/share/man/de/man1/alc.1.gz
+-rw-r--r--	root/root	usr/share/man/de/man1/alcc.1.gz
+-rw-r--r--	root/root	usr/share/man/de/man1/amule.1.gz
+-rw-r--r--	root/root	usr/share/man/de/man1/amulecmd.1.gz
+-rw-r--r--	root/root	usr/share/man/de/man1/amuled.1.gz
+-rw-r--r--	root/root	usr/share/man/de/man1/amulegui.1.gz
+-rw-r--r--	root/root	usr/share/man/de/man1/amuleweb.1.gz
+-rw-r--r--	root/root	usr/share/man/de/man1/cas.1.gz
+-rw-r--r--	root/root	usr/share/man/de/man1/ed2k.1.gz
+-rw-r--r--	root/root	usr/share/man/de/man1/wxcas.1.gz
+drwxr-xr-x	root/root	usr/share/man/es/
+drwxr-xr-x	root/root	usr/share/man/es/man1/
+-rw-r--r--	root/root	usr/share/man/es/man1/alc.1.gz
+-rw-r--r--	root/root	usr/share/man/es/man1/alcc.1.gz
+-rw-r--r--	root/root	usr/share/man/es/man1/amule.1.gz
+-rw-r--r--	root/root	usr/share/man/es/man1/amulecmd.1.gz
+-rw-r--r--	root/root	usr/share/man/es/man1/amuled.1.gz
+-rw-r--r--	root/root	usr/share/man/es/man1/amulegui.1.gz
+-rw-r--r--	root/root	usr/share/man/es/man1/amuleweb.1.gz
+-rw-r--r--	root/root	usr/share/man/es/man1/cas.1.gz
+-rw-r--r--	root/root	usr/share/man/es/man1/ed2k.1.gz
+-rw-r--r--	root/root	usr/share/man/es/man1/wxcas.1.gz
+drwxr-xr-x	root/root	usr/share/man/eu/
+drwxr-xr-x	root/root	usr/share/man/eu/man1/
+-rw-r--r--	root/root	usr/share/man/eu/man1/alc.1.gz
+-rw-r--r--	root/root	usr/share/man/eu/man1/alcc.1.gz
+-rw-r--r--	root/root	usr/share/man/eu/man1/amule.1.gz
+-rw-r--r--	root/root	usr/share/man/eu/man1/amulecmd.1.gz
+-rw-r--r--	root/root	usr/share/man/eu/man1/amuled.1.gz
+-rw-r--r--	root/root	usr/share/man/eu/man1/amuleweb.1.gz
+-rw-r--r--	root/root	usr/share/man/eu/man1/cas.1.gz
+-rw-r--r--	root/root	usr/share/man/eu/man1/ed2k.1.gz
+-rw-r--r--	root/root	usr/share/man/eu/man1/wxcas.1.gz
+drwxr-xr-x	root/root	usr/share/man/fr/
+drwxr-xr-x	root/root	usr/share/man/fr/man1/
+-rw-r--r--	root/root	usr/share/man/fr/man1/alc.1.gz
+-rw-r--r--	root/root	usr/share/man/fr/man1/alcc.1.gz
+-rw-r--r--	root/root	usr/share/man/fr/man1/amule.1.gz
+-rw-r--r--	root/root	usr/share/man/fr/man1/amulecmd.1.gz
+-rw-r--r--	root/root	usr/share/man/fr/man1/amuled.1.gz
+-rw-r--r--	root/root	usr/share/man/fr/man1/amuleweb.1.gz
+-rw-r--r--	root/root	usr/share/man/fr/man1/ed2k.1.gz
+-rw-r--r--	root/root	usr/share/man/fr/man1/wxcas.1.gz
+drwxr-xr-x	root/root	usr/share/man/hu/
+drwxr-xr-x	root/root	usr/share/man/hu/man1/
+-rw-r--r--	root/root	usr/share/man/hu/man1/alc.1.gz
+-rw-r--r--	root/root	usr/share/man/hu/man1/alcc.1.gz
+-rw-r--r--	root/root	usr/share/man/hu/man1/amule.1.gz
+-rw-r--r--	root/root	usr/share/man/hu/man1/amulecmd.1.gz
+-rw-r--r--	root/root	usr/share/man/hu/man1/amuled.1.gz
+-rw-r--r--	root/root	usr/share/man/hu/man1/amulegui.1.gz
+-rw-r--r--	root/root	usr/share/man/hu/man1/amuleweb.1.gz
+-rw-r--r--	root/root	usr/share/man/hu/man1/cas.1.gz
+-rw-r--r--	root/root	usr/share/man/hu/man1/ed2k.1.gz
+-rw-r--r--	root/root	usr/share/man/hu/man1/wxcas.1.gz
+drwxr-xr-x	root/root	usr/share/man/it/
+drwxr-xr-x	root/root	usr/share/man/it/man1/
+-rw-r--r--	root/root	usr/share/man/it/man1/alc.1.gz
+-rw-r--r--	root/root	usr/share/man/it/man1/alcc.1.gz
+-rw-r--r--	root/root	usr/share/man/it/man1/amule.1.gz
+-rw-r--r--	root/root	usr/share/man/it/man1/amulecmd.1.gz
+-rw-r--r--	root/root	usr/share/man/it/man1/amuled.1.gz
+-rw-r--r--	root/root	usr/share/man/it/man1/amulegui.1.gz
+-rw-r--r--	root/root	usr/share/man/it/man1/amuleweb.1.gz
+-rw-r--r--	root/root	usr/share/man/it/man1/cas.1.gz
+-rw-r--r--	root/root	usr/share/man/it/man1/ed2k.1.gz
+-rw-r--r--	root/root	usr/share/man/it/man1/wxcas.1.gz
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/alc.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/alcc.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/amule.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/amulecmd.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/amuled.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/amulegui.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/amuleweb.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/cas.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/ed2k.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/wxcas.1.gz
+drwxr-xr-x	root/root	usr/share/man/ru/
+drwxr-xr-x	root/root	usr/share/man/ru/man1/
+-rw-r--r--	root/root	usr/share/man/ru/man1/alc.1.gz
+-rw-r--r--	root/root	usr/share/man/ru/man1/alcc.1.gz
+-rw-r--r--	root/root	usr/share/man/ru/man1/amule.1.gz
+-rw-r--r--	root/root	usr/share/man/ru/man1/amulecmd.1.gz
+-rw-r--r--	root/root	usr/share/man/ru/man1/amuled.1.gz
+-rw-r--r--	root/root	usr/share/man/ru/man1/amulegui.1.gz
+-rw-r--r--	root/root	usr/share/man/ru/man1/amuleweb.1.gz
+-rw-r--r--	root/root	usr/share/man/ru/man1/cas.1.gz
+-rw-r--r--	root/root	usr/share/man/ru/man1/ed2k.1.gz
+-rw-r--r--	root/root	usr/share/man/ru/man1/wxcas.1.gz
 drwxr-xr-x	root/root	usr/share/pixmaps/
 -rw-r--r--	root/root	usr/share/pixmaps/alc.xpm
 -rw-r--r--	root/root	usr/share/pixmaps/amule.xpm
diff --git a/extra/amule/.md5sum b/extra/amule/.md5sum
index 22fce9d73..70557939c 100644
--- a/extra/amule/.md5sum
+++ b/extra/amule/.md5sum
@@ -1,2 +1 @@
-530d9b48187e36f78fc21bb19e94326d  aMule-2.2.6.tar.bz2
-57c8dc157ff1c2ac971d9fa358edb4b8  amule-2.2.6-gcc-01.patch
+fe4da5d6915570b46ca187cbc526e7c6  aMule-SVN-r10429.tar.bz2
diff --git a/extra/amule/Pkgfile b/extra/amule/Pkgfile
index 8a364bca0..6b0daf98e 100644
--- a/extra/amule/Pkgfile
+++ b/extra/amule/Pkgfile
@@ -2,35 +2,32 @@
 # URL: http://www.amule.org/
 # Maintainer: Antti Nykänen, aon at iki dot fi
 # Packager: Falcony, falcony at users dot sourceforge dot net
-# Depends on: wxgtk, crypto++
-# Run on: wxgtk,crypto++
+# Depends on: wxgtk, crypto++, gd, xorg-libxinerama, xorg-libxrandr, xorg-libxi, xorg-libxcursor
+# Run on: wxgtk,crypto++,gd,xorg-libxinerama,xorg-libxrandr,xorg-libxi,xorg-libxcursor
 
 name=amule
-version=2.2.6
-release=2
-source=(http://download.berlios.de/amule/aMule-$version.tar.bz2\
-	http://nutyx.meticul.eu/files/patchs/$name/amule-2.2.6-gcc-01.patch)
+version=10429
+release=1
+source=(http://amule.sourceforge.net/tarballs/aMule-SVN-r$version.tar.bz2)
 
 build() {
-	cd aMule-$version
-	patch -Np1 -i ../amule-2.2.6-gcc-01.patch
-	export CFLAGS="${CFLAGS//-fstack-protector/}"
-	export CXXFLAGS="${CXXFLAGS//-fstack-protector/}"
-	./configure 	--prefix=/usr \
-			--mandir=/usr/man \
-                        --disable-embedded_crypto \
-                        --enable-utf8-systray \
-                        --enable-cas \
-                        --enable-wxcas \
-                        --enable-amule-daemon \
-                        --enable-amulecmd \
-                        --enable-amule-gui \
-                        --enable-alc \
-                        --enable-alcc \
-                        --enable-webserver
+	cd aMule-SVN-r$version
+	./configure --prefix=/usr \
+              --mandir=/usr/share/man \
+              --enable-cas \
+              --enable-wxcas \
+              --enable-amule-daemon \
+              --enable-amulecmd \
+              --enable-amule-gui \
+              --enable-alc \
+              --enable-alcc \
+              --enable-webserver \
+              --disable-debug \
+              --enable-optimize \
+              --enable-ccache \
+	      --with-libupnp-prefix=PREFIX  
 	make
 	make install DESTDIR=$PKG
-	rm -rf $PKG/usr/{share/{doc,amule},man,lib,bin/autostart-xas}
 }