API tools faq
paste
Advertisement
Guest User

ports/168392

a guest
Jun 3rd, 2012
79
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.24 KB | None | 0 0
raw download clone embed print report diff
  1. --- Makefile.orig   2012-06-01 07:23:18.000000000 +0200
  2. +++ Makefile    2012-06-03 09:35:11.000000000 +0200
  3. @@ -6,8 +6,7 @@
  4.  #
  5.  
  6.  PORTNAME=  amule
  7. -PORTVERSION=   10771
  8. -PORTREVISION=  2
  9. +PORTVERSION=   10788
  10.  CATEGORIES=    net-p2p
  11.  MASTER_SITES=  http://amule.sourceforge.net/tarballs/
  12.  PKGNAMESUFFIX= -devel
  13. @@ -42,23 +41,29 @@
  14.  CFLAGS+=   ${PTHREAD_CFLAGS}
  15.  LDFLAGS+=  ${PTHREAD_LIBS} -L${LOCALBASE}/lib
  16.  
  17. -OPTIONS=   ALC "Compile aMule Link Creator for GUI" on \
  18. -       ALCC "Compile aMule Link Creator for console" on \
  19. -       AMULECMD "Compile aMule command line client" on \
  20. -       AMULEDAEMON "Compile aMule daemon version" on \
  21. -       AMULEGUI "Compile aMule remote GUI" on \
  22. -       CAS "Compile aMule Statistics for console" on \
  23. -       ED2K "Compile aMule ed2k links handler" on \
  24. -       FILEVIEW "Compile file viewer for console (EXPERIMENTAL)" on \
  25. -       GEOIP "Enable GeoIP IP2Country support" off \
  26. -       MMAP "Enable using mapped memory" off \
  27. -       MONOLITHIC "Compile monolithic aMule" on \
  28. -       PLASMAMULE "Compile aMule plasma applet and engine" off \
  29. -       UPNP "Enable Universal Plug and Play support" off \
  30. -       WEBSERVER "Compile aMule WebServer" on \
  31. -       WXCAS "Compile aMule Statistics for GUI" on \
  32. -       WXUNICODE "Enable Unicode support" on \
  33. -       XAS "Install XChat2 plugin" on
  34. +OPTIONS_DEFINE=    ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG ED2K FILEVIEW \
  35. +   GEOIP MMAP MONOLITHIC OPTIMIZED_CFLAGS PLASMAMULE UPNP WEBSERVER WXCAS \
  36. +   WXUNICODE XAS
  37. +ALC_DESC=      "Compile aMule Link Creator for GUI"
  38. +ALCC_DESC=     "Compile aMule Link Creator for console"
  39. +AMULECMD_DESC=     "Compile aMule command line client"
  40. +AMULEDAEMON_DESC=  "Compile aMule daemon version"
  41. +AMULEGUI_DESC=     "Compile aMule remote GUI"
  42. +CAS_DESC=      "Compile aMule Statistics for console"
  43. +DEBUG_DESC=        "Compile aMule with additional debugging output"
  44. +ED2K_DESC=     "Compile aMule ed2k links handler"
  45. +FILEVIEW_DESC=     "Compile file viewer for console (EXPERIMENTAL)"
  46. +GEOIP_DESC=        "Enable GeoIP IP2Country support"
  47. +MMAP_DESC=     "Enable using mapped memory"
  48. +MONOLITHIC_DESC=   "Compile monolithic aMule"
  49. +PLASMAMULE_DESC=   "Compile aMule plasma applet and engine"
  50. +UPNP_DESC=     "Enable Universal Plug and Play support"
  51. +WEBSERVER_DESC=        "Compile aMule WebServer"
  52. +WXCAS_DESC=        "Compile aMule Statistics for GUI"
  53. +WXUNICODE_DESC=        "Enable Unicode support"
  54. +XAS_DESC=      "Install XChat2 plugin"
  55. +OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K FILEVIEW \
  56. +   MONOLITHIC WEBSERVER WXCAS WXUNICODE XAS
  57.  
  58.  PORTDOCS=  ABOUT-NLS Changelog EC_Protocol.txt INSTALL README TODO \
  59.         amulesig.txt license.txt
  60. @@ -68,11 +73,11 @@
  61.  
  62.  .include <bsd.port.options.mk>
  63.  
  64. -.if !defined(WITH_DEBUG)
  65. +.if empty(PORT_OPTIONS:MDEBUG)
  66.  CONFIGURE_ARGS+=--disable-debug
  67.  .endif
  68.  
  69. -.if !defined(WITHOUT_NLS)
  70. +.if ${PORT_OPTIONS:MNLS}
  71.  USE_GETTEXT=   yes
  72.  PLIST_SUB+=    NLS=""
  73.  .else
  74. @@ -88,7 +93,7 @@
  75.  PLIST_SUB+=        ALC="@comment "
  76.  .endif
  77.  
  78. -.if !defined(WITHOUT_ALCC)
  79. +.if ${PORT_OPTIONS:MALCC}
  80.  CONFIGURE_ARGS+=   --enable-alcc
  81.  PLIST_SUB+=        ALCC=""
  82.  .else
  83. @@ -96,7 +101,7 @@
  84.  PLIST_SUB+=        ALCC="@comment "
  85.  .endif
  86.  
  87. -.if !defined(WITHOUT_AMULECMD)
  88. +.if ${PORT_OPTIONS:MAMULECMD}
  89.  CONFIGURE_ARGS+=   --enable-amulecmd
  90.  PLIST_SUB+=        AMULECMD=""
  91.  .else
  92. @@ -104,7 +109,7 @@
  93.  PLIST_SUB+=        AMULECMD="@comment "
  94.  .endif
  95.  
  96. -.if !defined(WITHOUT_AMULEDAEMON)
  97. +.if ${PORT_OPTIONS:MAMULEDAEMON}
  98.  CONFIGURE_ARGS+=   --enable-amule-daemon
  99.  PLIST_SUB+=        AMULEDAEMON=""
  100.  USE_RC_SUBR=       amuled.sh
  101. @@ -113,7 +118,7 @@
  102.  PLIST_SUB+=        AMULEDAEMON="@comment "
  103.  .endif
  104.  
  105. -.if !defined(WITHOUT_AMULEGUI)
  106. +.if ${PORT_OPTIONS:MAMULEGUI}
  107.  CONFIGURE_ARGS+=   --enable-amule-gui
  108.  PLIST_SUB+=        AMULEGUI=""
  109.  .else
  110. @@ -121,7 +126,7 @@
  111.  PLIST_SUB+=        AMULEGUI="@comment "
  112.  .endif
  113.  
  114. -.if !defined(WITHOUT_CAS)
  115. +.if ${PORT_OPTIONS:MCAS}
  116.  CONFIGURE_ARGS+=   --enable-cas
  117.  LIB_DEPENDS+=      gd.4:${PORTSDIR}/graphics/gd
  118.  PLIST_SUB+=        CAS=""
  119. @@ -130,7 +135,7 @@
  120.  PLIST_SUB+=        CAS="@comment "
  121.  .endif
  122.  
  123. -.if !defined(WITHOUT_ED2K)
  124. +.if ${PORT_OPTIONS:MED2K}
  125.  CONFLICTS+=        ed2k-hash*
  126.  CONFIGURE_ARGS+=   --enable-ed2k
  127.  PLIST_SUB+=        ED2K=""
  128. @@ -139,7 +144,7 @@
  129.  PLIST_SUB+=        ED2K="@comment "
  130.  .endif
  131.  
  132. -.if !defined(WITHOUT_FILEVIEW)
  133. +.if ${PORT_OPTIONS:MFILEVIEW}
  134.  CONFIGURE_ARGS+=   --enable-fileview
  135.  PLIST_SUB+=        FILEVIEW=""
  136.  .else
  137. @@ -147,20 +152,20 @@
  138.  PLIST_SUB+=        FILEVIEW="@comment "
  139.  .endif
  140.  
  141. -.if !defined(WITHOUT_GEOIP)
  142. +.if ${PORT_OPTIONS:MGEOIP}
  143.  CONFIGURE_ARGS+=   --enable-geoip
  144.  LIB_DEPENDS+=      GeoIP.5:${PORTSDIR}/net/GeoIP
  145.  .else
  146.  CONFIGURE_ARGS+=   --disable-geoip
  147.  .endif
  148.  
  149. -.if !defined(WITHOUT_MMAP)
  150. +.if ${PORT_OPTIONS:MMMAP}
  151.  CONFIGURE_ARGS+=   --enable-mmap
  152.  .else
  153.  CONFIGURE_ARGS+=   --disable-mmap
  154.  .endif
  155.  
  156. -.if !defined(WITHOUT_MONOLITHIC)
  157. +.if ${PORT_OPTIONS:MMONOLITHIC}
  158.  CONFIGURE_ARGS+=   --enable-monolithic
  159.  PLIST_SUB+=        MONOLITHIC=""
  160.  .else
  161. @@ -168,7 +173,11 @@
  162.  PLIST_SUB+=        MONOLITHIC="@comment "
  163.  .endif
  164.  
  165. -.if !defined(WITHOUT_PLASMAMULE)
  166. +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
  167. +CONFIGURE_ARGS+=   --enable-optimize
  168. +.endif
  169. +
  170. +.if ${PORT_OPTIONS:MPLASMAMULE}
  171.  CONFIGURE_ENV+=        ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \
  172.             KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \
  173.             UPDATE_MIME_DATABASE=/usr/bin/true
  174. @@ -182,13 +191,13 @@
  175.  PLIST_SUB+=        PLASMAMULE="@comment "
  176.  .endif
  177.  
  178. -.if !defined(WITHOUT_UPNP)
  179. +.if ${PORT_OPTIONS:MUPNP}
  180.  LIB_DEPENDS+=      upnp.9:${PORTSDIR}/devel/upnp
  181.  .else
  182.  CONFIGURE_ARGS+=   --disable-upnp
  183.  .endif
  184.  
  185. -.if !defined(WITHOUT_WEBSERVER)
  186. +.if ${PORT_OPTIONS:MWEBSERVER}
  187.  CONFIGURE_ARGS+=   --enable-webserver
  188.  PLIST_SUB+=        WEBSERVER=""
  189.  .else
  190. @@ -196,7 +205,7 @@
  191.  PLIST_SUB+=        WEBSERVER="@comment "
  192.  .endif
  193.  
  194. -.if !defined(WITHOUT_WXCAS)
  195. +.if ${PORT_OPTIONS:MWXCAS}
  196.  CONFIGURE_ARGS+=   --enable-wxcas
  197.  PLIST_SUB+=        WXCAS=""
  198.  .else
  199. @@ -204,11 +213,11 @@
  200.  PLIST_SUB+=        WXCAS="@comment "
  201.  .endif
  202.  
  203. -.if !defined(WITHOUT_WXUNICODE)
  204. +.if ${PORT_OPTIONS:MWXUNICODE}
  205.  WX_UNICODE=        yes
  206.  .endif
  207.  
  208. -.if !defined(WITHOUT_XAS)
  209. +.if ${PORT_OPTIONS:MXAS}
  210.  CONFIGURE_ARGS+=   --enable-xas
  211.  PLIST_SUB+=        XAS=""
  212.  .else
  213. --- distinfo.orig   2012-04-23 00:48:22.000000000 +0200
  214. +++ distinfo    2012-06-03 08:48:56.000000000 +0200
  215. @@ -1,2 +1,2 @@
  216. -SHA256 (aMule-SVN-r10771.tar.bz2) = bd8f120535362fa6bbd16edf684b8d36f357ab4b17214ce82a8fbbdd2353bf47
  217. -SIZE (aMule-SVN-r10771.tar.bz2) = 4566024
  218. +SHA256 (aMule-SVN-r10788.tar.bz2) = 0eb48fb0575f93d955d3686ee2b966455acfdda1ae1296e75e6739b5185e08d2
  219. +SIZE (aMule-SVN-r10788.tar.bz2) = 4603252
  220. --- files/patch-src-ObservableQueue.h.orig  2011-09-20 22:30:04.000000000 +0200
  221. +++ files/patch-src-ObservableQueue.h   1970-01-01 01:00:00.000000000 +0100
  222. @@ -1,20 +0,0 @@
  223. ---- src/ObservableQueue.h~
  224. -+++ src/ObservableQueue.h
  225. -@@ -331,7 +331,7 @@ CObservableQueue<ValueType>::~CObservabl
  226. - template <typename ValueType>
  227. - void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
  228. - {
  229. --  NotifyObservers( EventType( EventType::STARTING ), o );
  230. -+  this->NotifyObservers( EventType( EventType::STARTING ), o );
  231. - }
  232. -
  233. -
  234. -@@ -338,7 +338,7 @@ void CObservableQueue<ValueType>::Observ
  235. - template <typename ValueType>
  236. - void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
  237. - {
  238. --  NotifyObservers( EventType( EventType::STOPPING ), o );
  239. -+  this->NotifyObservers( EventType( EventType::STOPPING ), o );
  240. - }
  241. -
  242. -
  243. \ No newline at end of file
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!