Update to aMule version 2.3.1 - The "unobvious evil date" version.

2011-11-28 15:28:49 +00:00 · 2011-11-28 15:28:49 +00:00 · 24baca1900
commit 24baca1900
parent 4eacb07c51
22 changed files with 330 additions and 544 deletions
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@ -1,21 +1,20 @@
-# $OpenBSD: Makefile,v 1.25 2011/07/28 11:06:40 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.26 2011/11/28 15:28:49 dcoppa Exp $

 COMMENT-main =	another eDonkey P2P file sharing client
 COMMENT-web =	webserver interface to amuled
 COMMENT-daemon =stand-alone daemon/cmdline for amule

-V =		2.2.6
+V =		2.3.1
 DISTNAME =	aMule-$V
 CATEGORIES =	net

 HOMEPAGE =	http://www.amule.org/
+
 MULTI_PACKAGES =-main -web -daemon
+
 PKGNAME-main =	amule-$V
 PKGNAME-daemon =amuled-$V
 PKGNAME-web =	amuleweb-$V
-REVISION-main = 3
-REVISION-daemon = 1
-REVISION-web = 1

 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
@ -25,7 +24,7 @@ PERMIT_DISTFILES_FTP =	Yes

 MAINTAINER =	Marc Espie <espie@openbsd.org>
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=amule/}
-EXTRACT_SUFX =	.tar.bz2
+EXTRACT_SUFX =	.tar.xz

 .if defined (SUBPACKAGE) && ${SUBPACKAGE:M-main}
 MODULES +=	converters/libiconv
@ -65,12 +64,15 @@ WANTLIB-web =		${WANTLIB} ${commonWANTLIB} \
 			png readline termcap

 USE_GMAKE =		Yes
+USE_GROFF =		Yes

 CONFIGURE_STYLE =	autoconf
-AUTOCONF_VERSION =	2.59
+AUTOCONF_VERSION =	2.65

 CONFIGURE_ARGS =	--disable-optimize \
 			--disable-profile \
+			--disable-plasmamule \
+			--disable-xas \
 			--enable-alc \
 			--enable-alcc \
 			--enable-amule-daemon \
@ -82,7 +84,7 @@ CONFIGURE_ARGS =	--disable-optimize \
 			--enable-wxcas \
 			--with-denoise-level=0 \
 			--with-libiconv-prefix=${LOCALBASE} \
-			--with-x
+			--with-libpng-config=${LOCALBASE}/bin/libpng-config

 .ifndef DEBUG
 CONFIGURE_ARGS +=	--disable-debug
@ -105,6 +107,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIST}/src/utils/scripts/mldonkey_importer.pl \
 		${PREFIX}/bin/mldonkey_importer

-NO_REGRESS =		Yes
-
 .include <bsd.port.mk>
--- a/net/amule/distinfo
+++ b/net/amule/distinfo
@ -1,5 +1,5 @@
-MD5 (aMule-2.2.6.tar.bz2) = Uw2bSBh+NvePwhuxnpQybQ==
-RMD160 (aMule-2.2.6.tar.bz2) = lIPrGQeAPTpqw3XE2Fp7DL2JXao=
-SHA1 (aMule-2.2.6.tar.bz2) = Npu5UIl8Px9Z/BGQrHA0ETrCU9A=
-SHA256 (aMule-2.2.6.tar.bz2) = bOMrXx2BE6IkqOhQY52VdlZiOgSnP7g9UjE8BsNIgSI=
-SIZE (aMule-2.2.6.tar.bz2) = 4722143
+MD5 (aMule-2.3.1.tar.xz) = X1cHrSBz03EAQJhwql0/kw==
+RMD160 (aMule-2.3.1.tar.xz) = tUOkt3QtxAZq3cgxaXFOJ1ARxUU=
+SHA1 (aMule-2.3.1.tar.xz) = 7DB34BfNcuE1rJOxCTdaFpw6QUk=
+SHA256 (aMule-2.3.1.tar.xz) = Aw3Bc4Dy+UlFdVJNfyvYdeDYu+OrNKuc7tsWANjod0M=
+SIZE (aMule-2.3.1.tar.xz) = 3721844
--- a/net/amule/patches/patch-acinclude_m4
+++ b/net/amule/patches/patch-acinclude_m4
@ -1,18 +1,16 @@
-$OpenBSD: patch-acinclude_m4,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
--- acinclude.m4.orig	Fri Jun 17 14:46:26 2011
-+++ acinclude.m4	Fri Jun 17 15:11:57 2011
-@@ -82,8 +82,8 @@ AC_DEFUN([MULE_CHECK_SYSTEM],
+$OpenBSD: patch-acinclude_m4,v 1.2 2011/11/28 15:28:49 dcoppa Exp $
+--- acinclude.m4.orig	Mon Jun 13 10:50:25 2011
+++ acinclude.m4	Mon Nov 28 14:10:57 2011
+@@ -253,7 +253,7 @@ AC_DEFUN([MULE_CHECK_SYSTEM],
 		;;
 	openbsd*) 
 		SYS=openbsd
 -		LIBS="$LIBS -L/usr/local/lib"
-		X11LIBS="-lX11 -L/usr/X11R6/lib"
 +		LIBS="$LIBS -L${LOCALDIR}/lib"
-+		X11LIBS="-lX11 -L${X11R6DIR}/lib"
 		MULECPPFLAGS="-D__OPENBSD__"
 		;;
 	*cygwin* | *mingw32*)
-@@ -113,11 +113,11 @@ AC_DEFUN([MULE_CHECK_SYSTEM],
+@@ -282,11 +282,11 @@ AC_DEFUN([MULE_CHECK_SYSTEM],
 		;;
 	esac
 
@ -27,7 +25,17 @@ $OpenBSD: patch-acinclude_m4,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
 		[
 			MULE_ADDFLAG([LD], [-pthread])
 			AC_MSG_RESULT(yes)
-@@ -359,7 +359,7 @@ AC_DEFUN([MULE_CHECK_FLEX_EXTENDED],
+@@ -464,9 +464,6 @@ AC_DEFUN([MULE_CHECK_BFD],
+ 
+ 	AC_MSG_RESULT([$result])
+ 
+-	AS_IF([test $result = no],
+-		[MULE_WARNING([bfd.h not found or unusable, please install binutils development package if you are a developer or want to help testing aMule])])
+-
+ AC_SUBST([BFD_CPPFLAGS])dnl
+ AC_SUBST([BFD_LIBS])dnl
+ ])
+@@ -480,7 +477,7 @@ AC_DEFUN([MULE_CHECK_FLEX_EXTENDED],
 [
 	AC_MSG_CHECKING([for extended flex capabilities])
 
--- a/net/amule/patches/patch-configure_in
+++ b/net/amule/patches/patch-configure_in
@ -1,8 +1,8 @@
-$OpenBSD: patch-configure_in,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
--- configure.in.orig	Wed Sep 16 23:02:52 2009
-+++ configure.in	Fri Jun 17 20:27:14 2011
-@@ -297,7 +297,7 @@ MULE_CHECK_CXXABI
- AC_LANG_POP([C++])
+$OpenBSD: patch-configure_in,v 1.2 2011/11/28 15:28:49 dcoppa Exp $
+--- configure.in.orig	Fri Nov 11 21:59:14 2011
+++ configure.in	Mon Nov 28 10:23:02 2011
+@@ -236,7 +236,7 @@ AC_LANG_POP([C++])
+ ])
 
 # Ok, we have all needed libs, now checking for other stuff
 -AS_IF([test "$LEX" = "flex"], [MULE_CHECK_FLEX_EXTENDED], [HAVE_FLEX_EXTENDED=no])
@ -10,23 +10,20 @@ $OpenBSD: patch-configure_in,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
 
 # Flush standard test results for speeding cache
 AC_CACHE_SAVE
-@@ -386,10 +386,6 @@ dnl AM_GNU_GETTEXT_VERSION *must not* be moved away fr
- AM_GNU_GETTEXT_VERSION(0.11.5)
- MULE_CHECK_NLS
+@@ -325,7 +325,6 @@ MULE_CHECK_NLS
 
-# Check for bfd.h (to have proper backtraces without using wxExecute)
-MULE_CHECK_BFD
+ # Check for bfd.h (to have proper backtraces without using wxExecute)
+ MULE_CHECK_BFD
 -MULE_CHECK_EXECINFO
-
+ 
 # Flush standard test results for speeding cache
 AC_CACHE_SAVE
- 
-@@ -399,7 +395,7 @@ MULE_COMPILATION_FLAGS
+@@ -336,7 +335,7 @@ MULE_COMPILATION_FLAGS
 
 # autoconf >= 2.60 already defines ${docdir}, but we always need it.
 AC_MSG_CHECKING([for docdir])
 -AS_IF([test -z "$docdir"], [docdir="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"])
-+AS_IF([test -z "$docdir"], [docdir="${datadir}/doc/amule"])
+AS_IF([test -z "$docdir"], [docdir="${datadir}/doc/${PACKAGE_TARNAME}"])
 AC_SUBST([docdir])dnl
 AC_MSG_RESULT([$docdir])
 
--- a/net/amule/patches/patch-docs_man_Makefile_in
+++ b/net/amule/patches/patch-docs_man_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-docs_man_Makefile_in,v 1.1 2011/07/27 13:11:59 dcoppa Exp $
--- docs/man/Makefile.in.orig	Wed Jul 27 13:10:21 2011
-+++ docs/man/Makefile.in	Wed Jul 27 13:14:12 2011
-@@ -475,7 +475,7 @@ uninstall-am: uninstall-info-am
- 
- install-data-hook:
- 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
-	for file in $(SELECTED_MANPAGES); do \
-+	for file in `echo $(SELECTED_MANPAGES) | sed -e 's/.orig//g'`; do \
- 		lang=`echo $$file |  sed -e 's/^[^.]*\.//'`; \
- 		if test $$lang = 1; then \
- 			echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/man1" ; \
--- a/net/amule/patches/patch-docs_man_ed2k_1
+++ b/net/amule/patches/patch-docs_man_ed2k_1
@ -1,15 +0,0 @@
-$OpenBSD: patch-docs_man_ed2k_1,v 1.1 2011/07/25 14:46:58 dcoppa Exp $
-
-Fix typo
-
--- docs/man/ed2k.1.orig	Mon Sep 14 21:26:03 2009
-+++ docs/man/ed2k.1	Mon Jul 25 16:35:30 2011
-@@ -20,7 +20,7 @@ Sends the given \fI<ED2k_link>\fR to aMule, i.e. write
- Prints a short usage description.
- .TP
- \fB\-c\fR, \fB\-\-config\-dir\fR=\fI<dir>\fR 
-Specifies the aMule configuration directory. This must be writeable by the user running \fBed2k\fR.
-+Specifies the aMule configuration directory. This must be writable by the user running \fBed2k\fR.
- .TP
- \fB\-e\fR, \fB\-\-emulecollection \fI<file>\fR
- Loads all links of the emulecollection passed as parameter.
--- a/net/amule/patches/patch-m4_libpng_m4
+++ b/net/amule/patches/patch-m4_libpng_m4
@ -0,0 +1,16 @@
+$OpenBSD: patch-m4_libpng_m4,v 1.1 2011/11/28 15:28:49 dcoppa Exp $
+--- m4/libpng.m4.orig	Mon Nov 28 09:58:11 2011
+++ m4/libpng.m4	Mon Nov 28 10:00:37 2011
+@@ -95,9 +95,9 @@ m4_define([REQUIRED_VERSION_MICRO], [m4_bregexp(REQUIR
+ 			SAVED_LDFLAGS=$LDFLAGS
+ 			SAVED_LIBS=$LIBS
+ 
+-			CFLAGS+=" $LIBPNG_CFLAGS"
+-			LDFLAGS+=" $LIBPNG_LDFLAGS"
+-			LIBS+=" $LIBPNG_LIBS"
+			CFLAGS="$CFLAGS $LIBPNG_CFLAGS"
+			LDFLAGS="$LDFLAGS $LIBPNG_LDFLAGS"
+			LIBS="$LIBS $LIBPNG_LIBS"
+ 
+ 			AC_LINK_IFELSE([
+ 				AC_LANG_PROGRAM([[
--- a/net/amule/patches/patch-src_BaseClient_cpp
+++ b/net/amule/patches/patch-src_BaseClient_cpp
@ -1,29 +0,0 @@
-$OpenBSD: patch-src_BaseClient_cpp,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
-
-Backport a bugfix from upstream git: work around a crash when doubly
-deleting a client.
-
--- src/BaseClient.cpp.orig	Wed Sep  9 22:46:31 2009
-+++ src/BaseClient.cpp	Fri Dec  3 10:37:13 2010
-@@ -336,6 +336,9 @@ CUpDownClient::~CUpDownClient()
- 		delete m_pReqFileAICHHash;
- 		m_pReqFileAICHHash = NULL;
- 	}
-+
-+	// Allow detection of deleted clients that didn't go through Safe_Delete
-+ 	m_clientState = CS_DYING;
- }
- 
- void CUpDownClient::ClearHelloProperties()
-@@ -1210,6 +1213,11 @@ void CUpDownClient::ClearDownloadBlockRequests()
- bool CUpDownClient::Disconnected(const wxString& strReason, bool bFromSocket)
- {
- 	//wxASSERT(theApp->clientlist->IsValidClient(this));
-+
-+	if (HasBeenDeleted()) {
-+		AddDebugLogLineM( false, logClient, wxT("Disconnected() called for already deleted client on ip ") + Uint32toStringIP(GetConnectIP()));
-+		return false;
-+	}
- 	
- 	// was this a direct callback?
- 	if (m_dwDirectCallbackTimeout != 0) {
--- a/net/amule/patches/patch-src_DownloadQueue_cpp
+++ b/net/amule/patches/patch-src_DownloadQueue_cpp
@ -1,15 +0,0 @@
-$OpenBSD: patch-src_DownloadQueue_cpp,v 1.1 2011/07/26 15:32:36 dcoppa Exp $
-
-Fix a crash with sources which are not compatible with amule's
-encryption settings (commit c204a4fbba4fe7a8ad43fa59b57a9ad57659de15)
-
--- src/DownloadQueue.cpp.orig	Tue Jul 26 15:04:43 2011
-+++ src/DownloadQueue.cpp	Tue Jul 26 15:10:01 2011
-@@ -628,7 +628,6 @@ void CDownloadQueue::CheckAndAddKnownSource(CPartFile*
- 	// Filter sources which are incompatible with our encryption setting (one requires it, and the other one doesn't supports it)
- 	if ( (source->RequiresCryptLayer() && (!thePrefs::IsClientCryptLayerSupported() || !source->HasValidHash())) || (thePrefs::IsClientCryptLayerRequired() && (!source->SupportsCryptLayer() || !source->HasValidHash())))
- 	{
-		source->Safe_Delete();
- 		return;
- 	}		
- 	
--- a/net/amule/patches/patch-src_ListenSocket_cpp
+++ b/net/amule/patches/patch-src_ListenSocket_cpp
@ -0,0 +1,16 @@
+$OpenBSD: patch-src_ListenSocket_cpp,v 1.1 2011/11/28 15:28:49 dcoppa Exp $
+
+Ok() is just an undocumented alias for IsOk()
+(upstream git commit 740c0298147a614806f1676f77a89908074b5574)
+
+--- src/ListenSocket.cpp.orig	Mon Nov 28 10:34:06 2011
+++ src/ListenSocket.cpp	Mon Nov 28 10:34:30 2011
+@@ -57,7 +57,7 @@ CSocketServerProxy(addr, wxSOCKET_NOWAIT|wxSOCKET_REUS
+ 	totalconnectionchecks = 0;
+ 	averageconnections = 0.0;
+ 	// Set the listen socket event handler -- The handler is written in amule.cpp
+-	if (Ok()) {
+	if (IsOk()) {
+  		SetEventHandler(*theApp, ID_LISTENSOCKET_EVENT);
+  		SetNotify(wxSOCKET_CONNECTION_FLAG);
+  		Notify(true);
--- a/net/amule/patches/patch-src_Preferences_cpp
+++ b/net/amule/patches/patch-src_Preferences_cpp
@ -1,15 +1,15 @@
-$OpenBSD: patch-src_Preferences_cpp,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
+$OpenBSD: patch-src_Preferences_cpp,v 1.2 2011/11/28 15:28:49 dcoppa Exp $

 Disable checking for new versions at startup.

--- src/Preferences.cpp.orig	Fri Jun 24 10:18:35 2011
-+++ src/Preferences.cpp	Fri Jun 24 10:19:23 2011
-@@ -1152,7 +1152,7 @@ void CPreferences::BuildItemList( const wxString& appd
+--- src/Preferences.cpp.orig	Mon Nov 28 09:34:26 2011
+++ src/Preferences.cpp	Mon Nov 28 09:36:11 2011
+@@ -1210,7 +1210,7 @@ void CPreferences::BuildItemList( const wxString& appd
 	/**
 	 * Version check
 	 **/
 -	 NewCfgItem(IDC_NEWVERSION,	(new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, true )));
 +	 NewCfgItem(IDC_NEWVERSION,	(new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, false )));
- 	 
+ 
 	 /**
 	  * Obfuscation
--- a/net/amule/patches/patch-src_UploadBandwidthThrottler_cpp
+++ b/net/amule/patches/patch-src_UploadBandwidthThrottler_cpp
@ -1,28 +0,0 @@
-$OpenBSD: patch-src_UploadBandwidthThrottler_cpp,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
-
-Bugfix from upstream git: fix a crash on close if the throttler is
-active and sleeping when the sockets are destroyed.
-
--- src/UploadBandwidthThrottler.cpp.orig	Sat Mar 28 20:29:59 2009
-+++ src/UploadBandwidthThrottler.cpp	Fri Dec  3 10:41:19 2010
-@@ -287,7 +287,7 @@ void* UploadBandwidthThrottler::Entry()
- 	uint32 rememberedSlotCounter = 0;
- 	uint32 extraSleepTime = TIME_BETWEEN_UPLOAD_LOOPS;
- 	
-	while (m_doRun) {
-+	while (m_doRun && !TestDestroy()) {
- 		uint32 timeSinceLastLoop = ::GetTickCountFullRes() - lastLoopTick;
- 
- 		// Get current speed from UploadSpeedSense
-@@ -322,6 +322,11 @@ void* UploadBandwidthThrottler::Entry()
- 
- 		if(timeSinceLastLoop < sleepTime) {
- 			Sleep(sleepTime-timeSinceLastLoop);
-+		}
-+
-+		// Check after sleep in case the thread has been signaled to end
-+		if (!m_doRun || TestDestroy()) {
-+			break;
- 		}
- 
- 		const uint32 thisLoopTick = ::GetTickCountFullRes();
--- a/net/amule/patches/patch-src_amule_cpp
+++ b/net/amule/patches/patch-src_amule_cpp
@ -1,23 +1,35 @@
-$OpenBSD: patch-src_amule_cpp,v 1.2 2011/06/24 08:42:31 dcoppa Exp $
+$OpenBSD: patch-src_amule_cpp,v 1.3 2011/11/28 15:28:49 dcoppa Exp $

 Disable checking for new versions at startup: it's useless and was
 causing a crash with amuled on sparc64.

--- src/amule.cpp.orig	Tue Aug 18 18:24:58 2009
-+++ src/amule.cpp	Thu Nov  4 15:25:39 2010
-@@ -727,6 +727,7 @@ bool CamuleApp::OnInit()
- 		printf("\n%s\n", (const char *)unicode2char(msg));
+Ok() is just an undocumented alias for IsOk()
+(upstream git commit 740c0298147a614806f1676f77a89908074b5574)
+
+--- src/amule.cpp.orig	Sun Sep 18 13:01:52 2011
+++ src/amule.cpp	Mon Nov 28 10:35:00 2011
+@@ -521,6 +521,7 @@ bool CamuleApp::OnInit()
+ 		AddLogLineNS(msg);
 	}
 
 +#ifndef __OPENBSD__
 	// Test if there's any new version
- 	if (thePrefs::CheckNewVersion()) {
+ 	if (thePrefs::GetCheckNewVersion()) {
 		// We use the thread base because I don't want a dialog to pop up.
-@@ -736,6 +737,7 @@ bool CamuleApp::OnInit()
+@@ -530,6 +531,7 @@ bool CamuleApp::OnInit()
 		version_check->Create();
 		version_check->Run();
 	}
 +#endif
 
 	// Create main dialog, or fork to background (daemon).
- 	InitGui(geometry_enabled, geom_string);
+ 	InitGui(m_geometryEnabled, m_geometryString);
+@@ -760,7 +762,7 @@ bool CamuleApp::ReinitializeNetwork(wxString* msg)
+ 	// This command just sets a flag to control maximum number of connections.
+ 	// Notify(true) has already been called to the ListenSocket, so events may
+ 	// be already comming in.
+-	if (listensocket->Ok()) {
+	if (listensocket->IsOk()) {
+ 		listensocket->StartListening();
+ 	} else {
+ 		// If we wern't able to start listening, we need to warn the user
--- a/net/amule/patches/patch-src_utils_aLinkCreator_docs_Makefile_in
+++ b/net/amule/patches/patch-src_utils_aLinkCreator_docs_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-src_utils_aLinkCreator_docs_Makefile_in,v 1.1 2011/07/27 13:11:59 dcoppa Exp $
--- src/utils/aLinkCreator/docs/Makefile.in.orig	Wed Jul 27 13:14:32 2011
-+++ src/utils/aLinkCreator/docs/Makefile.in	Wed Jul 27 13:15:04 2011
-@@ -467,7 +467,7 @@ uninstall-am: uninstall-info-am
- 
- install-data-hook:
- 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
-	for file in $(SELECTED_MANPAGES); do \
-+	for file in `echo $(SELECTED_MANPAGES) | sed -e 's/.orig//g'`; do \
- 		lang=`echo $$file |  sed -e 's/^[^.]*\.//'`; \
- 		if test $$lang = 1; then \
- 			echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/man1" ; \
--- a/net/amule/patches/patch-src_utils_aLinkCreator_docs_alc_1
+++ b/net/amule/patches/patch-src_utils_aLinkCreator_docs_alc_1
@ -1,15 +0,0 @@
-$OpenBSD: patch-src_utils_aLinkCreator_docs_alc_1,v 1.1 2011/07/25 14:46:58 dcoppa Exp $
-
-Fix typo
-
--- src/utils/aLinkCreator/docs/alc.1.orig	Mon Sep 14 21:26:03 2009
-+++ src/utils/aLinkCreator/docs/alc.1	Mon Jul 25 16:35:23 2011
-@@ -6,7 +6,7 @@ aLinkCreator \- the aMule ED2k link creator
- .SH DESCRIPTION
- \fBalc\fR is a graphical utility to create an ED2k link to any file on your computer.
- 
-This programm doesn't take any arguments.
-+This program doesn't take any arguments.
- .SH REPORTING BUGS
- Please report bugs either on our forum (\fIhttp://forum.amule.org/\fR), or in our bugtracker (\fIhttp://bugs.amule.org/\fR).
- Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member.
--- a/net/amule/patches/patch-src_utils_cas_configfile_c
+++ b/net/amule/patches/patch-src_utils_cas_configfile_c
@ -1,9 +1,9 @@
-$OpenBSD: patch-src_utils_cas_configfile_c,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
+$OpenBSD: patch-src_utils_cas_configfile_c,v 1.2 2011/11/28 15:28:49 dcoppa Exp $

 Sane defaults.

--- src/utils/cas/configfile.c.orig	Wed Dec  1 16:59:01 2010
-+++ src/utils/cas/configfile.c	Wed Dec  1 17:01:45 2010
+--- src/utils/cas/configfile.c.orig	Mon Nov 28 09:36:48 2011
+++ src/utils/cas/configfile.c	Mon Nov 28 09:37:47 2011
@@ -44,9 +44,9 @@ int writeconfig(void)
 		"# font_size - size the font\n",
 		"# source_image - image where the text will be writen\n",
@ -11,7 +11,7 @@ Sane defaults.
 -		"font /usr/share/fonts/corefonts/times.ttf\n",
 +		"font ${X11BASE}/lib/X11/fonts/TTF/DejaVuSerif.ttf\n",
 		"font_size 10.5\n",
-		"source_image /usr/share/pixmaps/stat.png\n",
+-		"source_image /usr/share/cas/stat.png\n",
 +		"source_image ${TRUEPREFIX}/share/cas/stat.png\n",
 		"first_line 23,17,1\n",
 		"second_line 23,34,1\n",
@ -20,7 +20,7 @@ Sane defaults.
 		"fifth_line 23,85,1\n",
 		"sixth_line 23,102,1\n",
 		"seventh_line 23,119,1\n",
-		"template /usr/share/pixmaps/tmp.html\n",
+-		"template /usr/share/cas/tmp.html\n"
 +		"template ${TRUEPREFIX}/share/cas/tmp.html\n",
 		"img_type 0\n"
 	};
--- a/net/amule/patches/patch-src_utils_scripts_denoiser_rules
+++ b/net/amule/patches/patch-src_utils_scripts_denoiser_rules
@ -0,0 +1,21 @@
+$OpenBSD: patch-src_utils_scripts_denoiser_rules,v 1.1 2011/11/28 15:28:49 dcoppa Exp $
+
+Fix the denoiser not to silence test results from 'make check'
+(upstream git commit 239003f1fb2ef3da2efb6764dc8133cb73735aea)
+
+--- src/utils/scripts/denoiser.rules.orig	Sun Mar 27 15:01:14 2011
+++ src/utils/scripts/denoiser.rules	Mon Nov 28 10:40:39 2011
+@@ -176,6 +176,13 @@ MAKEFLAGS=-w -s
+ 		b 0
+ 	}
+ 
+	# ship the check target, otherwise test results would be stripped
+	/^check-TESTS$/ {
+		s/.*//
+		x
+		b 0
+	}
+
+ 	# do some output based on rule target
+ 	/\.o$/ {
+ 		i\
--- a/net/amule/patches/patch-src_webserver_src_WebInterface_cpp
+++ b/net/amule/patches/patch-src_webserver_src_WebInterface_cpp
@ -1,47 +0,0 @@
-$OpenBSD: patch-src_webserver_src_WebInterface_cpp,v 1.1 2011/07/26 15:32:36 dcoppa Exp $
-
-Fix a crash when amuleweb is working as amuled child
-(upstream git commit b0c3dab3fc005cb9e4fbbae20c0d0a42f2ffd9b6)
-
-Use "litoral" as the default template
-
--- src/webserver/src/WebInterface.cpp.orig	Wed May  6 22:39:18 2009
-+++ src/webserver/src/WebInterface.cpp	Tue Jul 26 16:47:37 2011
-@@ -467,7 +467,7 @@ bool CamulewebApp::GetTemplateDir(const wxString& temp
- 
- 	
- 	// template not found. reverting to default
-	const wxChar* const defaultTemplateName = wxT("php-default");
-+	const wxChar* const defaultTemplateName = wxT("litoral");
- 
- 	if ( templateName == defaultTemplateName ) {
- 		return false;
-@@ -559,14 +559,15 @@ bool CamulewebApp::OnCmdLineParsed(wxCmdLineParser& pa
- 		LoadAmuleConfig(cfg);
- 		// do not process any other command-line parameters, use defaults instead
- 
-+		m_Verbose = false;
-+		m_KeepQuiet = true;
-+		m_LoadSettingsFromAmule = true;
-+
- 		if (!(m_TemplateOk = GetTemplateDir(m_TemplateName, m_TemplateDir))) {
- 			// no reason to run webserver without a template
- 			fprintf(stderr, "FATAL ERROR: Cannot find template: %s\n", (const char *)unicode2char(m_TemplateName));
-			return true;
-+			return false;
- 		}
-		m_Verbose = false;
-		m_KeepQuiet = true;
-		m_LoadSettingsFromAmule = true;
- 		return true;
- 	}
- 
-@@ -578,7 +579,7 @@ bool CamulewebApp::OnCmdLineParsed(wxCmdLineParser& pa
- 
- 		parser.Found(wxT("template"), &m_TemplateName);
- 		if (m_TemplateName.IsEmpty()) {
-			m_TemplateName = wxT("php-default");
-+			m_TemplateName = wxT("litoral");
- 		}
- 		if (!(m_TemplateOk = GetTemplateDir(m_TemplateName, m_TemplateDir))) {
- 			// no reason to run webserver without a template
--- a/net/amule/patches/patch-src_webserver_src_php_lexer_c
+++ b/net/amule/patches/patch-src_webserver_src_php_lexer_c
@ -0,0 +1,12 @@
+$OpenBSD: patch-src_webserver_src_php_lexer_c,v 1.1 2011/11/28 15:28:49 dcoppa Exp $
+--- src/webserver/src/php_lexer.c.orig	Mon Nov 28 12:17:33 2011
+++ src/webserver/src/php_lexer.c	Mon Nov 28 12:19:01 2011
+@@ -31,7 +31,7 @@
+ 
+ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+ 
+-#if __STDC_VERSION__ >= 199901L
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ 
+ /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+  * if you want the limit (max/min) macros for int types. 
--- a/net/amule/pkg/PLIST-daemon
+++ b/net/amule/pkg/PLIST-daemon
@ -1,5 +1,33 @@
-@comment $OpenBSD: PLIST-daemon,v 1.2 2011/06/24 08:42:31 dcoppa Exp $
+@comment $OpenBSD: PLIST-daemon,v 1.3 2011/11/28 15:28:49 dcoppa Exp $
@bin bin/amulecmd
@bin bin/amuled
+@comment man/de/
+@comment man/de/man1/
+@comment @man man/de/man1/amulecmd.1
+@comment @man man/de/man1/amuled.1
+@comment man/es/
+@comment man/es/man1/
+@comment @man man/es/man1/amulecmd.1
+@comment @man man/es/man1/amuled.1
+@comment man/fr/
+@comment man/fr/man1/
+@comment @man man/fr/man1/amulecmd.1
+@comment @man man/fr/man1/amuled.1
+@comment man/hu/
+@comment man/hu/man1/
+@comment @man man/hu/man1/amulecmd.1
+@comment @man man/hu/man1/amuled.1
+@comment man/it/
+@comment man/it/man1/
+@comment @man man/it/man1/amulecmd.1
+@comment @man man/it/man1/amuled.1
@man man/man1/amulecmd.1
@man man/man1/amuled.1
+@comment man/ru/
+@comment man/ru/man1/
+@comment @man man/ru/man1/amulecmd.1
+@comment @man man/ru/man1/amuled.1
+@comment man/tr/
+@comment man/tr/man1/
+@comment @man man/tr/man1/amulecmd.1
+@comment @man man/tr/man1/amuled.1
--- a/net/amule/pkg/PLIST-main
+++ b/net/amule/pkg/PLIST-main
@ -1,82 +1,58 @@
-@comment $OpenBSD: PLIST-main,v 1.6 2011/07/27 13:11:59 dcoppa Exp $
+@comment $OpenBSD: PLIST-main,v 1.7 2011/11/28 15:28:49 dcoppa Exp $
@pkgpath net/amule
@bin bin/alc
@bin bin/alcc
@bin bin/amule
@bin bin/amulegui
-@comment bin/autostart-xas
@bin bin/cas
@bin bin/ed2k
 bin/mldonkey_importer
@bin bin/wxcas
-@comment lib/xchat/
-@comment lib/xchat/plugins/
-@comment lib/xchat/plugins/xas.pl
@comment man/de/
@comment man/de/man1/
@comment @man man/de/man1/alc.1
@comment @man man/de/man1/alcc.1
@comment @man man/de/man1/amule.1
-@comment @man man/de/man1/amulecmd.1
-@comment @man man/de/man1/amuled.1
@comment @man man/de/man1/amulegui.1
-@comment @man man/de/man1/amuleweb.1
@comment @man man/de/man1/cas.1
@comment @man man/de/man1/ed2k.1
@comment @man man/de/man1/wxcas.1
-@comment @man man/de/man1/xas.1
@comment man/es/
@comment man/es/man1/
@comment @man man/es/man1/alc.1
@comment @man man/es/man1/alcc.1
@comment @man man/es/man1/amule.1
-@comment @man man/es/man1/amulecmd.1
-@comment @man man/es/man1/amuled.1
-@comment @man man/es/man1/amuleweb.1
+@comment @man man/es/man1/amulegui.1
@comment @man man/es/man1/cas.1
@comment @man man/es/man1/ed2k.1
@comment @man man/es/man1/wxcas.1
-@comment @man man/es/man1/xas.1
-@comment man/eu/
-@comment man/eu/man1/
-@comment @man man/eu/man1/alc.1
-@comment @man man/eu/man1/alcc.1
-@comment @man man/eu/man1/amule.1
-@comment @man man/eu/man1/amulecmd.1
-@comment @man man/eu/man1/amuled.1
-@comment @man man/eu/man1/amuleweb.1
-@comment @man man/eu/man1/cas.1
-@comment @man man/eu/man1/ed2k.1
-@comment @man man/eu/man1/wxcas.1
-@comment @man man/eu/man1/xas.1
@comment man/fr/
@comment man/fr/man1/
+@comment @man man/fr/man1/alc.1
@comment @man man/fr/man1/alcc.1
@comment @man man/fr/man1/amule.1
-@comment @man man/fr/man1/amulecmd.1
-@comment @man man/fr/man1/amuled.1
-@comment @man man/fr/man1/amuleweb.1
+@comment @man man/fr/man1/amulegui.1
+@comment @man man/fr/man1/cas.1
@comment @man man/fr/man1/ed2k.1
+@comment @man man/fr/man1/wxcas.1
@comment man/hu/
@comment man/hu/man1/
@comment @man man/hu/man1/alc.1
@comment @man man/hu/man1/alcc.1
@comment @man man/hu/man1/amule.1
-@comment @man man/hu/man1/amulecmd.1
-@comment @man man/hu/man1/amuled.1
-@comment @man man/hu/man1/amuleweb.1
+@comment @man man/hu/man1/amulegui.1
@comment @man man/hu/man1/cas.1
@comment @man man/hu/man1/ed2k.1
@comment @man man/hu/man1/wxcas.1
-@comment @man man/hu/man1/xas.1
@comment man/it/
@comment man/it/man1/
+@comment @man man/it/man1/alc.1
+@comment @man man/it/man1/alcc.1
@comment @man man/it/man1/amule.1
-@comment @man man/it/man1/amulecmd.1
-@comment @man man/it/man1/amuled.1
@comment @man man/it/man1/amulegui.1
-@comment @man man/it/man1/amuleweb.1
+@comment @man man/it/man1/cas.1
@comment @man man/it/man1/ed2k.1
+@comment @man man/it/man1/wxcas.1
@man man/man1/alc.1
@man man/man1/alcc.1
@man man/man1/amule.1
@ -84,13 +60,33 @@ bin/mldonkey_importer
@man man/man1/cas.1
@man man/man1/ed2k.1
@man man/man1/wxcas.1
-@comment @man man/man1/xas.1
+@comment man/ru/
+@comment man/ru/man1/
+@comment @man man/ru/man1/alc.1
+@comment @man man/ru/man1/alcc.1
+@comment @man man/ru/man1/amule.1
+@comment @man man/ru/man1/amulegui.1
+@comment @man man/ru/man1/cas.1
+@comment @man man/ru/man1/ed2k.1
+@comment @man man/ru/man1/wxcas.1
+@comment man/tr/
+@comment man/tr/man1/
+@comment @man man/tr/man1/alc.1
+@comment @man man/tr/man1/alcc.1
+@comment @man man/tr/man1/amule.1
+@comment @man man/tr/man1/amulegui.1
+@comment @man man/tr/man1/cas.1
+@comment @man man/tr/man1/ed2k.1
+@comment @man man/tr/man1/wxcas.1
 share/amule/
 share/amule/skins/
+share/amule/skins/Mac_Gray.zip
 share/amule/skins/gnome.zip
 share/amule/skins/kde4.zip
+share/amule/skins/priscilla.zip
 share/amule/skins/tango.zip
 share/amule/skins/xfce.zip
+share/applications/
 share/applications/alc.desktop
 share/applications/amule.desktop
 share/applications/amulegui.desktop
@ -102,44 +98,74 @@ share/doc/amule/
@comment share/doc/amule/ABOUT-NLS
@comment share/doc/amule/Changelog
 share/doc/amule/EC_Protocol.txt
-share/doc/amule/ED2K-Links.HOWTO
@comment share/doc/amule/INSTALL
 share/doc/amule/README
@comment share/doc/amule/TODO
-@comment share/doc/amule/amule-win32.HOWTO.txt
 share/doc/amule/amulesig.txt
-@comment share/doc/amule/license.txt
-@comment share/doc/amule/socks4.protocol
+share/doc/amule/license.txt
+share/locale/
 share/locale/ar/
 share/locale/ar/LC_MESSAGES/
 share/locale/ar/LC_MESSAGES/amule.mo
 share/locale/ast/
 share/locale/ast/LC_MESSAGES/
 share/locale/ast/LC_MESSAGES/amule.mo
+share/locale/bg/
+share/locale/bg/LC_MESSAGES/
 share/locale/bg/LC_MESSAGES/amule.mo
+share/locale/ca/
+share/locale/ca/LC_MESSAGES/
 share/locale/ca/LC_MESSAGES/amule.mo
+share/locale/cs/
+share/locale/cs/LC_MESSAGES/
 share/locale/cs/LC_MESSAGES/amule.mo
+share/locale/da/
+share/locale/da/LC_MESSAGES/
 share/locale/da/LC_MESSAGES/amule.mo
+share/locale/de/
+share/locale/de/LC_MESSAGES/
 share/locale/de/LC_MESSAGES/amule.mo
+share/locale/el/
+share/locale/el/LC_MESSAGES/
 share/locale/el/LC_MESSAGES/amule.mo
 share/locale/en_GB/
 share/locale/en_GB/LC_MESSAGES/
 share/locale/en_GB/LC_MESSAGES/amule.mo
+share/locale/es/
+share/locale/es/LC_MESSAGES/
 share/locale/es/LC_MESSAGES/amule.mo
 share/locale/et_EE/
 share/locale/et_EE/LC_MESSAGES/
 share/locale/et_EE/LC_MESSAGES/amule.mo
+share/locale/eu/
+share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/amule.mo
+share/locale/fi/
+share/locale/fi/LC_MESSAGES/
 share/locale/fi/LC_MESSAGES/amule.mo
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
 share/locale/fr/LC_MESSAGES/amule.mo
+share/locale/gl/
+share/locale/gl/LC_MESSAGES/
 share/locale/gl/LC_MESSAGES/amule.mo
+share/locale/he/
+share/locale/he/LC_MESSAGES/
 share/locale/he/LC_MESSAGES/amule.mo
+share/locale/hr/
+share/locale/hr/LC_MESSAGES/
 share/locale/hr/LC_MESSAGES/amule.mo
+share/locale/hu/
+share/locale/hu/LC_MESSAGES/
 share/locale/hu/LC_MESSAGES/amule.mo
+share/locale/it/
+share/locale/it/LC_MESSAGES/
 share/locale/it/LC_MESSAGES/amule.mo
 share/locale/it_CH/
 share/locale/it_CH/LC_MESSAGES/
 share/locale/it_CH/LC_MESSAGES/amule.mo
+share/locale/ja/
+share/locale/ja/LC_MESSAGES/
 share/locale/ja/LC_MESSAGES/amule.mo
 share/locale/ko_KR/
 share/locale/ko_KR/LC_MESSAGES/
@ -147,22 +173,44 @@ share/locale/ko_KR/LC_MESSAGES/amule.mo
 share/locale/lt/
 share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/amule.mo
+share/locale/nl/
+share/locale/nl/LC_MESSAGES/
 share/locale/nl/LC_MESSAGES/amule.mo
+share/locale/nn/
+share/locale/nn/LC_MESSAGES/
 share/locale/nn/LC_MESSAGES/amule.mo
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
 share/locale/pl/LC_MESSAGES/amule.mo
+share/locale/pt_BR/
+share/locale/pt_BR/LC_MESSAGES/
 share/locale/pt_BR/LC_MESSAGES/amule.mo
 share/locale/pt_PT/
 share/locale/pt_PT/LC_MESSAGES/
 share/locale/pt_PT/LC_MESSAGES/amule.mo
+share/locale/ru/
+share/locale/ru/LC_MESSAGES/
 share/locale/ru/LC_MESSAGES/amule.mo
+share/locale/sl/
+share/locale/sl/LC_MESSAGES/
 share/locale/sl/LC_MESSAGES/amule.mo
 share/locale/sq/
 share/locale/sq/LC_MESSAGES/
 share/locale/sq/LC_MESSAGES/amule.mo
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
 share/locale/sv/LC_MESSAGES/amule.mo
+share/locale/tr/
+share/locale/tr/LC_MESSAGES/
 share/locale/tr/LC_MESSAGES/amule.mo
+share/locale/uk/
+share/locale/uk/LC_MESSAGES/
 share/locale/uk/LC_MESSAGES/amule.mo
+share/locale/zh_CN/
+share/locale/zh_CN/LC_MESSAGES/
 share/locale/zh_CN/LC_MESSAGES/amule.mo
+share/locale/zh_TW/
+share/locale/zh_TW/LC_MESSAGES/
 share/locale/zh_TW/LC_MESSAGES/amule.mo
 share/pixmaps/
 share/pixmaps/alc.xpm
--- a/net/amule/pkg/PLIST-web
+++ b/net/amule/pkg/PLIST-web
@ -1,294 +1,95 @@
-@comment $OpenBSD: PLIST-web,v 1.2 2011/06/24 08:42:31 dcoppa Exp $
+@comment $OpenBSD: PLIST-web,v 1.3 2011/11/28 15:28:49 dcoppa Exp $
@bin bin/amuleweb
+@comment man/de/
+@comment man/de/man1/
+@comment @man man/de/man1/amuleweb.1
+@comment man/es/
+@comment man/es/man1/
+@comment @man man/es/man1/amuleweb.1
+@comment man/fr/
+@comment man/fr/man1/
+@comment @man man/fr/man1/amuleweb.1
+@comment man/hu/
+@comment man/hu/man1/
+@comment @man man/hu/man1/amuleweb.1
+@comment man/it/
+@comment man/it/man1/
+@comment @man man/it/man1/amuleweb.1
@man man/man1/amuleweb.1
+@comment man/ru/
+@comment man/ru/man1/
+@comment @man man/ru/man1/amuleweb.1
+@comment man/tr/
+@comment man/tr/man1/
+@comment @man man/tr/man1/amuleweb.1
 share/amule/
 share/amule/webserver/
-share/amule/webserver/chicane/
-share/amule/webserver/chicane/aMule.tmpl
-share/amule/webserver/chicane/add_server.gif
-share/amule/webserver/chicane/arrow_down.gif
-share/amule/webserver/chicane/arrow_down_logout.gif
-share/amule/webserver/chicane/arrow_right.gif
-share/amule/webserver/chicane/arrow_up.gif
-share/amule/webserver/chicane/back.gif
-share/amule/webserver/chicane/black.gif
-share/amule/webserver/chicane/blank1x1.gif
-share/amule/webserver/chicane/blue1.gif
-share/amule/webserver/chicane/blue2.gif
-share/amule/webserver/chicane/blue3.gif
-share/amule/webserver/chicane/blue4.gif
-share/amule/webserver/chicane/blue5.gif
-share/amule/webserver/chicane/blue6.gif
-share/amule/webserver/chicane/cp_download.gif
-share/amule/webserver/chicane/cp_kad.gif
-share/amule/webserver/chicane/cp_search.gif
-share/amule/webserver/chicane/cp_servers.gif
-share/amule/webserver/chicane/cp_settings.gif
-share/amule/webserver/chicane/cp_shared.gif
-share/amule/webserver/chicane/cp_stats.gif
-share/amule/webserver/chicane/downloads.php
-share/amule/webserver/chicane/emule.gif
-share/amule/webserver/chicane/favicon.ico
-share/amule/webserver/chicane/green.gif
-share/amule/webserver/chicane/greenpercent.gif
-share/amule/webserver/chicane/index.php
-share/amule/webserver/chicane/l_cancel.gif
-share/amule/webserver/chicane/l_connect.gif
-share/amule/webserver/chicane/l_down.gif
-share/amule/webserver/chicane/l_ed2klink.gif
-share/amule/webserver/chicane/l_info.gif
-share/amule/webserver/chicane/l_pause.gif
-share/amule/webserver/chicane/l_resume.gif
-share/amule/webserver/chicane/l_up.gif
-share/amule/webserver/chicane/log.gif
-share/amule/webserver/chicane/login.php
-share/amule/webserver/chicane/login_bottom.gif
-share/amule/webserver/chicane/login_downmain.gif
-share/amule/webserver/chicane/login_lefttop.gif
-share/amule/webserver/chicane/login_righttop.gif
-share/amule/webserver/chicane/login_top.gif
-share/amule/webserver/chicane/login_topdown.gif
-share/amule/webserver/chicane/login_topseperator.gif
-share/amule/webserver/chicane/logo.jpg
-share/amule/webserver/chicane/main_bg.gif
-share/amule/webserver/chicane/main_top_bg.gif
-share/amule/webserver/chicane/main_topbar.gif
-share/amule/webserver/chicane/main_topbardarker.gif
-share/amule/webserver/chicane/main_topbarseperator.gif
-share/amule/webserver/chicane/phpamule.png
-share/amule/webserver/chicane/preferences.php
-share/amule/webserver/chicane/red.gif
-share/amule/webserver/chicane/search.php
-share/amule/webserver/chicane/servers.php
-share/amule/webserver/chicane/shared.php
-share/amule/webserver/chicane/stat_graphs.php
-share/amule/webserver/chicane/stat_tree.php
-share/amule/webserver/chicane/transparent.gif
-share/amule/webserver/chicane/tree-closed.gif
-share/amule/webserver/chicane/tree-leaf.gif
-share/amule/webserver/chicane/tree-open.gif
-share/amule/webserver/chicane/yellow.gif
 share/amule/webserver/default/
-share/amule/webserver/default/aMule.tmpl
-share/amule/webserver/default/add_server.gif
-share/amule/webserver/default/arrow_down.gif
-share/amule/webserver/default/arrow_right.gif
-share/amule/webserver/default/arrow_up.gif
-share/amule/webserver/default/back.gif
+share/amule/webserver/default/amuleweb-main-dload.php
+share/amule/webserver/default/amuleweb-main-kad.php
+share/amule/webserver/default/amuleweb-main-log.php
+share/amule/webserver/default/amuleweb-main-prefs.php
+share/amule/webserver/default/amuleweb-main-search.php
+share/amule/webserver/default/amuleweb-main-servers.php
+share/amule/webserver/default/amuleweb-main-shared.php
+share/amule/webserver/default/amuleweb-main-stats.php
 share/amule/webserver/default/black.gif
+share/amule/webserver/default/blank1x1.gif
 share/amule/webserver/default/blue1.gif
 share/amule/webserver/default/blue2.gif
 share/amule/webserver/default/blue3.gif
 share/amule/webserver/default/blue4.gif
 share/amule/webserver/default/blue5.gif
 share/amule/webserver/default/blue6.gif
-share/amule/webserver/default/cp_download.gif
-share/amule/webserver/default/cp_kad.gif
-share/amule/webserver/default/cp_search.gif
-share/amule/webserver/default/cp_servers.gif
-share/amule/webserver/default/cp_settings.gif
-share/amule/webserver/default/cp_shared.gif
-share/amule/webserver/default/cp_stats.gif
-share/amule/webserver/default/downloads.php
-share/amule/webserver/default/emule.gif
+share/amule/webserver/default/cancel.gif
+share/amule/webserver/default/close.png
+share/amule/webserver/default/col.png
+share/amule/webserver/default/connect.gif
+share/amule/webserver/default/down.png
+share/amule/webserver/default/edkserv_0.png
+share/amule/webserver/default/edkserv_1.png
 share/amule/webserver/default/favicon.ico
-share/amule/webserver/default/green.gif
-share/amule/webserver/default/greenpercent.gif
-share/amule/webserver/default/index.php
-share/amule/webserver/default/l_cancel.gif
-share/amule/webserver/default/l_connect.gif
-share/amule/webserver/default/l_down.gif
-share/amule/webserver/default/l_ed2klink.gif
-share/amule/webserver/default/l_info.gif
-share/amule/webserver/default/l_pause.gif
-share/amule/webserver/default/l_resume.gif
-share/amule/webserver/default/l_up.gif
-share/amule/webserver/default/log.gif
+share/amule/webserver/default/filter.png
+share/amule/webserver/default/fond.gif
+share/amule/webserver/default/fond_haut.png
+share/amule/webserver/default/footer.php
+share/amule/webserver/default/index.html
+share/amule/webserver/default/log.php
 share/amule/webserver/default/login.php
-share/amule/webserver/default/logo.jpg
-share/amule/webserver/default/phpamule.png
-share/amule/webserver/default/preferences.php
+share/amule/webserver/default/loginfond.gif
+share/amule/webserver/default/loginfond_haut.png
+share/amule/webserver/default/loginlogo.jpg
+share/amule/webserver/default/loginlogo.png
+share/amule/webserver/default/logo.png
+share/amule/webserver/default/maquette.dwt
+share/amule/webserver/default/ok.png
+share/amule/webserver/default/pause.png
+share/amule/webserver/default/play.png
 share/amule/webserver/default/red.gif
-share/amule/webserver/default/search.php
-share/amule/webserver/default/servers.php
-share/amule/webserver/default/shared.php
-share/amule/webserver/default/stat_graphs.php
-share/amule/webserver/default/stat_tree.php
-share/amule/webserver/default/transparent.gif
+share/amule/webserver/default/refresh.png
+share/amule/webserver/default/search_0.png
+share/amule/webserver/default/search_1.png
+share/amule/webserver/default/shared_0.png
+share/amule/webserver/default/shared_1.png
+share/amule/webserver/default/sheserv_0.png
+share/amule/webserver/default/sheserv_1.png
+share/amule/webserver/default/stats.php
+share/amule/webserver/default/stats_0.png
+share/amule/webserver/default/stats_1.png
+share/amule/webserver/default/stats_tree.php
+share/amule/webserver/default/style.css
+share/amule/webserver/default/tab_bottom.png
+share/amule/webserver/default/tab_bottom_left.png
+share/amule/webserver/default/tab_bottom_right.png
+share/amule/webserver/default/tab_left.png
+share/amule/webserver/default/tab_right.png
+share/amule/webserver/default/tab_top.png
+share/amule/webserver/default/tab_top_left.png
+share/amule/webserver/default/tab_top_right.png
+share/amule/webserver/default/transf_0.png
+share/amule/webserver/default/transf_1.png
 share/amule/webserver/default/tree-closed.gif
 share/amule/webserver/default/tree-leaf.gif
 share/amule/webserver/default/tree-open.gif
+share/amule/webserver/default/up.png
 share/amule/webserver/default/yellow.gif
-share/amule/webserver/litoral/
-share/amule/webserver/litoral/amuleweb-main-dload.php
-share/amule/webserver/litoral/amuleweb-main-kad.php
-share/amule/webserver/litoral/amuleweb-main-log.php
-share/amule/webserver/litoral/amuleweb-main-prefs.php
-share/amule/webserver/litoral/amuleweb-main-search.php
-share/amule/webserver/litoral/amuleweb-main-servers.php
-share/amule/webserver/litoral/amuleweb-main-shared.php
-share/amule/webserver/litoral/amuleweb-main-stats.php
-share/amule/webserver/litoral/black.gif
-share/amule/webserver/litoral/blank1x1.gif
-share/amule/webserver/litoral/blue1.gif
-share/amule/webserver/litoral/blue2.gif
-share/amule/webserver/litoral/blue3.gif
-share/amule/webserver/litoral/blue4.gif
-share/amule/webserver/litoral/blue5.gif
-share/amule/webserver/litoral/blue6.gif
-share/amule/webserver/litoral/cancel.gif
-share/amule/webserver/litoral/close.png
-share/amule/webserver/litoral/col.png
-share/amule/webserver/litoral/connect.gif
-share/amule/webserver/litoral/down.png
-share/amule/webserver/litoral/edkserv_0.png
-share/amule/webserver/litoral/edkserv_1.png
-share/amule/webserver/litoral/favicon.ico
-share/amule/webserver/litoral/filter.png
-share/amule/webserver/litoral/fond.gif
-share/amule/webserver/litoral/fond_haut.png
-share/amule/webserver/litoral/footer.php
-share/amule/webserver/litoral/index.html
-share/amule/webserver/litoral/kitty.gif
-share/amule/webserver/litoral/log.php
-share/amule/webserver/litoral/login.php
-share/amule/webserver/litoral/loginfond.gif
-share/amule/webserver/litoral/loginfond_haut.png
-share/amule/webserver/litoral/loginlogo.jpg
-share/amule/webserver/litoral/loginlogo.png
-share/amule/webserver/litoral/logo.png
-share/amule/webserver/litoral/maquette.dwt
-share/amule/webserver/litoral/ok.png
-share/amule/webserver/litoral/pause.png
-share/amule/webserver/litoral/play.png
-share/amule/webserver/litoral/red.gif
-share/amule/webserver/litoral/refresh.png
-share/amule/webserver/litoral/search_0.png
-share/amule/webserver/litoral/search_1.png
-share/amule/webserver/litoral/shared_0.png
-share/amule/webserver/litoral/shared_1.png
-share/amule/webserver/litoral/sheserv_0.png
-share/amule/webserver/litoral/sheserv_1.png
-share/amule/webserver/litoral/stats.php
-share/amule/webserver/litoral/stats_0.png
-share/amule/webserver/litoral/stats_1.png
-share/amule/webserver/litoral/stats_tree.php
-share/amule/webserver/litoral/style.css
-share/amule/webserver/litoral/tab_bottom.png
-share/amule/webserver/litoral/tab_bottom_left.png
-share/amule/webserver/litoral/tab_bottom_right.png
-share/amule/webserver/litoral/tab_left.png
-share/amule/webserver/litoral/tab_right.png
-share/amule/webserver/litoral/tab_top.png
-share/amule/webserver/litoral/tab_top_left.png
-share/amule/webserver/litoral/tab_top_right.png
-share/amule/webserver/litoral/transf_0.png
-share/amule/webserver/litoral/transf_1.png
-share/amule/webserver/litoral/tree-closed.gif
-share/amule/webserver/litoral/tree-leaf.gif
-share/amule/webserver/litoral/tree-open.gif
-share/amule/webserver/litoral/up.png
-share/amule/webserver/litoral/yellow.gif
-share/amule/webserver/php-default/
-share/amule/webserver/php-default/amuleweb-main-dload.php
-share/amule/webserver/php-default/amuleweb-main-kad.php
-share/amule/webserver/php-default/amuleweb-main-prefs.php
-share/amule/webserver/php-default/amuleweb-main-search.php
-share/amule/webserver/php-default/amuleweb-main-servers.php
-share/amule/webserver/php-default/amuleweb-main-shared.php
-share/amule/webserver/php-default/amuleweb-main-stats.php
-share/amule/webserver/php-default/apply.jpeg
-share/amule/webserver/php-default/arrow-r.png
-share/amule/webserver/php-default/cancel.gif
-share/amule/webserver/php-default/connect.gif
-share/amule/webserver/php-default/delete.jpeg
-share/amule/webserver/php-default/down.jpeg
-share/amule/webserver/php-default/favicon.ico
-share/amule/webserver/php-default/footer.php
-share/amule/webserver/php-default/index.html
-share/amule/webserver/php-default/login.php
-share/amule/webserver/php-default/pause.jpeg
-share/amule/webserver/php-default/phpamule.png
-share/amule/webserver/php-default/resume.jpeg
-share/amule/webserver/php-default/stats.php
-share/amule/webserver/php-default/stats_tree.php
-share/amule/webserver/php-default/toolbutton-connect.jpeg
-share/amule/webserver/php-default/toolbutton-download-pressed.jpeg
-share/amule/webserver/php-default/toolbutton-download.jpeg
-share/amule/webserver/php-default/toolbutton-filter.jpeg
-share/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
-share/amule/webserver/php-default/toolbutton-kad.jpeg
-share/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
-share/amule/webserver/php-default/toolbutton-logout.jpeg
-share/amule/webserver/php-default/toolbutton-reload.jpeg
-share/amule/webserver/php-default/toolbutton-search-pressed.jpeg
-share/amule/webserver/php-default/toolbutton-search.jpeg
-share/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
-share/amule/webserver/php-default/toolbutton-servers.jpeg
-share/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
-share/amule/webserver/php-default/toolbutton-settings.jpeg
-share/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
-share/amule/webserver/php-default/toolbutton-shared.jpeg
-share/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
-share/amule/webserver/php-default/toolbutton-stats.jpeg
-share/amule/webserver/php-default/top.html
-share/amule/webserver/php-default/tree-closed.gif
-share/amule/webserver/php-default/tree-leaf.gif
-share/amule/webserver/php-default/tree-open.gif
-share/amule/webserver/php-default/up.jpeg
-share/applications/
-share/locale/
-share/locale/bg/
-share/locale/bg/LC_MESSAGES/
-share/locale/ca/
-share/locale/ca/LC_MESSAGES/
-share/locale/cs/
-share/locale/cs/LC_MESSAGES/
-share/locale/da/
-share/locale/da/LC_MESSAGES/
-share/locale/de/
-share/locale/de/LC_MESSAGES/
-share/locale/el/
-share/locale/el/LC_MESSAGES/
-share/locale/es/
-share/locale/es/LC_MESSAGES/
-share/locale/eu/
-share/locale/eu/LC_MESSAGES/
-share/locale/fi/
-share/locale/fi/LC_MESSAGES/
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
-share/locale/gl/
-share/locale/gl/LC_MESSAGES/
-share/locale/he/
-share/locale/he/LC_MESSAGES/
-share/locale/hr/
-share/locale/hr/LC_MESSAGES/
-share/locale/hu/
-share/locale/hu/LC_MESSAGES/
-share/locale/it/
-share/locale/it/LC_MESSAGES/
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
-share/locale/nl/
-share/locale/nl/LC_MESSAGES/
-share/locale/nn/
-share/locale/nn/LC_MESSAGES/
-share/locale/pl/
-share/locale/pl/LC_MESSAGES/
-share/locale/pt_BR/
-share/locale/pt_BR/LC_MESSAGES/
-share/locale/ru/
-share/locale/ru/LC_MESSAGES/
-share/locale/sl/
-share/locale/sl/LC_MESSAGES/
-share/locale/sv/
-share/locale/sv/LC_MESSAGES/
-share/locale/tr/
-share/locale/tr/LC_MESSAGES/
-share/locale/uk/
-share/locale/uk/LC_MESSAGES/
-share/locale/zh_CN/
-share/locale/zh_CN/LC_MESSAGES/
-share/locale/zh_TW/
-share/locale/zh_TW/LC_MESSAGES/