8 files changed, 62 insertions, 63 deletions

diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index aaf03183a3e6..19639bb3dbb8 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	wxMaxima
-PORTVERSION=	14.12.1
-PORTREVISION=	2
+PORTVERSION=	16.04.1
+PORTREVISION=	0
 CATEGORIES=	math
-MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
-DISTFILES=	${PORTNAME:tl}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	WxWidgets GUI for the computer algebra system maxima
@@ -15,24 +13,20 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	maxima:math/maxima
 
-CONFIGURE_ARGS=	--program-prefix=
+CONFIGURE_ARGS=	--program-prefix= --docdir=${DOCSDIR}
 
+GH_TUPLE=	andrejv:${PORTNAME:tl}:Version-${DISTVERSION}
 GNU_CONFIGURE=	yes
 
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
 
-USES=		desktop-file-utils gettext
-USE_WX=		2.8
+INFO=		wxmaxima
+
+USE_GITHUB=	yes
+USES=		autoreconf desktop-file-utils gettext shared-mime-info
+USE_WX=		3.0
 
-WX_UNICODE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME:tl}-${PORTVERSION}
 WX_COMPS=	wx
 WX_CONF_ARGS=	absolute
 
-post-install:
-	@${LN} -s ../wxMaxima/wxmaxima.png ${STAGEDIR}${PREFIX}/share/pixmaps/wxmaxima.png
-	@${LOCALBASE}/bin/desktop-file-install \
-		--mode=${SHAREMODE} --dir=${STAGEDIR}${DESKTOPDIR} \
-		${WRKSRC}/${PORTNAME:tl}.desktop
-
 .include <bsd.port.mk>
diff --git a/math/wxMaxima/distinfo b/math/wxMaxima/distinfo
index c79d8238db4e..e7e169c4a764 100644
--- a/math/wxMaxima/distinfo
+++ b/math/wxMaxima/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wxmaxima-14.12.1.tar.gz) = 5fa01ecab2ee5a0fab9f2dad68fd78f9454da11fffe3815b17b7f0e201dc5d6a
-SIZE (wxmaxima-14.12.1.tar.gz) = 1962259
+SHA256 (andrejv-wxmaxima-16.04.1-Version-16.04.1_GH0.tar.gz) = dc99c054f741a58bbdd41da2594204bd4ea4c3faee4a72cc0e21268e42925eeb
+SIZE (andrejv-wxmaxima-16.04.1-Version-16.04.1_GH0.tar.gz) = 4554979
diff --git a/math/wxMaxima/files/patch-data_Makefile.am b/math/wxMaxima/files/patch-data_Makefile.am
new file mode 100644
index 000000000000..173a8ac3d0de
--- /dev/null
+++ b/math/wxMaxima/files/patch-data_Makefile.am
@@ -0,0 +1,11 @@
+--- data/Makefile.am.orig	2016-04-23 16:57:50 UTC
++++ data/Makefile.am
+@@ -13,7 +13,7 @@ appicondir = $(datarootdir)/pixmaps
+ dist_appicon_DATA = wxmaxima.svg wxmaxima.png text-x-wxmaxima-batch.svg text-x-wxmathml.svg wxmaxima-16.xpm wxmaxima-32.xpm
+ 
+ 
+-mandatadir = $(datadir)/man/man1
++mandatadir = $(mandir)/man1
+ dist_mandata_DATA = wxmaxima.1
+ 
+ mimedatadir = $(datarootdir)/mime/packages
diff --git a/math/wxMaxima/files/patch-src_MathCtrl.cpp b/math/wxMaxima/files/patch-src_MathCtrl.cpp
deleted file mode 100644
index a7c82e2ab6e5..000000000000
--- a/math/wxMaxima/files/patch-src_MathCtrl.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/MathCtrl.cpp.orig	2015-02-05 22:22:12 UTC
-+++ src/MathCtrl.cpp
-@@ -1563,7 +1563,7 @@ void MathCtrl::OnCharInActive(wxKeyEvent
-  * We have a wxKeyEvent with no active editor, shift is down and
-  * keycode (ccode) is WXK_UP/WXK_DOWN
-  */
--void MathCtrl::SelectWithChar(wxChar ccode) {
-+void MathCtrl::SelectWithChar(int ccode) {
-   // start making a selection
-   // m_hCaretPositionStart is the first group selected
-   // m_hCaretPositionEnd is tle last group selected
-@@ -1646,7 +1646,7 @@ void MathCtrl::SelectEditable(EditorCell
- }
- 
- void MathCtrl::OnCharNoActive(wxKeyEvent& event) {
--  wxChar ccode = event.GetKeyCode();
-+  int ccode = event.GetKeyCode();
-   wxString txt; // Usually we open an Editor Cell with initial content txt
- 
-   // If Shift is down we are selecting with WXK_UP and WXK_DOWN
diff --git a/math/wxMaxima/files/patch-src_MathCtrl.h b/math/wxMaxima/files/patch-src_MathCtrl.h
deleted file mode 100644
index 8989437353af..000000000000
--- a/math/wxMaxima/files/patch-src_MathCtrl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/MathCtrl.h.orig	2015-02-05 22:22:16 UTC
-+++ src/MathCtrl.h
-@@ -211,7 +211,7 @@ protected:
-   void OnCharNoActive(wxKeyEvent& event);
-   void OnChar(wxKeyEvent& event);
-   void SelectEditable(EditorCell *editor, bool up);
--  void SelectWithChar(wxChar ccode);
-+  void SelectWithChar(int ccode);
-   void ClickNDrag(wxPoint down, wxPoint up);
-   void AdjustSize();
-   void OnEraseBackground(wxEraseEvent& event) { }
diff --git a/math/wxMaxima/files/patch-wxmaxima.desktop b/math/wxMaxima/files/patch-wxmaxima.desktop
deleted file mode 100644
index d0c153bf0e79..000000000000
--- a/math/wxMaxima/files/patch-wxmaxima.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
---- wxmaxima.desktop.orig	2015-01-31 21:43:09 UTC
-+++ wxmaxima.desktop
-@@ -3,8 +3,8 @@ Name=wxMaxima
- Comment=Perform symbolic and numeric calculations using Maxima
- Comment[uk]=Виконання аналітичних перетворень та обчислень за допомогою Maxima
- Exec=wxmaxima %f
--Icon=wxmaxima.png
-+Icon=wxmaxima
- Terminal=false
- Type=Application
--Categories=Education;Science;Math;X-Red-Hat-Base;X-Red-Hat-Base-Only;
-+Categories=Education;
- MimeType=text/x-wxmaxima-batch;
diff --git a/math/wxMaxima/pkg-descr b/math/wxMaxima/pkg-descr
index 07d6801d4e3d..84949b5a5be0 100644
--- a/math/wxMaxima/pkg-descr
+++ b/math/wxMaxima/pkg-descr
@@ -5,4 +5,4 @@ dialogs. The input line has command history (up-key, down-key) and
 completion based on previous input (tab-key).
 wxMaxima provides 2d formated display of maxima output.
 
-WWW: http://wxmaxima.sourceforge.net/
+WWW: http://andrejv.github.io/wxmaxima/
diff --git a/math/wxMaxima/pkg-plist b/math/wxMaxima/pkg-plist
index 2c2dd8628107..bc4c403cc09b 100644
--- a/math/wxMaxima/pkg-plist
+++ b/math/wxMaxima/pkg-plist
@@ -1,11 +1,37 @@
 bin/wxmaxima
-%%DESKTOPDIR%%/wxmaxima.desktop
+man/man1/wxmaxima.1.gz
+share/appdata/wxmaxima.appdata.xml
+%%DESKTOPDIR%%/wxMaxima.desktop
+share/bash-completion/completions/wxmaxima
+%%DOCSDIR%%/Autocomplete1.jpg
+%%DOCSDIR%%/Autocomplete2.jpg
+%%DOCSDIR%%/BatchImage.jpg
+%%DOCSDIR%%/BatchImage.png
+%%DOCSDIR%%/InputCell.jpg
+%%DOCSDIR%%/NoiseFilter.jpg
+%%DOCSDIR%%/SidePanes.jpg
+%%DOCSDIR%%/ezUnits.jpg
+%%DOCSDIR%%/ezUnits.png
+%%DOCSDIR%%/maxima_screenshot.jpg
+%%DOCSDIR%%/sbclMemory.jpg
+%%DOCSDIR%%/sbclMemory.png
+%%DOCSDIR%%/wxMaximaLogo.jpg
+%%DOCSDIR%%/wxMaximaLogo.png
+%%DOCSDIR%%/wxMaximaWindow.jpg
+%%DOCSDIR%%/wxMaxima_configuration_001.jpg
+%%DOCSDIR%%/wxMaxima_configuration_001.png
+%%DOCSDIR%%/wxMaxima_configuration_002.jpg
+%%DOCSDIR%%/wxMaxima_configuration_002.png
+%%DOCSDIR%%/wxmaxima.hhp
+%%DOCSDIR%%/wxmaxima.html
 share/locale/ca/LC_MESSAGES/wxMaxima.mo
 share/locale/cs/LC_MESSAGES/wxMaxima.mo
 share/locale/da/LC_MESSAGES/wxMaxima.mo
 share/locale/de/LC_MESSAGES/wxMaxima.mo
 share/locale/el/LC_MESSAGES/wxMaxima.mo
+share/locale/en/LC_MESSAGES/wxMaxima.mo
 share/locale/es/LC_MESSAGES/wxMaxima.mo
+share/locale/fi/LC_MESSAGES/wxMaxima.mo
 share/locale/fr/LC_MESSAGES/wxMaxima.mo
 share/locale/gl/LC_MESSAGES/wxMaxima.mo
 share/locale/hu/LC_MESSAGES/wxMaxima.mo
@@ -19,13 +45,25 @@ share/locale/tr/LC_MESSAGES/wxMaxima.mo
 share/locale/uk/LC_MESSAGES/wxMaxima.mo
 share/locale/zh_CN/LC_MESSAGES/wxMaxima.mo
 share/locale/zh_TW/LC_MESSAGES/wxMaxima.mo
+share/mime/packages/x-wxmathml.xml
+share/mime/packages/x-wxmaxima-batch.xml
+share/pixmaps/text-x-wxmathml.svg
+share/pixmaps/text-x-wxmaxima-batch.svg
+share/pixmaps/wxmaxima-16.xpm
+share/pixmaps/wxmaxima-32.xpm
 share/pixmaps/wxmaxima.png
+share/pixmaps/wxmaxima.svg
 %%DATADIR%%/COPYING
+%%DATADIR%%/Document-export.png
 %%DATADIR%%/README
+%%DATADIR%%/README.md
 %%DATADIR%%/autocomplete.txt
+%%DATADIR%%/editing.png
 %%DATADIR%%/maxima.png
 %%DATADIR%%/options.png
 %%DATADIR%%/styles.png
+%%DATADIR%%/testbench_simple.wxmx
 %%DATADIR%%/tips.txt
 %%DATADIR%%/wxmathml.lisp
 %%DATADIR%%/wxmaxima.png
+%%DATADIR%%/wxmaxima.svg