diff options
author | lioux <lioux@FreeBSD.org> | 2006-01-20 07:05:38 +0800 |
---|---|---|
committer | lioux <lioux@FreeBSD.org> | 2006-01-20 07:05:38 +0800 |
commit | 510bc77729fbc0db8031fff830c4f1d9cfb28422 (patch) | |
tree | bf81b9632d5cb2c35c0bccdcf2a6b52bdbd856df | |
parent | 691ced428f35a8452659e63f7933aabfca482918 (diff) | |
download | freebsd-ports-gnome-510bc77729fbc0db8031fff830c4f1d9cfb28422.tar.gz freebsd-ports-gnome-510bc77729fbc0db8031fff830c4f1d9cfb28422.tar.zst freebsd-ports-gnome-510bc77729fbc0db8031fff830c4f1d9cfb28422.zip |
o Update to 2.7.3
o Fix detection of reentrant code introduced in previous commit:
it was working backwards
-rw-r--r-- | net-p2p/mldonkey-devel/Makefile | 3 | ||||
-rw-r--r-- | net-p2p/mldonkey-devel/distinfo | 6 | ||||
-rw-r--r-- | net-p2p/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c | 25 | ||||
-rw-r--r-- | net/mldonkey-devel/Makefile | 3 | ||||
-rw-r--r-- | net/mldonkey-devel/distinfo | 6 | ||||
-rw-r--r-- | net/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c | 25 |
6 files changed, 10 insertions, 58 deletions
diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile index c0f2b5019996..63b91de7b1cd 100644 --- a/net-p2p/mldonkey-devel/Makefile +++ b/net-p2p/mldonkey-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mldonkey -PORTVERSION= 2.7.2 -PORTREVISION= 2 +PORTVERSION= 2.7.3 CATEGORIES+= net MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/net-p2p/mldonkey-devel/distinfo b/net-p2p/mldonkey-devel/distinfo index aefe7f6e9378..65b43abcc953 100644 --- a/net-p2p/mldonkey-devel/distinfo +++ b/net-p2p/mldonkey-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (mldonkey-2.7.2.tar.bz2) = b9413047c5c543920b2842844a48beb1 -SHA256 (mldonkey-2.7.2.tar.bz2) = 64cb31cae05cab54d9cd2f0abf7713153e3ec33dddbf0a9cc4ccb0ebdc49459c -SIZE (mldonkey-2.7.2.tar.bz2) = 2795408 +MD5 (mldonkey-2.7.3.tar.bz2) = f6c7c183fda53a9e9c26a09f8cdefda7 +SHA256 (mldonkey-2.7.3.tar.bz2) = 01411b8806629ac5ded65565bf1fc8018f5b6678043ecd9d06b8a341a1183566 +SIZE (mldonkey-2.7.3.tar.bz2) = 2807272 diff --git a/net-p2p/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c b/net-p2p/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c index 1bbdf74dc821..f819aef2c39e 100644 --- a/net-p2p/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c +++ b/net-p2p/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c @@ -17,30 +17,7 @@ #define NETDB_BUFFER_SIZE 10000 -#ifdef _WIN32 -+#if ( defined(__FreeBSD_version) && ( ((__FreeBSD_version >= 504102) && (__FreeBSD_version < 600000)) || (__FreeBSD_version >= 600029) ) ) ++#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 -@@ -738,11 +743,11 @@ - if (rc != 0) hp = NULL; - } - #else --#ifdef GETHOSTBYNAME_IS_REENTRANT -+#ifndef GETHOSTBYNAME_IS_REENTRANT - enter_blocking_section(); - #endif - hp = gethostbyname(hostname); --#ifdef GETHOSTBYNAME_IS_REENTRANT -+#ifndef GETHOSTBYNAME_IS_REENTRANT - leave_blocking_section(); - #endif - #endif -@@ -787,7 +792,7 @@ - End_roots(); - } - --#if !defined(HAVE_PTHREAD) || !(HAS_GETHOSTBYNAME_R || GETHOSTBYNAME_IS_REENTRANT) -+#if !defined(HAVE_PTHREAD) || (!(HAS_GETHOSTBYNAME_R || GETHOSTBYNAME_IS_REENTRANT) && !defined(HAS_SIGWAIT)) - - value ml_ip_job_start(value job_v) - { diff --git a/net/mldonkey-devel/Makefile b/net/mldonkey-devel/Makefile index c0f2b5019996..63b91de7b1cd 100644 --- a/net/mldonkey-devel/Makefile +++ b/net/mldonkey-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mldonkey -PORTVERSION= 2.7.2 -PORTREVISION= 2 +PORTVERSION= 2.7.3 CATEGORIES+= net MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/net/mldonkey-devel/distinfo b/net/mldonkey-devel/distinfo index aefe7f6e9378..65b43abcc953 100644 --- a/net/mldonkey-devel/distinfo +++ b/net/mldonkey-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (mldonkey-2.7.2.tar.bz2) = b9413047c5c543920b2842844a48beb1 -SHA256 (mldonkey-2.7.2.tar.bz2) = 64cb31cae05cab54d9cd2f0abf7713153e3ec33dddbf0a9cc4ccb0ebdc49459c -SIZE (mldonkey-2.7.2.tar.bz2) = 2795408 +MD5 (mldonkey-2.7.3.tar.bz2) = f6c7c183fda53a9e9c26a09f8cdefda7 +SHA256 (mldonkey-2.7.3.tar.bz2) = 01411b8806629ac5ded65565bf1fc8018f5b6678043ecd9d06b8a341a1183566 +SIZE (mldonkey-2.7.3.tar.bz2) = 2807272 diff --git a/net/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c b/net/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c index 1bbdf74dc821..f819aef2c39e 100644 --- a/net/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c +++ b/net/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c @@ -17,30 +17,7 @@ #define NETDB_BUFFER_SIZE 10000 -#ifdef _WIN32 -+#if ( defined(__FreeBSD_version) && ( ((__FreeBSD_version >= 504102) && (__FreeBSD_version < 600000)) || (__FreeBSD_version >= 600029) ) ) ++#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 -@@ -738,11 +743,11 @@ - if (rc != 0) hp = NULL; - } - #else --#ifdef GETHOSTBYNAME_IS_REENTRANT -+#ifndef GETHOSTBYNAME_IS_REENTRANT - enter_blocking_section(); - #endif - hp = gethostbyname(hostname); --#ifdef GETHOSTBYNAME_IS_REENTRANT -+#ifndef GETHOSTBYNAME_IS_REENTRANT - leave_blocking_section(); - #endif - #endif -@@ -787,7 +792,7 @@ - End_roots(); - } - --#if !defined(HAVE_PTHREAD) || !(HAS_GETHOSTBYNAME_R || GETHOSTBYNAME_IS_REENTRANT) -+#if !defined(HAVE_PTHREAD) || (!(HAS_GETHOSTBYNAME_R || GETHOSTBYNAME_IS_REENTRANT) && !defined(HAS_SIGWAIT)) - - value ml_ip_job_start(value job_v) - { |