1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00

- Update to 3.1.0 [1]

- Garbage collect old threading options [1]
- Fix build with clang [2]

PR:		ports/160502 [1,2]
		ports/160498 [2]
Submitted by:	"h h" (aakuusta gmail.com) [1,2]
Obtained from:	upstream [2]
This commit is contained in:
Rene Ladan 2011-09-15 21:43:41 +00:00
parent af01c6a569
commit 3b7ca2c0df
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=281824
4 changed files with 35 additions and 20 deletions

View File

@ -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 \

View File

@ -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

View File

@ -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;

View File

@ -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();