cad/gspiceui: Update 1.1.0 => 1.2.87

Release Notes:
https://sourceforge.net/projects/gspiceui/files/gSpiceUI/gspiceui-v1.2.36/release-notes-v1.2.36.txt
https://sourceforge.net/projects/gspiceui/files/gSpiceUI/gspiceui-v1.2.87/release-notes-v1.2.87.txt

PR:		295290
Approved by:	Kevin Zheng <kevinz5000@gmail.com> (maintainer)
Sponsored by:	UNIS Labs

4 files changed, 37 insertions, 53 deletions

diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index 1edf5194b532..b990920d9f21 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gspiceui
-DISTVERSION=	1.1.00
-PORTREVISION=	8
+DISTVERSION=	1.2.87
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${DISTVERSION}
 DISTNAME=	${PORTNAME}-v${DISTVERSION}
@@ -11,17 +10,16 @@ WWW=		https://sourceforge.net/projects/gspiceui/
 
 LICENSE=	GPLv3
 
-USES=		compiler:c++11-lib gmake pkgconfig
+USES=		compiler:c++17-lang gmake pkgconfig
 USE_WX=		3.0
 
-CXXFLAGS+=	-std=c++11
-
 DESKTOP_ENTRIES=	"GSpiceUI" "Circuit Simulator GUI" \
 			"${PREFIX}/share/pixmaps/gspiceui-48x48.xpm" \
 			"gspiceui" "Science;Electronics;" false
 
-PLIST_FILES=	bin/gspiceui share/pixmaps/gspiceui-48x48.xpm \
-		share/man/man1/gspiceui.1.gz
+PLIST_FILES=	bin/gspiceui \
+		share/man/man1/gspiceui.1.gz \
+		share/pixmaps/gspiceui-48x48.xpm
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
@@ -35,7 +33,7 @@ CFLAGS:=	${CFLAGS:C/-O[2-9]/-O1/g}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/share/gspiceui|${DOCSDIR:S|^${PREFIX}||}|g' \
-	    ${WRKSRC}/src/main/HelpTasks.cpp
+	    ${WRKSRC}/src/main/FrmHtmlVwr.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/gspiceui ${STAGEDIR}${PREFIX}/bin
diff --git a/cad/gspiceui/distinfo b/cad/gspiceui/distinfo
index c1323db32ee5..17d5832477cb 100644
--- a/cad/gspiceui/distinfo
+++ b/cad/gspiceui/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gspiceui-v1.1.00.tar.gz) = 22cbe0a8800f9fade43235c74df2e3defb06f2d6e0ac57cff81d058ab89da564
-SIZE (gspiceui-v1.1.00.tar.gz) = 1048236
+TIMESTAMP = 1778888771
+SHA256 (gspiceui-v1.2.87.tar.gz) = 1a9f06e0787d30d92dc35598bfb32249063d92af85df6db3ea9d3df4e6407e52
+SIZE (gspiceui-v1.2.87.tar.gz) = 1089733
diff --git a/cad/gspiceui/files/patch-src_Makefile b/cad/gspiceui/files/patch-src_Makefile
index 1dd97ea94cdc..12987fb9c8e4 100644
--- a/cad/gspiceui/files/patch-src_Makefile
+++ b/cad/gspiceui/files/patch-src_Makefile
@@ -1,35 +1,34 @@
---- src/Makefile.orig	2015-03-29 12:25:24 UTC
+--- src/Makefile.orig	2020-09-17 16:17:21 UTC
 +++ src/Makefile
-@@ -38,13 +38,12 @@ DESTDIR = /usr/local/bin
+@@ -39,8 +39,7 @@ DESTDIR = /usr/local/bin
  #***************************************************************************************************
  
- # Which compiler
+ # Which compiler and linker (eg. g++ or clang++)
 -CXX = g++
- 
- # Application name
- PROG = gspiceui
- 
- # wxWidgets configuration utility
--WXCFG = wx-config --unicode --version=$(GSPICEUI_WXLIB)
+-LD  = g++
++LD = $(CXX)
+ ifneq ($(GSPICEUI_MSWIN),0)
+   LD += -static-libstdc++ -static-libgcc
+   WINDRES = windres
+@@ -62,7 +61,7 @@ endif
+   WXCFG  = /usr/bin/wx-config
+ #  WXCFG  = /usr/local/bin/wx-config
+ endif
+-WXCFG += --unicode --version=$(GSPICEUI_WXLIB)
 +WXCFG = $(WX_CONFIG)
- 
- # Dependency file
- DEPS = Makefile.deps
-@@ -71,7 +70,7 @@ BINDIR     = $(ROOT)/bin
- #  -Og        Optimize debugging experience but don't break debugging
- ifeq ($(GSPICEUI_DBG),0)
+ ifneq ($(GSPICEUI_MSWIN),0)
+   WXCFG += --static
+ endif
+@@ -93,10 +92,10 @@ ifeq ($(GSPICEUI_DEBUG),0)
+ #  -std=[C++NO]  The C++ standard to use where C++NO is eg. c++98, c++03, c++11, c++14, c++17, etc.
+ ifeq ($(GSPICEUI_DEBUG),0)
    # Options for release (not using -Wall since it's GCC specific)
--  CXXFLAGS := -O1 -pipe $(shell $(WXCFG) --cxxflags)
-+  CXXFLAGS += $(shell $(WXCFG) --cxxflags)
+-  CXXFLAGS := -O3 -std=c++17 -pipe $(shell $(WXCFG) --cxxflags)
++  CXXFLAGS := $(CXXFLAGS) -std=c++17 $(shell $(WXCFG) --cxxflags)
  else
    # Options for development
-   CXXFLAGS := -g -Og -Wall -Wextra -pipe $(shell $(WXCFG) --cxxflags)
-@@ -83,7 +82,7 @@ ifeq ($(GSPICEUI_WXLIB),2.8)
+-  CXXFLAGS := -g -Og -std=c++17 -Wall -Wextra -Wpedantic -pipe $(shell $(WXCFG) --cxxflags)
++  CXXFLAGS := $(CXXFLAGS) -g -Og -std=c++17 -Wall -Wextra -Wpedantic -pipe $(shell $(WXCFG) --cxxflags)
  endif
  
- # Includes
--INCLUDES = -I/usr/include -I/usr/X11R6/include -I.
-+INCLUDES = -I.
- 
- # Libraries
- # (The pkg-config stuff was requested by a user, somehow pangox was missing)
+ # I like to compile using the option "-Wall" etc., tests that break wxWidgets are turned off below
diff --git a/cad/gspiceui/files/patch-src_TypeDefs.hpp b/cad/gspiceui/files/patch-src_TypeDefs.hpp
index b71877da8461..ad20e41a03a5 100644
--- a/cad/gspiceui/files/patch-src_TypeDefs.hpp
+++ b/cad/gspiceui/files/patch-src_TypeDefs.hpp
@@ -1,25 +1,11 @@
---- src/TypeDefs.hpp.orig	2015-04-06 10:28:07 UTC
+--- src/TypeDefs.hpp.orig	2020-08-18 15:57:04 UTC
 +++ src/TypeDefs.hpp
-@@ -57,16 +57,18 @@ extern  bool  g_bDebug;  // Declared in 
- //**************************************************************************************************
- // Type definitions
- 
--//typedef  unsigned long  ulong;
--//typedef  unsigned int   uint;
--//typedef  unsigned char  uchar;
-+#ifdef __BSD__
-+typedef  unsigned long  ulong;
-+typedef  unsigned int   uint;
-+typedef  unsigned char  uchar;
-+#endif
- 
- typedef  wxStaticText   wxLabel;
- 
+@@ -75,7 +75,7 @@ typedef  wxStaticText   wxLabel;
  //**************************************************************************************************
  // Operating System specific macro declarations
  
--#ifdef __WXOSX__
-+#if defined(__WXOSX__) || defined(__BSD__)
+-#if defined( __WXMSW__ ) || defined( __WXOSX__ )
++#if defined( __WXMSW__ ) || defined( __WXOSX__ ) || defined(__BSD__)
    #define  EXP10(X)   pow(10.0,X)
    #define  EXP10F(X)  powf(10.0,X)
  #else