Update to SVN-r10998.

4 files changed, 5 insertions, 63 deletions

diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index bc4306147274..f54a484d5bc0 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	amule
-PORTVERSION=	10990
-PORTREVISION=	3
+PORTVERSION=	10998
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://amule.sourceforge.net/tarballs/
 PKGNAMESUFFIX=	-devel
@@ -44,7 +43,7 @@ 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
diff --git a/net-p2p/amule-devel/distinfo b/net-p2p/amule-devel/distinfo
index de8b6220c5f8..fb08cfd2a410 100644
--- a/net-p2p/amule-devel/distinfo
+++ b/net-p2p/amule-devel/distinfo
@@ -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
diff --git a/net-p2p/amule-devel/files/patch-src_MuleNotebook.cpp b/net-p2p/amule-devel/files/patch-src_MuleNotebook.cpp
deleted file mode 100644
index 881d129b5d98..000000000000
--- a/net-p2p/amule-devel/files/patch-src_MuleNotebook.cpp
+++ /dev/null
@@ -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)) ||
diff --git a/net-p2p/amule-devel/files/patch-src_MuleNotebook.h b/net-p2p/amule-devel/files/patch-src_MuleNotebook.h
deleted file mode 100644
index ef0987f27d0c..000000000000
--- a/net-p2p/amule-devel/files/patch-src_MuleNotebook.h
+++ /dev/null
@@ -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')