Index: head/net-p2p/amule-devel/Makefile =================================================================== --- head/net-p2p/amule-devel/Makefile (revision 465273) +++ head/net-p2p/amule-devel/Makefile (revision 465274) @@ -1,144 +1,143 @@ # Created by: Ganael LAPLANCHE # $FreeBSD$ PORTNAME= amule -PORTVERSION= 10990 -PORTREVISION= 3 +PORTVERSION= 10998 CATEGORIES= net-p2p MASTER_SITES= http://amule.sourceforge.net/tarballs/ PKGNAMESUFFIX= -devel DISTNAME= aMule-SVN-r${PORTVERSION} MAINTAINER= bar@FreeBSD.org COMMENT= All-platform eMule p2p client LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LIB_DEPENDS= libcryptopp.so:security/cryptopp CONFLICTS= amule-[0-9]* USES= bison desktop-file-utils gmake perl5 pkgconfig shebangfix \ tar:bzip2 USE_PERL5= build USE_WX= 2.8 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-denoise-level=0 CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \ docdir='$${prefix}/${DOCSDIR_REL}' CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ FILEVIEW GEOIP MMAP MONOLITHIC NLS OPTIMIZED_CFLAGS PLASMAMULE UPNP \ WEBSERVER WXCAS XAS ALC_DESC= Compile aMule Link Creator for GUI ALCC_DESC= Compile aMule Link Creator for console AMULECMD_DESC= Compile aMule command line client AMULEDAEMON_DESC= Compile aMule daemon version AMULEGUI_DESC= Compile aMule remote GUI CAS_DESC= Compile aMule Statistics for console ED2K_DESC= Compile aMule ed2k links handler -FILEVIEW_DESC= Compile file viewer for console (EXPERIMENTAL) +FILEVIEW_DESC= Compile file viewer for console MMAP_DESC= Use mapped memory MONOLITHIC_DESC= Compile monolithic aMule PLASMAMULE_DESC= Compile aMule plasma applet and engine WXCAS_DESC= Compile aMule Statistics for GUI XAS_DESC= Install XChat2 plugin OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \ FILEVIEW MONOLITHIC WEBSERVER WXCAS XAS OPTIONS_SUB= yes SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING DEBUG_CONFIGURE_ON= --enable-debug NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls ALC_CONFIGURE_ON= --enable-alc ALCC_CONFIGURE_ON= --enable-alcc AMULECMD_CONFIGURE_ON= --enable-amulecmd AMULEDAEMON_CONFIGURE_ON= --enable-amule-daemon AMULEDAEMON_USE= RC_SUBR=amuled AMULEGUI_CONFIGURE_ON= --enable-amule-gui CAS_CONFIGURE_ON= --enable-cas CAS_LIB_DEPENDS= libgd.so:graphics/gd ED2K_CONFIGURE_OFF= --disable-ed2k FILEVIEW_CONFIGURE_ON= --enable-fileview GEOIP_CONFIGURE_ON= --enable-geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP MMAP_CONFIGURE_ON= --enable-mmap MONOLITHIC_CONFIGURE_OFF= --disable-monolithic PLASMAMULE_CONFIGURE_ON= --enable-plasmamule PLASMAMULE_USES= kde:4 PLASMAMULE_USE= KDE=kdelibs QT4=dbus,gui,moc_build PLASMAMULE_CONFIGURE_ENV= \ ac_cv_path_KDE4_CONFIG=${KDE_PREFIX}/bin/kde4-config \ KBUILDSYCOCA=${KDE_PREFIX}/bin/kbuildsycoca4 \ UPDATE_MIME_DATABASE=/usr/bin/true UPNP_LIB_DEPENDS= libupnp.so:devel/upnp UPNP_CONFIGURE_OFF= --disable-upnp WEBSERVER_CONFIGURE_ON= --enable-webserver WEBSERVER_LIB_DEPENDS= libpng.so:graphics/png WXCAS_CONFIGURE_ON= --enable-wxcas XAS_CONFIGURE_ON= --enable-xas XAS_USE= PERL5+=run .include .if ${ARCH} == "i386" && ( ${OSVERSION} >= 1000024 || ${CXX:T} == "clang++" ) CPPFLAGS+= -DCRYPTOPP_DISABLE_ASM .endif .if ${PORT_OPTIONS:MED2K} CONFLICTS+= ed2k-hash* .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CONFIGURE_ARGS+= --enable-optimize .endif post-patch: .SILENT ${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \ -e '/if.*test/s/==/=/' \ ${WRKSRC}/configure .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ ${WRKSRC}/docs/Makefile.in .endif .if ${PORT_OPTIONS:MPLASMAMULE} ${REINPLACE_CMD} -e 's|@prefix@|${KDE_PREFIX}|' \ -e 's|LDFLAGS =|& -L${KDE_PREFIX}/lib |' \ ${WRKSRC}/src/utils/plasmamule/Makefile.in .endif post-install: .if ${PORT_OPTIONS:MFILEVIEW} ${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin .endif .include Index: head/net-p2p/amule-devel/distinfo =================================================================== --- head/net-p2p/amule-devel/distinfo (revision 465273) +++ head/net-p2p/amule-devel/distinfo (revision 465274) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496569742 -SHA256 (aMule-SVN-r10990.tar.bz2) = 215d65df096ecdd3f420d9b0e7b0f180c9345e7f386a8aaa45c9205f820f7c63 -SIZE (aMule-SVN-r10990.tar.bz2) = 4741700 +TIMESTAMP = 1521706594 +SHA256 (aMule-SVN-r10998.tar.bz2) = 51cb110dfe64fd2c45ecad908a73bf1ca0c6a3827a07d40604f0ac229121e2a9 +SIZE (aMule-SVN-r10998.tar.bz2) = 4731496 Index: head/net-p2p/amule-devel/files/patch-src_MuleNotebook.cpp =================================================================== --- head/net-p2p/amule-devel/files/patch-src_MuleNotebook.cpp (revision 465273) +++ head/net-p2p/amule-devel/files/patch-src_MuleNotebook.cpp (nonexistent) @@ -1,43 +0,0 @@ ---- src/MuleNotebook.cpp.orig 2017-06-03 23:55:41.000000000 +0200 -+++ src/MuleNotebook.cpp 2017-11-20 14:51:19.834947000 +0100 -@@ -45,10 +45,10 @@ - EVT_MENU(MP_CLOSE_OTHER_TABS, CMuleNotebook::OnPopupCloseOthers) - - // Madcat - tab closing engine -- EVT_LEFT_DOWN(CMuleNotebook::OnMouseButtonRelease) -- EVT_LEFT_UP(CMuleNotebook::OnMouseButtonRelease) -- EVT_MIDDLE_DOWN(CMuleNotebook::OnMouseButtonRelease) -- EVT_MIDDLE_UP(CMuleNotebook::OnMouseButtonRelease) -+ EVT_LEFT_DOWN(CMuleNotebook::OnMouseButton) -+ EVT_LEFT_UP(CMuleNotebook::OnMouseButton) -+ EVT_MIDDLE_DOWN(CMuleNotebook::OnMouseButton) -+ EVT_MIDDLE_UP(CMuleNotebook::OnMouseButton) - EVT_MOTION(CMuleNotebook::OnMouseMotion) - #if MULE_NEEDS_DELETEPAGE_WORKAROUND - EVT_MULENOTEBOOK_DELETE_PAGE(wxID_ANY, CMuleNotebook::OnDeletePage) -@@ -217,7 +217,7 @@ - } - - --void CMuleNotebook::OnMouseButtonRelease(wxMouseEvent &event) -+void CMuleNotebook::OnMouseButton(wxMouseEvent &event) - { - if (GetImageList() == NULL) { - // This Mulenotebook has no images on tabs, so nothing to do. -@@ -235,16 +235,13 @@ - - if (event.LeftDown() && (flags == wxNB_HITTEST_ONICON)) { - tab_down_icon = tab; -- return; - } - else if (event.MiddleDown() && (flags == wxNB_HITTEST_ONLABEL)) { - tab_down_label = tab; -- return; - } - else if (event.LeftDown() || event.MiddleDown()) { - tab_down_icon = -1; - tab_down_label = -1; -- return; - } - - if (((tab != -1) && (((flags == wxNB_HITTEST_ONICON) && event.LeftUp() && (tab == tab_down_icon)) || Property changes on: head/net-p2p/amule-devel/files/patch-src_MuleNotebook.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-p2p/amule-devel/files/patch-src_MuleNotebook.h =================================================================== --- head/net-p2p/amule-devel/files/patch-src_MuleNotebook.h (revision 465273) +++ head/net-p2p/amule-devel/files/patch-src_MuleNotebook.h (nonexistent) @@ -1,14 +0,0 @@ ---- src/MuleNotebook.h.orig 2017-06-03 23:55:41.000000000 +0200 -+++ src/MuleNotebook.h 2017-11-20 14:52:35.287092000 +0100 -@@ -130,9 +130,9 @@ - - protected: - /** -- * Event handler for left or middle mouse button release (for closing pages) -+ * Event handler for left or middle mouse button to press or release (for closing pages) - */ -- void OnMouseButtonRelease(wxMouseEvent &event); -+ void OnMouseButton(wxMouseEvent &event); - - /** - * Event handler for mouse motion (for highlighting the 'x') Property changes on: head/net-p2p/amule-devel/files/patch-src_MuleNotebook.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property