diff options
| author | lioux <lioux@FreeBSD.org> | 2005-05-07 03:27:18 +0000 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2005-05-07 03:27:18 +0000 |
| commit | 56c4561d2110aba94daaf43267bb244bee5ecf29 (patch) | |
| tree | c3c0a2a6dd0b0645ddc4c775a7faa3203e76647b /net-p2p/mldonkey-devel | |
| parent | c1a27cae468685403d17f3941a597f38520e0cd7 (diff) | |
| download | FreeBSD-ports-56c4561d2110aba94daaf43267bb244bee5ecf29.zip FreeBSD-ports-56c4561d2110aba94daaf43267bb244bee5ecf29.tar.gz | |
o Update to 2.5.30.15
o Add WITH_THR_THREAD_MODEL knob which allows this port to build
with libthr threadind instead of libpthread. Very experimental.
Diffstat (limited to 'net-p2p/mldonkey-devel')
| -rw-r--r-- | net-p2p/mldonkey-devel/Makefile | 33 | ||||
| -rw-r--r-- | net-p2p/mldonkey-devel/distinfo | 4 |
2 files changed, 32 insertions, 5 deletions
diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile index 4f0bec3..341b5b2 100644 --- a/net-p2p/mldonkey-devel/Makefile +++ b/net-p2p/mldonkey-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mldonkey -PORTVERSION= 2.5.30.14 +PORTVERSION= 2.5.30.15 CATEGORIES+= net MASTER_SITES= http://savannah.nongnu.org/download/mldonkey/ PKGNAMESUFFIX= -devel @@ -21,7 +21,7 @@ COMMENT?= A OCAML client for multiple peer-to-peer networks BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml #DOWNLOADVERSION=${PORTVERSION:R} -DOWNLOADVERSION=2.5.30.14 +DOWNLOADVERSION=2.5.30.15 NO_LATEST_LINK= yes CONFLICTS= mldonkey-[0-9]* mldonkey-{core,gui}-[0.9]* @@ -39,10 +39,15 @@ CONFIGURE_ARGS+=\ --with-libiconv-prefix=${LOCALBASE} CONFIGURE_ENV+= \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" #WRKSRC= ${WRKDIR}/${PORTNAME}-${DOWNLOADVERSION} +### +## Options activation +### .if defined(WITHOUT_GUI) .if defined(WITHOUT_CORE) .error "Cool, you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll do nothing." @@ -75,10 +80,26 @@ PORTDOCS= ${DOCFILES} .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: @@ -91,6 +112,12 @@ post-patch: 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}/mlnet ${PREFIX}/bin/mlnet-real diff --git a/net-p2p/mldonkey-devel/distinfo b/net-p2p/mldonkey-devel/distinfo index efbe44d..170e82f 100644 --- a/net-p2p/mldonkey-devel/distinfo +++ b/net-p2p/mldonkey-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (mldonkey-2.5.30.14.tar.bz2) = 6d778ef48d6b979e8f679d1e1ba25a62 -SIZE (mldonkey-2.5.30.14.tar.bz2) = 3093112 +MD5 (mldonkey-2.5.30.15.tar.bz2) = 6509bcc5190064b9217b0870453ae4a2 +SIZE (mldonkey-2.5.30.15.tar.bz2) = 3078980 |
