7 files changed, 59 insertions, 24 deletions

diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index d2f743d77bbe..8ef987c80771 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wxMaxima
-PORTVERSION=	16.04.1
+PORTVERSION=	17.05.0
 PORTREVISION=	0
 CATEGORIES=	math
 
@@ -13,17 +13,12 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	maxima:math/maxima
 
-CONFIGURE_ARGS=	--program-prefix= --docdir=${DOCSDIR}
-
 GH_TUPLE=	andrejv:${PORTNAME:tl}:Version-${DISTVERSION}
-GNU_CONFIGURE=	yes
 
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
 
-INFO=		wxmaxima
-
 USE_GITHUB=	yes
-USES=		autoreconf desktop-file-utils gettext makeinfo shared-mime-info
+USES=		cmake desktop-file-utils gettext shared-mime-info
 USE_WX=		3.0
 
 WX_COMPS=	wx
diff --git a/math/wxMaxima/distinfo b/math/wxMaxima/distinfo
index e7e169c4a764..52758c1cbdd8 100644
--- a/math/wxMaxima/distinfo
+++ b/math/wxMaxima/distinfo
@@ -1,2 +1,3 @@
-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
+TIMESTAMP = 1500752205
+SHA256 (andrejv-wxmaxima-17.05.0-Version-17.05.0_GH0.tar.gz) = f89d34b9d8cd801a0e827af1ffbf5a15c811a7f731ad1f6f66a27611f2695eaf
+SIZE (andrejv-wxmaxima-17.05.0-Version-17.05.0_GH0.tar.gz) = 5888032
diff --git a/math/wxMaxima/files/patch-data_CMakeLists.txt b/math/wxMaxima/files/patch-data_CMakeLists.txt
new file mode 100644
index 000000000000..fa9e7dfd47a5
--- /dev/null
+++ b/math/wxMaxima/files/patch-data_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- data/CMakeLists.txt.orig	2017-07-22 20:21:47 UTC
++++ data/CMakeLists.txt
+@@ -26,7 +26,7 @@ else()
+     install(FILES ${DATAFILES}                                     DESTINATION share/wxMaxima)
+     install(FILES ${PIXMAPS}                                       DESTINATION share/pixmaps)
+     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima             DESTINATION share/bash-completion/completions)
+-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima.1           DESTINATION share/man/man1)
++    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima.1           DESTINATION man/man1)
+     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxMaxima.appdata.xml DESTINATION share/appdata)
+     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxMaxima.desktop     DESTINATION share/applications)
+     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/x-wxmathml.xml       DESTINATION share/mime/packages)
diff --git a/math/wxMaxima/files/patch-data_Makefile.am b/math/wxMaxima/files/patch-data_Makefile.am
deleted file mode 100644
index 173a8ac3d0de..000000000000
--- a/math/wxMaxima/files/patch-data_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-info_CMakeLists.txt b/math/wxMaxima/files/patch-info_CMakeLists.txt
new file mode 100644
index 000000000000..18fbbdd8cbf8
--- /dev/null
+++ b/math/wxMaxima/files/patch-info_CMakeLists.txt
@@ -0,0 +1,19 @@
+--- info/CMakeLists.txt.orig	2017-05-23 18:48:40 UTC
++++ info/CMakeLists.txt
+@@ -6,7 +6,7 @@ file(GLOB IMAGE_FILES *.jpg *.png)
+ if(WIN32)
+     install(FILES wxmaxima.html DESTINATION wxMaxima/help)
+ else()
+-    install(FILES wxmaxima.html DESTINATION share/doc/wxmaxima)
++    install(FILES wxmaxima.html DESTINATION share/doc/wxMaxima)
+ endif()
+ #else()
+ #    message(STATUS "Makeinfo found at ${MAKEINFO}")
+@@ -31,5 +31,5 @@ endif()
+ if(WIN32)
+     install(FILES ${IMAGE_FILES} DESTINATION wxMaxima/help)
+ else()
+-    install(FILES ${IMAGE_FILES} DESTINATION share/doc/wxmaxima)
++    install(FILES ${IMAGE_FILES} DESTINATION share/doc/wxMaxima)
+ endif()
+\ No newline at end of file
diff --git a/math/wxMaxima/files/patch-locales_CMakeLists.txt b/math/wxMaxima/files/patch-locales_CMakeLists.txt
new file mode 100644
index 000000000000..27adcfa67028
--- /dev/null
+++ b/math/wxMaxima/files/patch-locales_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- locales/CMakeLists.txt.orig	2017-07-22 20:15:52 UTC
++++ locales/CMakeLists.txt
+@@ -12,7 +12,7 @@ if(GETTEXT_FOUND)
+                     RENAME "wxMaxima.mo")
+ 	else()
+             install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo"
+-                    DESTINATION "share/wxMaxima/locale/${LANG}/"
++                    DESTINATION "share/locale/${LANG}/LC_MESSAGES/"
+                     RENAME "wxMaxima.mo")
+ 	endif()
+     endforeach()
diff --git a/math/wxMaxima/pkg-plist b/math/wxMaxima/pkg-plist
index bc4c403cc09b..29b27443c944 100644
--- a/math/wxMaxima/pkg-plist
+++ b/math/wxMaxima/pkg-plist
@@ -1,6 +1,6 @@
 bin/wxmaxima
 man/man1/wxmaxima.1.gz
-share/appdata/wxmaxima.appdata.xml
+share/appdata/wxMaxima.appdata.xml
 %%DESKTOPDIR%%/wxMaxima.desktop
 share/bash-completion/completions/wxmaxima
 %%DOCSDIR%%/Autocomplete1.jpg
@@ -8,12 +8,15 @@ share/bash-completion/completions/wxmaxima
 %%DOCSDIR%%/BatchImage.jpg
 %%DOCSDIR%%/BatchImage.png
 %%DOCSDIR%%/InputCell.jpg
+%%DOCSDIR%%/Matrix table example.png
+%%DOCSDIR%%/MatrixTableExample.png
 %%DOCSDIR%%/NoiseFilter.jpg
+%%DOCSDIR%%/Second table example.png
+%%DOCSDIR%%/SecondTableExample.png
 %%DOCSDIR%%/SidePanes.jpg
 %%DOCSDIR%%/ezUnits.jpg
 %%DOCSDIR%%/ezUnits.png
-%%DOCSDIR%%/maxima_screenshot.jpg
-%%DOCSDIR%%/sbclMemory.jpg
+%%DOCSDIR%%/maxima_screenshot.png
 %%DOCSDIR%%/sbclMemory.png
 %%DOCSDIR%%/wxMaximaLogo.jpg
 %%DOCSDIR%%/wxMaximaLogo.png
@@ -22,7 +25,6 @@ share/bash-completion/completions/wxmaxima
 %%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
@@ -37,6 +39,7 @@ share/locale/gl/LC_MESSAGES/wxMaxima.mo
 share/locale/hu/LC_MESSAGES/wxMaxima.mo
 share/locale/it/LC_MESSAGES/wxMaxima.mo
 share/locale/ja/LC_MESSAGES/wxMaxima.mo
+share/locale/kab/LC_MESSAGES/wxMaxima.mo
 share/locale/nb/LC_MESSAGES/wxMaxima.mo
 share/locale/pl/LC_MESSAGES/wxMaxima.mo
 share/locale/pt_BR/LC_MESSAGES/wxMaxima.mo
@@ -60,6 +63,12 @@ share/pixmaps/wxmaxima.svg
 %%DATADIR%%/autocomplete.txt
 %%DATADIR%%/editing.png
 %%DATADIR%%/maxima.png
+%%DATADIR%%/network-error.png
+%%DATADIR%%/network-idle.png
+%%DATADIR%%/network-offline.png
+%%DATADIR%%/network-receive.png
+%%DATADIR%%/network-transmit-receive.png
+%%DATADIR%%/network-transmit.png
 %%DATADIR%%/options.png
 %%DATADIR%%/styles.png
 %%DATADIR%%/testbench_simple.wxmx