API tools faq
paste
Advertisement
Guest User

ports/172671

a guest
Oct 17th, 2012
62
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.71 KB | None | 0 0
raw download clone embed print report
  1. --- Makefile.orig   2012-08-06 01:19:36.000000000 +0200
  2. +++ Makefile    2012-10-18 01:03:32.000000000 +0200
  3. @@ -1,12 +1,8 @@
  4. -# New ports collection makefile for:   amule-devel
  5. -# Date created:        Wed Nov 05 09:30:00 UTC 2003
  6. -# Whom:            Ganael LAPLANCHE <ganael.laplanche@martymac.org>
  7. -#
  8. -# $FreeBSD: ports/net-p2p/amule-devel/Makefile,v 1.70 2012/08/05 23:19:36 dougb Exp $
  9. -#
  10. +# Created by: Ganael LAPLANCHE <ganael.laplanche@martymac.org>
  11. +# $FreeBSD$
  12.  
  13.  PORTNAME=  amule
  14. -PORTVERSION=   10788
  15. +PORTVERSION=   10792
  16.  CATEGORIES=    net-p2p
  17.  MASTER_SITES=  http://amule.sourceforge.net/tarballs/
  18.  PKGNAMESUFFIX= -devel
  19. @@ -41,27 +37,27 @@
  20.  CFLAGS+=   ${PTHREAD_CFLAGS}
  21.  LDFLAGS+=  ${PTHREAD_LIBS} -L${LOCALBASE}/lib
  22.  
  23. -OPTIONS_DEFINE=    ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG ED2K FILEVIEW \
  24. -   GEOIP MMAP MONOLITHIC OPTIMIZED_CFLAGS PLASMAMULE UPNP WEBSERVER WXCAS \
  25. -   WXUNICODE XAS
  26. -ALC_DESC=      "Compile aMule Link Creator for GUI"
  27. -ALCC_DESC=     "Compile aMule Link Creator for console"
  28. -AMULECMD_DESC=     "Compile aMule command line client"
  29. -AMULEDAEMON_DESC=  "Compile aMule daemon version"
  30. -AMULEGUI_DESC=     "Compile aMule remote GUI"
  31. -CAS_DESC=      "Compile aMule Statistics for console"
  32. -DEBUG_DESC=        "Compile aMule with additional debugging output"
  33. -ED2K_DESC=     "Compile aMule ed2k links handler"
  34. -FILEVIEW_DESC=     "Compile file viewer for console (EXPERIMENTAL)"
  35. -GEOIP_DESC=        "Enable GeoIP IP2Country support"
  36. -MMAP_DESC=     "Enable using mapped memory"
  37. -MONOLITHIC_DESC=   "Compile monolithic aMule"
  38. -PLASMAMULE_DESC=   "Compile aMule plasma applet and engine"
  39. -UPNP_DESC=     "Enable Universal Plug and Play support"
  40. -WEBSERVER_DESC=        "Compile aMule WebServer"
  41. -WXCAS_DESC=        "Compile aMule Statistics for GUI"
  42. -WXUNICODE_DESC=        "Enable Unicode support"
  43. -XAS_DESC=      "Install XChat2 plugin"
  44. +OPTIONS_DEFINE=    ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \
  45. +   FILEVIEW GEOIP MMAP MONOLITHIC NLS OPTIMIZED_CFLAGS PLASMAMULE UPNP \
  46. +   WEBSERVER WXCAS WXUNICODE XAS
  47. +ALC_DESC=      Compile aMule Link Creator for GUI
  48. +ALCC_DESC=     Compile aMule Link Creator for console
  49. +AMULECMD_DESC=     Compile aMule command line client
  50. +AMULEDAEMON_DESC=  Compile aMule daemon version
  51. +AMULEGUI_DESC=     Compile aMule remote GUI
  52. +CAS_DESC=      Compile aMule Statistics for console
  53. +DEBUG_DESC=        Compile aMule with debugging output
  54. +ED2K_DESC=     Compile aMule ed2k links handler
  55. +FILEVIEW_DESC=     Compile file viewer for console (EXPERIMENTAL)
  56. +GEOIP_DESC=        Enable GeoIP IP2Country support
  57. +MMAP_DESC=     Enable using mapped memory
  58. +MONOLITHIC_DESC=   Compile monolithic aMule
  59. +PLASMAMULE_DESC=   Compile aMule plasma applet and engine
  60. +UPNP_DESC=     Enable Universal Plug and Play support
  61. +WEBSERVER_DESC=        Compile aMule WebServer
  62. +WXCAS_DESC=        Compile aMule Statistics for GUI
  63. +WXUNICODE_DESC=        Enable Unicode support
  64. +XAS_DESC=      Install XChat2 plugin
  65.  OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K FILEVIEW \
  66.     MONOLITHIC WEBSERVER WXCAS WXUNICODE XAS
  67.  
  68. @@ -128,7 +124,7 @@
  69.  
  70.  .if ${PORT_OPTIONS:MCAS}
  71.  CONFIGURE_ARGS+=   --enable-cas
  72. -LIB_DEPENDS+=      gd.4:${PORTSDIR}/graphics/gd
  73. +LIB_DEPENDS+=      gd:${PORTSDIR}/graphics/gd
  74.  PLIST_SUB+=        CAS=""
  75.  .else
  76.  CONFIGURE_ARGS+=   --disable-cas
  77. @@ -154,7 +150,7 @@
  78.  
  79.  .if ${PORT_OPTIONS:MGEOIP}
  80.  CONFIGURE_ARGS+=   --enable-geoip
  81. -LIB_DEPENDS+=      GeoIP.5:${PORTSDIR}/net/GeoIP
  82. +LIB_DEPENDS+=      GeoIP:${PORTSDIR}/net/GeoIP
  83.  .else
  84.  CONFIGURE_ARGS+=   --disable-geoip
  85.  .endif
  86. @@ -191,7 +187,7 @@
  87.  .endif
  88.  
  89.  .if ${PORT_OPTIONS:MUPNP}
  90. -LIB_DEPENDS+=      upnp.9:${PORTSDIR}/devel/upnp
  91. +LIB_DEPENDS+=      upnp:${PORTSDIR}/devel/upnp
  92.  .else
  93.  CONFIGURE_ARGS+=   --disable-upnp
  94.  .endif
  95. --- Makefile.man.orig   2012-02-16 00:51:37.000000000 +0100
  96. +++ Makefile.man    2012-10-18 01:00:51.000000000 +0200
  97. @@ -1,38 +1,38 @@
  98.  MANLANG=   "" de es fr hu it ru tr zh_TW
  99.  
  100. -.if !defined(WITHOUT_NLS)
  101. -. if !defined(WITHOUT_MONOLITHIC)
  102. +.if empty(PORT_OPTIONS:MNLS)
  103. +. if empty(PORT_OPTIONS:MMONOLITHIC)
  104.  MAN1+=     amule.1
  105.  . endif
  106. -. if !defined(WITHOUT_ALC)
  107. +. if empty(PORT_OPTIONS:MALC)
  108.  MAN1+=     alc.1
  109.  . endif
  110. -. if !defined(WITHOUT_ALCC)
  111. +. if empty(PORT_OPTIONS:MALCC)
  112.  MAN1+=     alcc.1
  113.  . endif
  114. -. if !defined(WITHOUT_AMULECMD)
  115. +. if empty(PORT_OPTIONS:MAMULECMD)
  116.  MAN1+=     amulecmd.1
  117.  . endif
  118. -. if !defined(WITHOUT_AMULEDAEMON)
  119. +. if empty(PORT_OPTIONS:MAMULEDAEMON)
  120.  MAN1+=     amuled.1
  121.  . endif
  122. -. if !defined(WITHOUT_AMULEGUI)
  123. +. if empty(PORT_OPTIONS:MAMULEGUI)
  124.  MAN1+= amulegui.1
  125.  . endif
  126. -. if !defined(WITHOUT_CAS)
  127. +. if empty(PORT_OPTIONS:MCAS)
  128.  MAN1+=     cas.1
  129.  . endif
  130. -. if !defined(WITHOUT_ED2K)
  131. +. if empty(PORT_OPTIONS:MED2K)
  132.  MAN1+=     ed2k.1
  133.  . endif
  134. -. if !defined(WITHOUT_WEBSERVER)
  135. +. if empty(PORT_OPTIONS:MWEBSERVER)
  136.  MAN1+=     amuleweb.1
  137.  . endif
  138. -. if !defined(WITHOUT_WXCAS)
  139. +. if empty(PORT_OPTIONS:MWXCAS)
  140.  MAN1+=     wxcas.1
  141.  . endif
  142. -.endif # !WITHOUT_NLS
  143. +.endif
  144.  
  145. -.if !defined(WITHOUT_XAS)
  146. +.if empty(PORT_OPTIONS:MXAS)
  147.  MAN1+= xas.1
  148.  .endif
  149. --- distinfo.orig   2012-06-04 17:56:35.000000000 +0200
  150. +++ distinfo    2012-10-18 00:52:54.000000000 +0200
  151. @@ -1,2 +1,2 @@
  152. -SHA256 (aMule-SVN-r10788.tar.bz2) = 0eb48fb0575f93d955d3686ee2b966455acfdda1ae1296e75e6739b5185e08d2
  153. -SIZE (aMule-SVN-r10788.tar.bz2) = 4603252
  154. +SHA256 (aMule-SVN-r10792.tar.bz2) = e9b2cd2a8c66de1df9c37c0b1ca05d961d46ec2097e19ae56a0b25b5050fece4
  155. +SIZE (aMule-SVN-r10792.tar.bz2) = 4603469
  156. --- files/patch-src__SHAHashSet.cpp.orig    2012-10-18 00:52:54.000000000 +0200
  157. +++ files/patch-src__SHAHashSet.cpp 2012-10-18 00:52:54.000000000 +0200
  158. @@ -0,0 +1,12 @@
  159. +--- src/SHAHashSet.cpp.orig    2012-05-11 20:38:43.000000000 +0200
  160. ++++ src/SHAHashSet.cpp 2012-10-13 12:29:25.000000000 +0200
  161. +@@ -702,7 +702,8 @@
  162. +       return false;
  163. +   }
  164. +
  165. +-  FreeHashSet();
  166. ++  //Backported from r10793
  167. ++  //FreeHashSet();
  168. +   return true;
  169. + }
  170. +
  171. --- files/patch-src__ThreadTasks.cpp.orig   2012-10-18 00:52:54.000000000 +0200
  172. +++ files/patch-src__ThreadTasks.cpp    2012-10-18 00:52:54.000000000 +0200
  173. @@ -0,0 +1,12 @@
  174. +--- src/ThreadTasks.cpp.orig   2011-11-20 19:08:59.000000000 +0100
  175. ++++ src/ThreadTasks.cpp    2012-10-13 12:33:01.000000000 +0200
  176. +@@ -193,6 +193,9 @@
  177. +                       % m_filename );
  178. +           }
  179. +       }
  180. ++      // Backported from r10793
  181. ++      // delete hashset now to free memory
  182. ++      AICHHashSet->FreeHashSet();
  183. +   }
  184. +
  185. +   if ((m_toHash == EH_AICH) && !TestDestroy()) {
  186. --- files/patch-src__PlatformSpecific.h.orig    2012-10-18 00:52:54.000000000 +0200
  187. +++ files/patch-src__PlatformSpecific.h 2012-10-18 00:52:54.000000000 +0200
  188. @@ -0,0 +1,11 @@
  189. +--- src/PlatformSpecific.h.orig    2011-11-20 19:08:59.000000000 +0100
  190. ++++ src/PlatformSpecific.h 2012-10-13 12:34:46.000000000 +0200
  191. +@@ -100,6 +100,8 @@
  192. + {
  193. +   switch (GetFilesystemType(path)) {
  194. +       case fsFAT:
  195. ++      // Backported from r10794
  196. ++      case fsNTFS:
  197. +       case fsHFS:
  198. +           return false;
  199. +       default:
  200. --- files/patch-src__ListenSocket.cpp.orig  2012-10-18 00:52:54.000000000 +0200
  201. +++ files/patch-src__ListenSocket.cpp   2012-10-18 00:52:54.000000000 +0200
  202. @@ -0,0 +1,23 @@
  203. +--- src/ListenSocket.cpp.orig  2012-05-11 20:38:58.000000000 +0200
  204. ++++ src/ListenSocket.cpp   2012-10-13 12:37:21.000000000 +0200
  205. +@@ -88,7 +88,9 @@
  206. +
  207. + void CListenSocket::OnAccept()
  208. + {
  209. +-  m_pending = true;
  210. ++  // Backported from r10795
  211. ++  //m_pending = true;
  212. ++  m_pending = theApp->IsRunning();    // just do nothing if we are shutting down
  213. +   // If the client is still at maxconnections,
  214. +   // this will allow it to go above it ...
  215. +   // But if you don't, you will get a lowID on all servers.
  216. +@@ -103,7 +105,8 @@
  217. +               newclient->Safe_Delete();
  218. +               m_pending = false;
  219. +           } else {
  220. +-              wxASSERT(theApp->IsRunning());
  221. ++              // Backported from r10795
  222. ++              //wxASSERT(theApp->IsRunning());
  223. +               if (!newclient->InitNetworkData()) {
  224. +                   // IP or port were not returned correctly
  225. +                   // from the accepted address, or filtered.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!