Update net/mldonkey* to 3.1.5.

Fixes problem reported in PR 50220 by Germain Le Chapelain.

2014/03/22: version 3.1.5 = tag release-3-1-5
8415: Revert patch #8328 to fix GTK2 gui's compilation (ygrek)

2014/03/10: version 3.1.4 = tag release-3-1-4
8388: BT: use porttest service from EDK module (ygrek)
8352: CryptoPP: Fix compilation with gcc-4.7 (Jaakko Perttilä)
8351: CryptoPP: Fix FreeBSD build with clang on i386 (tijl)
8350: CryptoPP: Fix compilation on armhf (ygrek)

5 files changed, 10 insertions, 48 deletions

diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile
index f962b1c6da1..82ce3f65032 100644
--- a/net/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2015/08/07 11:20:34 jaapb Exp $
-#
+# $NetBSD: Makefile,v 1.87 2015/09/14 06:03:58 wiz Exp $
 
 .include "../../net/mldonkey/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/mldonkey/mldonkey-gui/}
-PKGREVISION=		29
 
 COMMENT+=		(GTK interface)
 
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 511bcf78679..debe8e200fe 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2015/08/07 11:20:34 jaapb Exp $
-#
+# $NetBSD: Makefile,v 1.82 2015/09/14 06:03:58 wiz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		19
-
 RCD_SCRIPTS=		mldonkey
 
 PKG_GROUPS_VARS+=	MLDONKEY_GROUP
diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common
index cc2f9c84472..50954812332 100644
--- a/net/mldonkey/Makefile.common
+++ b/net/mldonkey/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.50 2014/10/20 10:12:51 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.51 2015/09/14 06:03:58 wiz Exp $
 #
 # used by net/mldonkey/Makefile
 # used by net/mldonkey-gui/Makefile
 
-DISTNAME=	mldonkey-3.1.3
+DISTNAME=	mldonkey-3.1.5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mldonkey/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index 50a9644c45b..0ea987062e3 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.61 2014/10/20 10:12:51 jaapb Exp $
+$NetBSD: distinfo,v 1.62 2015/09/14 06:03:58 wiz Exp $
 
-SHA1 (mldonkey-3.1.3.tar.bz2) = 424386f277e84df55a2cbab213fae60787e42c8b
-RMD160 (mldonkey-3.1.3.tar.bz2) = 2b640fbd9ac85918bf3ba0a51f86fabb6d862890
-Size (mldonkey-3.1.3.tar.bz2) = 2848964 bytes
+SHA1 (mldonkey-3.1.5.tar.bz2) = 7bc4f9272ecfe6403eef7062766b26bf321e3015
+RMD160 (mldonkey-3.1.5.tar.bz2) = 63a21aef47a7510b7f9867544345c8f03edc89c3
+Size (mldonkey-3.1.5.tar.bz2) = 2847382 bytes
 SHA1 (patch-config_Makefile.in) = a575c505c1f736bc3940790b43a6cf2083f29112
-SHA1 (patch-config_configure.in) = 36bbd265d5237e5568b1964ead1c13061a538321
+SHA1 (patch-config_configure.in) = 559caa495059573100a3182c4758a53433a53223
 SHA1 (patch-src_utils_net_terminal.ml) = 8745d3d6f605c9609febfea4e84c5c6619be0d14
diff --git a/net/mldonkey/patches/patch-config_configure.in b/net/mldonkey/patches/patch-config_configure.in
index ac971ed966d..4bd5af57c65 100644
--- a/net/mldonkey/patches/patch-config_configure.in
+++ b/net/mldonkey/patches/patch-config_configure.in
@@ -1,40 +1,7 @@
-$NetBSD: patch-config_configure.in,v 1.4 2014/10/20 10:12:51 jaapb Exp $
+$NetBSD: patch-config_configure.in,v 1.5 2015/09/14 06:03:58 wiz Exp $
 
-Do proper GD version checking
 --- config/configure.in.orig	2012-08-05 15:49:02.000000000 +0000
 +++ config/configure.in
-@@ -929,13 +929,30 @@ if test "$GD" != "no"; then
-     GDMAJORVERSION=`$GDLIBCONFIG --majorversion`
-     GDMINORVERSION=`$GDLIBCONFIG --minorversion`
-     GDREVISION=`$GDLIBCONFIG --revision`
--    if [ [ $GDMAJORVERSION = 2 ] && [ $GDMINORVERSION = 0 ] && [ $GDREVISION -gt 14 ]]; then
-+		case $GDMAJORVERSION in
-+			1)
-+				AC_MSG_RESULT(no (found $GDVERSION))
-+				LIBGD=no
-+				;;
-+			2)
-+				if test $GDMINORVERSION -ge 1; then
-+				AC_MSG_RESULT($GDVERSION)
-+				LIBGD=yes
-+				else
-+					if test $GDREVISION -gt 14; then
- 	AC_MSG_RESULT($GDVERSION)
- 	LIBGD=yes
-     else
- 	AC_MSG_RESULT(no (found $GDVERSION))
- 	LIBGD=no
-     fi
-+        fi
-+        ;;
-+      *)
-+        AC_MSG_RESULT($GDVERSION)
-+        LIBGD=yes
-+        ;;
-+    esac
-   else
-     LIBGD=yes
-   fi
 @@ -1347,15 +1364,15 @@ if test "$GTK_CONFIG" = "no"; then
       LABLGTK_CONFIG=no
  else