4 files changed, 35 insertions, 20 deletions

diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index 29bb90d94c66..997dc61229a5 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	3.0.7
+PORTVERSION=	3.1.0
 CATEGORIES+=	net-p2p
 MASTER_SITES=	SF
 
@@ -39,8 +39,6 @@ CONFIGURE_ENV+=	\
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
-# FreeBSD has reentrant dns code
-PTHREAD_CFLAGS+=	-D_REENTRANT
 
 ###
 ## Library dependency handling
@@ -113,27 +111,12 @@ ALL_TARGET+=	\
 
 .include <bsd.port.pre.mk>
 
-### Development version
-## Thus, we will use non standard threading library
-## We will switch from libpthread to libthr which should produce
-## better results in some scenarios. You can read more at pthread(3)
-.if defined(WITH_THR_THREAD_MODEL)
-PTHREAD_CFLAGS=	-D_THREAD_SAFE
-PTHREAD_LIBS=	-lthr
-.endif
-
 pre-everything::
 .if !defined(WITHOUT_GUI) && !defined(WITHOUT_CORE)
 	@${ECHO_MSG} "You can disable the GUI by defining WITHOUT_GUI."
 	@${ECHO_MSG} "You can disable the CORE by defining WITHOUT_CORE."
 	@${ECHO_MSG}
 .endif
-.ifndef(WITH_THR_THREAD_MODEL)
-	@${ECHO_MSG} "Define WITH_THR_THREAD_MODEL to switch from"
-	@${ECHO_MSG} "pthread to thr threading model which could produce better"
-	@${ECHO_MSG} "results in some scenarios.  Use at your discretion."
-
-.endif
 
 post-patch:
 	@${SED} \
@@ -143,6 +126,7 @@ post-patch:
 		${WRKDIR}/wrapper.sh
 	@${REINPLACE_CMD} -E \
 		-e 's|%%AUTOCONF%%|${AUTOCONF}|' \
+		-e 's/-O6//' \
 		${BUILD_WRKSRC}/config/Makefile.in
 # update server.met provider
 .for file in \
diff --git a/net-p2p/mldonkey/distinfo b/net-p2p/mldonkey/distinfo
index d4fa6bc5ea93..70cd1a545d91 100644
--- a/net-p2p/mldonkey/distinfo
+++ b/net-p2p/mldonkey/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mldonkey-3.0.7.tar.bz2) = 5630c399d492a4d48e7a90461956f833f3ba02c334a1d3d748d547994e77acd4
-SIZE (mldonkey-3.0.7.tar.bz2) = 2799555
+SHA256 (mldonkey-3.1.0.tar.bz2) = fd0f132a1bea96c9dfa2f7837278c8ccbbb703efc2c7ac48386b5103a1450308
+SIZE (mldonkey-3.1.0.tar.bz2) = 2820081
diff --git a/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc b/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc
new file mode 100644
index 000000000000..911f8b85fe07
--- /dev/null
+++ b/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc
@@ -0,0 +1,11 @@
+--- src/utils/lib/CryptoPP.cc~
++++ src/utils/lib/CryptoPP.cc
+@@ -5413,7 +5413,7 @@ template <class T> const T& AbstractEucl
+ 	Element g[3]={b, a};
+ 	unsigned int i0=0, i1=1, i2=2;
+ 
+-	while (!Equal(g[i1], this->Identity()))
++	while (!this->Equal(g[i1], this->Identity()))
+ 	{
+ 		g[i2] = Mod(g[i0], g[i1]);
+ 		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
diff --git a/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h b/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h
new file mode 100644
index 000000000000..1df524fb7c1b
--- /dev/null
+++ b/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h
@@ -0,0 +1,20 @@
+--- src/utils/lib/CryptoPP.h~
++++ src/utils/lib/CryptoPP.h
+@@ -2632,7 +2633,7 @@ public:
+ 
+ 	pointer allocate(size_type n, const void * = NULL)
+ 	{
+-		CheckSize(n);
++		this->CheckSize(n);
+ 		if (n == 0)
+ 			return NULL;
+ 		return new T[n];
+@@ -5611,7 +5612,7 @@ template <class T, class B, class BASE> 
+ {
+ 	this->ThrowIfInvalidTruncatedSize(size);
+ 
+-	PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType));
++	this->PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType));
+ 	CorrectEndianess(this->m_data, this->m_data, this->BlockSize() - 2*sizeof(HashWordType));
+ 
+ 	this->m_data[this->m_data.size()-2] = B::ToEnum() ? this->GetBitCountHi() : this->GetBitCountLo();
\ No newline at end of file