- Update to 3.1.1

PR:		166891
Submitted by:	Ports Fury

6 files changed, 8 insertions, 52 deletions

diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index 49cdaf3bfef3..295e9e7fcb98 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	3.1.0
+PORTVERSION=	3.1.1
 CATEGORIES+=	net-p2p
 MASTER_SITES=	SF
 
@@ -38,12 +38,7 @@ CONFIGURE_ENV+=	NEWCXX="${CXX}" \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-###
-## Library dependency handling
-###
-.if !exists(/usr/lib/libbz2.so)
-LIB_DEPENDS+=	bz2:${PORTSDIR}/archivers/bzip2
-.endif
+SUB_FILES=	pkg-message
 
 ###
 ## Options activation
@@ -101,7 +96,6 @@ CONFIGURE_ARGS+=--disable-gd
 DOCFILES=	Authors.txt Bugs.txt ChangeLog Developers.txt \
 		Install.txt Todo.txt ed2k_links.txt
 PORTDOCS=	${DOCFILES}
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 # build additional tools
 ALL_TARGET+=	\
@@ -145,23 +139,16 @@ post-configure:
 		-e 's|^(PTHREAD_LIBS[^=]*=).*$$|\1${PTHREAD_LIBS}|' \
 		${BUILD_WRKSRC}/config/Makefile.config
 
-pre-install:
-.if exists(${.CURDIR}/pkg-message)
-	@${SED} -e 's,%%DOCSDIR%%,${DOCSDIR},' \
-		< ${.CURDIR}/pkg-message > ${PKGMESSAGE}
-.elif exists(${MASTERDIR}/pkg-message)
-	@${SED} -e 's,%%DOCSDIR%%,${DOCSDIR},' \
-		< ${MASTERDIR}/pkg-message > ${PKGMESSAGE}
-.endif
-
 do-install:
 .ifndef(WITHOUT_CORE)
 	@${INSTALL_PROGRAM} ${WRKSRC}/mld_hash		${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/mlnet		${PREFIX}/bin/mlnet-real
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mlnet
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey	${EXAMPLESDIR}
 .endif
+.endif
 .ifndef(WITHOUT_GUI)
 	@${INSTALL_PROGRAM} ${WRKSRC}/mlgui		${PREFIX}/bin
 .endif
diff --git a/net-p2p/mldonkey/distinfo b/net-p2p/mldonkey/distinfo
index 70cd1a545d91..68fcd0c89fde 100644
--- a/net-p2p/mldonkey/distinfo
+++ b/net-p2p/mldonkey/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mldonkey-3.1.0.tar.bz2) = fd0f132a1bea96c9dfa2f7837278c8ccbbb703efc2c7ac48386b5103a1450308
-SIZE (mldonkey-3.1.0.tar.bz2) = 2820081
+SHA256 (mldonkey-3.1.1.tar.bz2) = 996294aab274f324a913f6a3665006c70d3aa1748f75cc5cbc560ed0ddee40b2
+SIZE (mldonkey-3.1.1.tar.bz2) = 2820894
diff --git a/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc b/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc
deleted file mode 100644
index 911f8b85fe07..000000000000
--- a/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 1df524fb7c1b..000000000000
--- a/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
diff --git a/net-p2p/mldonkey/pkg-message b/net-p2p/mldonkey/files/pkg-message.in
index 9758a622b676..9758a622b676 100644
--- a/net-p2p/mldonkey/pkg-message
+++ b/net-p2p/mldonkey/files/pkg-message.in
diff --git a/net-p2p/mldonkey/pkg-plist b/net-p2p/mldonkey/pkg-plist
index 8085bd443fea..48ed2db1463f 100644
--- a/net-p2p/mldonkey/pkg-plist
+++ b/net-p2p/mldonkey/pkg-plist
@@ -1,9 +1,9 @@
 %%CORE%%bin/mld_hash
 %%CORE%%bin/mlnet
 %%CORE%%bin/mlnet-real
-%%CORE%%%%EXAMPLESDIR%%/kill_mldonkey
+%%CORE%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kill_mldonkey
 %%GUICORE%%bin/mlguistarter
 %%GUICORE%%bin/mldonkey_previewer
 %%GUICORE%%bin/mlnet+gui
 %%GUI%%bin/mlgui
-%%CORE%%@dirrm %%EXAMPLESDIR%%
+%%CORE%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%