Update to 1.2.5:

hellimod:
 BSD and Mac support. We're very near to the Mac aMule.

Hetfield:
 Fixed a memory leak in SysTray. (SysTray.cpp)
 Fixed a DL/UL ratio problem. (amule.cpp)

Kry:
 Added some sanity checks to avoid losing *.part.met files on power failure.
   0-Size files are never written.
 Fixed the 'all time transfered' on Shared Files window. This one fixed some
   eMule/aMule incompatibility on part.met files.
 Some aditional functions on CFile for windoze compatibility.
 MFC compatibility enhanced.
 Added SetFilePath to CKnownFile
 Changed most 'assert' to wxASSERT
 Fixed some NULL clientname causing crash on ListenSocket.cpp
 Fixed the tagcount on .part.met files (KnownFile.cpp)
 Added missing OP_CHANGE_CLIENT_ID on ListenSocket
 Updated HomePage to www.amule.org on messages
 Fixed the server windows splitter. Or sash. Whatever.
 Imported all the other ListenSocket.cpp code from 0.30e
 Fixed 'View Shared Files'. No multiple tabs, also.
 Added theApp.listensocket->StartListening() on startup. Really. Don't ask me
   why it worked before.
 Fixed the systray bug where speed bar was always 10 times smaller.
 Added lots of vars initilization that fixed some crashes.
 Fixed a crash on ClientList.cpp caused by a void node on list.
 Fixed 9 memleaks, some of them big ones.
 Fixed 6 wrong delete -> delete[]
 Fixed wrong hashsetneeded causing random crash
 Added GetED2KPartHashCount() & GetED2KPartCount()
 Fixed a bug on app init, related to Toolbar.
 Fixed a severe crash & memory corruption on UploadClient.cpp
 Fixed download rate overhead calculation
 New HeapSort() and NewSrcPartsInfo() ported from eMule 0.30e
 wxGTK 2.5 compilation fixes
 Fixed the 'rehashing of files on restart' problem.
 Fixed a missing "Error" message on console when partfile loading failed.
 i18n activated, GNU xgettext compatible.
 Fixed bug on OP_FILEREQUEST packet that made eMule clients to disconnect from
   us. eMule clients got our version of client and expected to get the new
   OP_FILEREQUEST from eMule 0.30. Thanks to John & BlubbX from eMule team for
   the report and help tracking down it.
 Fixed several i18n bugs from xMule times.
 Fixed the lseek error on console and window popup when canceling a file that
   is transfering.
 First implementation of selectable refresh. The refresh is bugged - it
   deletes the info on screen, except for about 1 sec, every time
   seconds_defined_on_preferences is reached.
 Used selectable refresh code for SysTray-hiden cpu lower.
 New option on right-click on downloadlist: Hide/Show lists.
 Minimize on startup works now.
 Minimize to tray works now.
 Lots of BSD compilation fixed (aMule compiles under BSD again)
 Fixed the upload disconecting clients at high upload speed
 Changed another wxList to CList (FriendList)
 FriendSlot should have no effect on LowId user.
 Fixed FriendSlot not being persistent and kicking friend after 1 chunk.
 Fixed lowid users on upload queue by importing VQB's lowid alternate
 Added language selection support on preferences
 Fixed the bug that caused never to tell user 'server full'
 Fixed several server connection issues not detected before.
 Added a popup on language change warning for restart.
 Added another popup, this time to point the user on the right direction if
   the locale for that language cannot be set.
 Stop publishing on ED2K network shared files we don't have anymore
 Removed the annoying messages of dropping sources (too much CPU)
 Sanity check to avoid used pushing buttons before aMule is ready for it.
 Fixed gcc 2.95 compilation

Creteil:
 Change order in the notebook for logs in Servers Window
 Updated the logo for webserver from eMule logo to aMule one
 Fixed Switching to Searches Window Bug when removing all servers in Servers
   Window
 Changed default server list from 'best' to 'max', then 'max' to 'best' again
 Fixed the default systray value on preferences.
 Added debug values on UploadQueue.
 Changed max Slot Allocation to 30Kb/s
 Fixed typo in Preferences
 Implemented notebook in Server Window (merged 'Server Info' & 'aMule Log'
   windows in a notebook)
 Fixed bug crashing aMule on Server Window Notebook implementation.
 Now, if no --geometry width & size used, aMule starts with 800x600 as default
 Fixed size restoring from .eMule saved size
 Option 'Search global' in Search Window in the default now.
 GUI code for new slider in Preferences->Tweaks tab handling the lists refresh
 Some cosmetic fixes on Preferences and GUI by Madcat's request.
 Made GUI i18n compliant.
 Slot alloc calculation is properly rounded now.
 Added the Language listbox on preferences.

Shakraw:
 Added missing string in GetDownloadFileInfo() causing IGSEGV when called.
 Fixed the amuleweb login problem.
 Added GetWebList() support.
 amuleweb's search feature complete. Now it is possible to search, download
   and web-search on filedonkey
 Fixed a write error in SETMAXGRAPHUPLOADRATE
 Added support for statistic text infos for web interface (statistics link)
 Fixed two bugged index causing crashes on Webserver.cpp
 Little improvement for server list request (now responses are much faster)
 Generally improved External Connections.
 Fixed search type feature for web interface
 Fixed amule crashes when quitting from amuleweb during requests

Emilio Sandoz:
 Statistics graphs:
 Param changes reversible;
 Color change now works;
 Active connections rescaling now works;
 Graphs and tree suspended when not visible.
 Set correct initial radio button in Systray integration dialog
 Simplified statistics graph averaging
 Corrected UL loop for timer errors
 Simplified UL rate averaging
 Preliminary cleanup of graphing engine; ghosting eliminated
 Client DL rate computation without CList Fixed 32bit rollover error for rates
   over 84kB/s Reduced initial spiking Generally improved speed and CPU/RAM
   usage.
 Search window column widths remembered between searches & saved in preferences
 Statistics preferences dialog: changes are now applied on-the-fly (with proper
   Cancel semantics)
 Eliminated possibility of root directory being invisibly shared

umale:
 Fixed debugloglines on ListenSocket.cpp ServerSocket.cpp having too much
   arguments.
 SysTray code will not be compiled if disabled
 Fixed 5 wrong delete -> delete[]
 Converted po-files

Aleric:
 Fixed all compiler warnings.
 Rewrote all header #include's to only include what is necessary.
 Removed or renamed all functions that clashed with one of the same name from
   libwx_gtk. With as result:
 Fixed --enable-static possibility (needs a lot of static libraries to be
   installed; and latest XFree86 CVS version of libX11 (I had to fix a bug in
   XFree86 too for this)).
 Fixed check-boxes in Preferences -> Directories + a little code speed up there.
 Fixed a duplicated server_list delete
 Server IP# filter.

seneca:
 Near finished all i18n stuff. We expect aMule 1.2.5 is fully i18n-compatible
 Added wxT() Macro for Unicode Support (not functional yet)

Citroklar:
 Testing, lots of testing. Bug-tracker.
 Found the versions that introduced the upload bug and made a nice diff. We
   could look at code for years, without seeing it. Nice guy.
 Fixed README, amulesig.txt.

gjn:
 Fixed bug in creditsystem.

jmccorm:
 Fixed "Close This Searchresult" -> "Close This Search Result"
 Fixed some typos.

lemonfan:
 Fixed stopped files being counted on CheckDiskSpace()
 Progressbar fixes on webserver implementation.
 Several crashes fixed by adding sanity checks to reqfile

deltastar (on irc channel):
 Fixes the > 2Gb files problem caused by a bug on CFile wrapper.

deltaHF:
 i18n stuff

pure_ascii:
 Fixed recreation of filename list in file details
 Scrolling and selecting filenames works now

5 files changed, 74 insertions, 8 deletions

diff --git a/net/amule/Makefile b/net/amule/Makefile
index 50af8d7bca0..5b8f08bd4f4 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/01/24 14:50:05 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/13 11:18:29 jmmv Exp $
 #
 
-DISTNAME=		aMule-1.2.4
+DISTNAME=		aMule-1.2.5
 PKGNAME=		${DISTNAME:S/aMule/amule/}
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=amule/}
@@ -11,7 +11,7 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://amule.sourceforge.net/
 COMMENT=		Another Emule P2P client
 
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		xdg-dirs>=1.0:../../misc/xdg-dirs
 BUILD_USES_MSGFMT=	yes
 
 CONFLICTS=		xmule-[0-9]*
@@ -22,6 +22,8 @@ USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 
+LIBS+=			-lm
+
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../www/curl/buildlink2.mk"
diff --git a/net/amule/PLIST b/net/amule/PLIST
index e12134afc46..3df9cfd19c4 100644
--- a/net/amule/PLIST
+++ b/net/amule/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/01/14 22:31:27 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/13 11:18:29 jmmv Exp $
 bin/amule
 bin/amulecmd
 bin/amulecmdDLG
@@ -6,13 +6,19 @@ bin/amuleweb
 bin/amulewebDLG
 bin/ed2k
 share/applications/amule.desktop
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/amule.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/amule.mo
 ${PKGLOCALEDIR}/locale/ee/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/en/LC_MESSAGES/amule.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/amule.mo
 ${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/amule.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/amule.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/amule.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/amule.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/amule.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/amule.mo
 share/pixmaps/amule.xpm
+@comment in xdg-dirs: @dirrm share/applications
diff --git a/net/amule/distinfo b/net/amule/distinfo
index 407e62385a8..df18c4cf4bb 100644
--- a/net/amule/distinfo
+++ b/net/amule/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.2 2004/01/14 21:42:40 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/02/13 11:18:29 jmmv Exp $
 
-SHA1 (aMule-1.2.4.tar.bz2) = 57f867f4b457736297c633a7681746b633c0f44f
-Size (aMule-1.2.4.tar.bz2) = 1399311 bytes
+SHA1 (aMule-1.2.5.tar.bz2) = 71604a0535c60fd702ef13bb32b0d733cd594f86
+Size (aMule-1.2.5.tar.bz2) = 1388150 bytes
+SHA1 (patch-aa) = fb207779d163ce085726cf098e224994c2d0e288
+SHA1 (patch-ab) = dba5708c91f00d0530ceeee1fa9f0b27da8ac2e7
diff --git a/net/amule/patches/patch-aa b/net/amule/patches/patch-aa
new file mode 100644
index 00000000000..1fb99accb31
--- /dev/null
+++ b/net/amule/patches/patch-aa
@@ -0,0 +1,28 @@
+$NetBSD: patch-aa,v 1.1 2004/02/13 11:18:29 jmmv Exp $
+
+--- src/OScopeCtrl.cpp.orig	2004-02-10 02:36:27.000000000 +0100
++++ src/OScopeCtrl.cpp
+@@ -17,6 +17,8 @@
+ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ //
+ 
++#include <config.h>
++
+ #include "sys.h"
+ #include <cmath>
+ #include <algorithm>		// Needed for std::max
+@@ -265,11 +267,10 @@ void COScopeCtrl::RecreateGrid()
+ 	dcGrid->DrawText(strTemp,rectPlot.left-4-sizX, rectPlot.bottom);
+ 
+ 	// x units
+-#if defined(__GNUC__) && __GNUC__ >= 3
+-	strTemp = CastSecondsToHM((nPlotWidth/nShiftPixels) * (int)round(sLastPeriod));
+-#endif
+-#if !defined(__GNUC__) || __GNUC__ < 3
++#if defined(HAVE_FLOOR)
+ 	strTemp = CastSecondsToHM((nPlotWidth/nShiftPixels) * (int)floor(sLastPeriod));
++#else
++	strTemp = CastSecondsToHM((nPlotWidth/nShiftPixels) * (int)round(sLastPeriod));
+ #endif			
+ 	strXUnits.Format((bStopped ? "Disabled [%s]" : "%s"), strTemp.GetBuffer());
+ 	
diff --git a/net/amule/patches/patch-ab b/net/amule/patches/patch-ab
new file mode 100644
index 00000000000..dffd1214d4e
--- /dev/null
+++ b/net/amule/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2004/02/13 11:18:29 jmmv Exp $
+
+--- src/UploadQueue.cpp.orig	2004-02-10 02:36:28.000000000 +0100
++++ src/UploadQueue.cpp
+@@ -15,6 +15,8 @@
+ //along with this program; if not, write to the Free Software
+ //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
++#include <config.h>
++
+ #include "sys.h"
+ #include <cstring>
+ #include <cmath>			// Needed for std::exp
+@@ -335,11 +337,10 @@ bool CUploadQueue::AcceptNewClient()
+ 	} else {
+ 		uint16 nMaxSlots = 0;
+ 		if (theApp.glob_prefs->GetMaxUpload() >= 10) {
+-#if defined(__GNUC__) && __GNUC__ >= 3			
+-			nMaxSlots = (uint16)round((float)theApp.glob_prefs->GetMaxUpload() / kBpsUpPerClient);
+-#endif
+-#if !defined(__GNUC__) || __GNUC__ < 3
++#if defined(HAVE_FLOOR)
+ 			nMaxSlots = (uint16)floor((float)theApp.glob_prefs->GetMaxUpload() / kBpsUpPerClient);
++#else
++			nMaxSlots = (uint16)round((float)theApp.glob_prefs->GetMaxUpload() / kBpsUpPerClient);
+ #endif			
+ 			if (nMaxSlots < MIN_UP_CLIENTS_ALLOWED) {
+ 				nMaxSlots=MIN_UP_CLIENTS_ALLOWED;