4 files changed, 7 insertions, 45 deletions

diff --git a/net-p2p/mldonkey-core/Makefile b/net-p2p/mldonkey-core/Makefile
index 5741dbf6407f..1a7b446dd114 100644
--- a/net-p2p/mldonkey-core/Makefile
+++ b/net-p2p/mldonkey-core/Makefile
@@ -4,8 +4,6 @@
 # build only the CORE
 WITHOUT_GUI=	yes
 
-PORTREVISION=	0
-
 COMMENT=	Client 'core' for the MLDonkey peer-to-peer network
 
 MASTERDIR=	${.CURDIR}/../mldonkey
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index f1f3f72707d2..f11beaea6061 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mldonkey
-PORTVERSION=	3.1.2
-PORTREVISION?=	1
+PORTVERSION=	3.1.3
 CATEGORIES+=	net-p2p
 MASTER_SITES=	SF
 
@@ -27,11 +26,9 @@ ALL_TARGET=	opt
 MAKE_ENV+=	OCAMLRUNPARAM="l=256M"
 MAKE_JOBS_UNSAFE=	yes
 
-CONFIGURE_ARGS+=--enable-ocamlver=3 \
-		--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE}
 CONFIGURE_ENV+=	NEWCXX="${CXX}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+		PTHREAD_LIBS="-pthread"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -115,7 +112,6 @@ post-patch:
 		${WRKDIR}/wrapper.sh
 	@${REINPLACE_CMD} -E \
 		-e 's|%%AUTOCONF%%|${AUTOCONF}|' \
-		-e 's/-O6//' \
 		${BUILD_WRKSRC}/config/Makefile.in
 	@${REINPLACE_CMD} -E \
 		-e 's@(\+)(lablgtk2)@\1site-lib/\2@' \
@@ -127,24 +123,15 @@ post-patch:
 		-e 's@(#include <)(lablgtk2/)@\1site-lib/\2@'  \
 		${WRKSRC}/src/gtk2/gui/x11/systraystubs.c
 # update server.met provider
-.for file in \
-	src/daemon/common/commonOptions.ml \
-	src/networks/donkey/donkeyServers.ml
 	@${REINPLACE_CMD} -E \
 		-e 's|http://www.gruk.org/server.met.gz|http://www.jd2k.com/server.met|' \
 		-e 's|http://www.bluetack.co.uk/config/antip2p.txt|http://www.bluetack.co.uk/config/level1.gz|' \
-		${WRKSRC}/${file}
-.endfor
+		${WRKSRC}/src/daemon/common/commonOptions.ml \
+		${WRKSRC}/src/networks/donkey/donkeyServers.ml
 
 pre-configure:
 	@cd ${WRKSRC}/config && ${AUTOCONF}
 
-post-configure:
-	@${REINPLACE_CMD} -E \
-		-e 's|^(PTHREAD_CFLAGS[^=]*=).*$$|\1${PTHREAD_CFLAGS}|' \
-		-e 's|^(PTHREAD_LIBS[^=]*=).*$$|\1${PTHREAD_LIBS}|' \
-		${BUILD_WRKSRC}/config/Makefile.config
-
 do-install:
 .ifndef(WITHOUT_CORE)
 	@${INSTALL_PROGRAM} ${WRKSRC}/mld_hash		${PREFIX}/bin
diff --git a/net-p2p/mldonkey/distinfo b/net-p2p/mldonkey/distinfo
index bcd730cf8c12..7949e173684d 100644
--- a/net-p2p/mldonkey/distinfo
+++ b/net-p2p/mldonkey/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mldonkey-3.1.2.tar.bz2) = 72728ef8c482dda8be48b6ac977d20e72eb5f84b08236a67202edcd7569c5fc6
-SIZE (mldonkey-3.1.2.tar.bz2) = 2844260
+SHA256 (mldonkey-3.1.3.tar.bz2) = 7c259f9f41cc12899045710ddce02e6d25962b2cb5c22f9cf58af0483f06d9e2
+SIZE (mldonkey-3.1.3.tar.bz2) = 2848964
diff --git a/net-p2p/mldonkey/files/patch-src__utils__lib__stubs_c.c b/net-p2p/mldonkey/files/patch-src__utils__lib__stubs_c.c
deleted file mode 100644
index f819aef2c39e..000000000000
--- a/net-p2p/mldonkey/files/patch-src__utils__lib__stubs_c.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/utils/lib/stubs_c.c.orig	Wed Jan  4 12:23:37 2006
-+++ src/utils/lib/stubs_c.c	Mon Jan 16 14:14:38 2006
-@@ -28,6 +28,11 @@
- #include <inttypes.h>
- #endif
- 
-+/* For proper FreeBSD version identification */
-+#if defined(HAVE_SYS_PARAM_H)
-+#include <sys/param.h>
-+#endif
-+
- #define lseek XXXXXXXXX
- #define read XXXXXXXXX
- #define ftruncate XXXXXXXXX
-@@ -683,7 +688,7 @@
- 
- #define NETDB_BUFFER_SIZE 10000
- 
--#ifdef _WIN32
-+#if defined(_WIN32) || ( defined(__FreeBSD_version) && ( ((__FreeBSD_version >= 504102) && (__FreeBSD_version < 600000)) || (__FreeBSD_version >= 600029) ) )
- #define GETHOSTBYADDR_IS_REENTRANT 1
- #define GETHOSTBYNAME_IS_REENTRANT 1
- #endif