diff options
| -rw-r--r-- | net-p2p/amule-devel/Makefile | 8 | ||||
| -rw-r--r-- | net-p2p/amule-devel/Makefile.man | 4 | ||||
| -rw-r--r-- | net-p2p/amule-devel/distinfo | 4 | ||||
| -rw-r--r-- | net-p2p/amule-devel/files/patch-src__ListenSocket.cpp | 23 | ||||
| -rw-r--r-- | net-p2p/amule-devel/files/patch-src__PlatformSpecific.h | 11 | ||||
| -rw-r--r-- | net-p2p/amule-devel/files/patch-src__SHAHashSet.cpp | 12 | ||||
| -rw-r--r-- | net-p2p/amule-devel/files/patch-src__ThreadTasks.cpp | 12 |
7 files changed, 8 insertions, 66 deletions
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile index fa2abd04ec83..29b12775b7ed 100644 --- a/net-p2p/amule-devel/Makefile +++ b/net-p2p/amule-devel/Makefile @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= amule -PORTVERSION= 10792 +PORTVERSION= 10802 CATEGORIES= net-p2p MASTER_SITES= http://amule.sourceforge.net/tarballs/ PKGNAMESUFFIX= -devel DISTNAME= aMule-SVN-r${PORTVERSION} -MAINTAINER= barbara.xxx1975@libero.it +MAINTAINER= bar@FreeBSD.org COMMENT= The all-platform eMule p2p client LICENSE= GPLv2 GPLv3 @@ -58,8 +58,8 @@ WEBSERVER_DESC= Compile aMule WebServer WXCAS_DESC= Compile aMule Statistics for GUI WXUNICODE_DESC= Enable Unicode support XAS_DESC= Install XChat2 plugin -OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DOCS ED2K \ - FILEVIEW MONOLITHIC NLS WEBSERVER WXCAS WXUNICODE XAS +OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \ + FILEVIEW MONOLITHIC WEBSERVER WXCAS WXUNICODE XAS PORTDOCS= ABOUT-NLS Changelog EC_Protocol.txt INSTALL README TODO \ amulesig.txt license.txt diff --git a/net-p2p/amule-devel/Makefile.man b/net-p2p/amule-devel/Makefile.man index fed8f56cfd69..9b4136f97307 100644 --- a/net-p2p/amule-devel/Makefile.man +++ b/net-p2p/amule-devel/Makefile.man @@ -17,7 +17,7 @@ MAN1+= amulecmd.1 MAN1+= amuled.1 . endif . if ${PORT_OPTIONS:MAMULEGUI} -MAN1+= amulegui.1 +MAN1+= amulegui.1 . endif . if ${PORT_OPTIONS:MCAS} MAN1+= cas.1 @@ -34,5 +34,5 @@ MAN1+= wxcas.1 .endif .if ${PORT_OPTIONS:MXAS} -MAN1+= xas.1 +MAN1+= xas.1 .endif diff --git a/net-p2p/amule-devel/distinfo b/net-p2p/amule-devel/distinfo index 777f29380663..e4179b834f3c 100644 --- a/net-p2p/amule-devel/distinfo +++ b/net-p2p/amule-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (aMule-SVN-r10792.tar.bz2) = e9b2cd2a8c66de1df9c37c0b1ca05d961d46ec2097e19ae56a0b25b5050fece4 -SIZE (aMule-SVN-r10792.tar.bz2) = 4603469 +SHA256 (aMule-SVN-r10802.tar.bz2) = c097a61d09ad5a2e9a2a3e82d08ff0aedc1b937fa62902658601319ba50f535e +SIZE (aMule-SVN-r10802.tar.bz2) = 4614274 diff --git a/net-p2p/amule-devel/files/patch-src__ListenSocket.cpp b/net-p2p/amule-devel/files/patch-src__ListenSocket.cpp deleted file mode 100644 index 4d354b29efa9..000000000000 --- a/net-p2p/amule-devel/files/patch-src__ListenSocket.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- src/ListenSocket.cpp.orig 2012-05-11 20:38:58.000000000 +0200 -+++ src/ListenSocket.cpp 2012-10-13 12:37:21.000000000 +0200 -@@ -88,7 +88,9 @@ - - void CListenSocket::OnAccept() - { -- m_pending = true; -+ // Backported from r10795 -+ //m_pending = true; -+ m_pending = theApp->IsRunning(); // just do nothing if we are shutting down - // If the client is still at maxconnections, - // this will allow it to go above it ... - // But if you don't, you will get a lowID on all servers. -@@ -103,7 +105,8 @@ - newclient->Safe_Delete(); - m_pending = false; - } else { -- wxASSERT(theApp->IsRunning()); -+ // Backported from r10795 -+ //wxASSERT(theApp->IsRunning()); - if (!newclient->InitNetworkData()) { - // IP or port were not returned correctly - // from the accepted address, or filtered. diff --git a/net-p2p/amule-devel/files/patch-src__PlatformSpecific.h b/net-p2p/amule-devel/files/patch-src__PlatformSpecific.h deleted file mode 100644 index c21e9b5e135a..000000000000 --- a/net-p2p/amule-devel/files/patch-src__PlatformSpecific.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/PlatformSpecific.h.orig 2011-11-20 19:08:59.000000000 +0100 -+++ src/PlatformSpecific.h 2012-10-13 12:34:46.000000000 +0200 -@@ -100,6 +100,8 @@ - { - switch (GetFilesystemType(path)) { - case fsFAT: -+ // Backported from r10794 -+ case fsNTFS: - case fsHFS: - return false; - default: diff --git a/net-p2p/amule-devel/files/patch-src__SHAHashSet.cpp b/net-p2p/amule-devel/files/patch-src__SHAHashSet.cpp deleted file mode 100644 index 1f6313016ebe..000000000000 --- a/net-p2p/amule-devel/files/patch-src__SHAHashSet.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/SHAHashSet.cpp.orig 2012-05-11 20:38:43.000000000 +0200 -+++ src/SHAHashSet.cpp 2012-10-13 12:29:25.000000000 +0200 -@@ -702,7 +702,8 @@ - return false; - } - -- FreeHashSet(); -+ //Backported from r10793 -+ //FreeHashSet(); - return true; - } - diff --git a/net-p2p/amule-devel/files/patch-src__ThreadTasks.cpp b/net-p2p/amule-devel/files/patch-src__ThreadTasks.cpp deleted file mode 100644 index e27cd249383e..000000000000 --- a/net-p2p/amule-devel/files/patch-src__ThreadTasks.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/ThreadTasks.cpp.orig 2011-11-20 19:08:59.000000000 +0100 -+++ src/ThreadTasks.cpp 2012-10-13 12:33:01.000000000 +0200 -@@ -193,6 +193,9 @@ - % m_filename ); - } - } -+ // Backported from r10793 -+ // delete hashset now to free memory -+ AICHHashSet->FreeHashSet(); - } - - if ((m_toHash == EH_AICH) && !TestDestroy()) { |