Update to 1.2.6:

Kry:
* Improved Mac compatibility.
* Fixed the i18n charset.
* Try to set the locale even if it seems to fail.

Creteil:
* Fixed the default Size to 800x600 for 1st time aMule launched without
  ~/.eMule config file.

shakraw:
* ExternalConn: new communication code using wxSockets.
* Web interface: improved communication performance.
* Text interface: now using new wxSockets code.

pil0t:
* Fix for the geometry on start.

pure_ascii:
* Added sorting to filename list in file details.
* Added "Takeover" by doubleclick in file details.
* Fixed preferences window popping up on "Show/Hide UL/DL" in download list.
* i18n stuff (Systray).

rubber30:
* Fixed viewing and sorting by LastSeenComplete and LastReception.

Emilio Sandoz:
* Converted stats calculations to 64bit where necessary (for uptime >49days).
* i18n strings fixed.
* gcc 2.95 compilation fix.

deltaHF:
* i18n stuff.

5 files changed, 8 insertions, 65 deletions

diff --git a/net/amule/Makefile b/net/amule/Makefile
index 7b3027619fd..816c3588edf 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/03/08 19:40:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/08 22:15:30 jmmv Exp $
 #
 
-DISTNAME=		aMule-1.2.5
+DISTNAME=		aMule-1.2.6
 PKGNAME=		${DISTNAME:S/aMule/amule/}
-PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=amule/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/amule/PLIST b/net/amule/PLIST
index 3df9cfd19c4..abb411aeac9 100644
--- a/net/amule/PLIST
+++ b/net/amule/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/13 11:18:29 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/08 22:15:30 jmmv Exp $
 bin/amule
 bin/amulecmd
 bin/amulecmdDLG
@@ -17,8 +17,10 @@ ${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/nl/LC_MESSAGES/amule.mo
 ${PKGLOCALEDIR}/locale/pl/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/pixmaps
 @comment in xdg-dirs: @dirrm share/applications
diff --git a/net/amule/distinfo b/net/amule/distinfo
index df18c4cf4bb..6eed047c561 100644
--- a/net/amule/distinfo
+++ b/net/amule/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/02/13 11:18:29 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2004/03/08 22:15:30 jmmv Exp $
 
-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
+SHA1 (aMule-1.2.6.tar.bz2) = c0f77313c4da13da86bacdb793406f3f68376423
+Size (aMule-1.2.6.tar.bz2) = 1398755 bytes
diff --git a/net/amule/patches/patch-aa b/net/amule/patches/patch-aa
deleted file mode 100644
index 1fb99accb31..00000000000
--- a/net/amule/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$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
deleted file mode 100644
index dffd1214d4e..00000000000
--- a/net/amule/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$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;