Attachment #270774 for bug #295290




PORTNAME=	gspiceui
DISTVERSION=	1.2.87
PORTREVISION=	8
CATEGORIES=	cad
MASTER_SITES=	SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${DISTVERSION}
DISTNAME=	${PORTNAME}-v${DISTVERSION}


LICENSE=	GPLv3

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/man/man1/gspiceui.1.gz \
		share/pixmaps/gspiceui-48x48.xpm
PORTDOCS=	*
PORTEXAMPLES=	*



post-patch:
	@${REINPLACE_CMD} -e 's|/share/gspiceui|${DOCSDIR:S|^${PREFIX}||}|g' \
	    ${WRKSRC}/src/main/FrmHtmlVwr.cpp

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/bin/gspiceui ${STAGEDIR}${PREFIX}/bin

Lines 1-2 Link Here

(-)b/cad/gspiceui/distinfo (-2 / +3 lines)
1	SHA256 (gspiceui-v1.1.00.tar.gz) = 22cbe0a8800f9fade43235c74df2e3defb06f2d6e0ac57cff81d058ab89da564	1	TIMESTAMP = 1778888771
2	SIZE (gspiceui-v1.1.00.tar.gz) = 1048236	2	SHA256 (gspiceui-v1.2.87.tar.gz) = 1a9f06e0787d30d92dc35598bfb32249063d92af85df6db3ea9d3df4e6407e52
		3	SIZE (gspiceui-v1.2.87.tar.gz) = 1089733




--- src/Makefile.orig	2020-09-17 16:17:21 UTC
+++ src/Makefile
@@ -39,8 +39,7 @@ DESTDIR = /usr/local/bin
 #***************************************************************************************************
 
 # Which compiler and linker (eg. g++ or clang++)
-CXX = g++
-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)
 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 := -O3 -std=c++17 -pipe $(shell $(WXCFG) --cxxflags)
+  CXXFLAGS := $(CXXFLAGS) -std=c++17 $(shell $(WXCFG) --cxxflags)
 else
   # Options for development
-  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
 
 # I like to compile using the option "-Wall" etc., tests that break wxWidgets are turned off below
-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)




--- src/TypeDefs.hpp.orig	2020-08-18 15:57:04 UTC
+++ src/TypeDefs.hpp
@@ -75,7 +75,7 @@ typedef  wxStaticText   wxLabel;
 //**************************************************************************************************
 // 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;
 
 //**************************************************************************************************
 // Operating System specific macro declarations
 
-#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

Return to bug 295290

Lines 1-6 Link Here

(-)b/cad/gspiceui/Makefile (-8 / +6 lines)
1	PORTNAME= gspiceui	1	PORTNAME= gspiceui
2	DISTVERSION= 1.1.00	2	DISTVERSION= 1.2.87
3	PORTREVISION= 8
4	CATEGORIES= cad	3	CATEGORIES= cad
5	MASTER_SITES= SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${DISTVERSION}	4	MASTER_SITES= SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${DISTVERSION}
6	DISTNAME= ${PORTNAME}-v${DISTVERSION}	5	DISTNAME= ${PORTNAME}-v${DISTVERSION}
Lines 11-27 WWW= https://sourceforge.net/projects/gspiceui/ Link Here
11		10
12	LICENSE= GPLv3	11	LICENSE= GPLv3
13		12
14	USES= compiler:c++11-lib gmake pkgconfig	13	USES= compiler:c++17-lang gmake pkgconfig
15	USE_WX= 3.0	14	USE_WX= 3.0
16		15
17	CXXFLAGS+= -std=c++11
18
19	DESKTOP_ENTRIES= "GSpiceUI" "Circuit Simulator GUI" \	16	DESKTOP_ENTRIES= "GSpiceUI" "Circuit Simulator GUI" \
20	"${PREFIX}/share/pixmaps/gspiceui-48x48.xpm" \	17	"${PREFIX}/share/pixmaps/gspiceui-48x48.xpm" \
21	"gspiceui" "Science;Electronics;" false	18	"gspiceui" "Science;Electronics;" false
22		19
23	PLIST_FILES= bin/gspiceui share/pixmaps/gspiceui-48x48.xpm \	20	PLIST_FILES= bin/gspiceui \
24	share/man/man1/gspiceui.1.gz	21	share/man/man1/gspiceui.1.gz \
		22	share/pixmaps/gspiceui-48x48.xpm
25	PORTDOCS= *	23	PORTDOCS= *
26	PORTEXAMPLES= *	24	PORTEXAMPLES= *
27		25
Lines 35-41 CFLAGS:= ${CFLAGS:C/-O[2-9]/-O1/g} Link Here
35		33
36	post-patch:	34	post-patch:
37	@${REINPLACE_CMD} -e 's\|/share/gspiceui\|${DOCSDIR:S\|^${PREFIX}\|\|}\|g' \	35	@${REINPLACE_CMD} -e 's\|/share/gspiceui\|${DOCSDIR:S\|^${PREFIX}\|\|}\|g' \
38	${WRKSRC}/src/main/HelpTasks.cpp	36	${WRKSRC}/src/main/FrmHtmlVwr.cpp
39		37
40	do-install:	38	do-install:
41	${INSTALL_PROGRAM} ${WRKSRC}/bin/gspiceui ${STAGEDIR}${PREFIX}/bin	39	${INSTALL_PROGRAM} ${WRKSRC}/bin/gspiceui ${STAGEDIR}${PREFIX}/bin

Lines 1-35 Link Here

(-)b/cad/gspiceui/files/patch-src_Makefile (-25 / +24 lines)
1	--- src/Makefile.orig 2015-03-29 12:25:24 UTC	1	--- src/Makefile.orig 2020-09-17 16:17:21 UTC
2	+++ src/Makefile	2	+++ src/Makefile
3	@@ -38,13 +38,12 @@ DESTDIR = /usr/local/bin	3	@@ -39,8 +39,7 @@ DESTDIR = /usr/local/bin
4	#***************************************************************************************************	4	#***************************************************************************************************
5		5
6	# Which compiler	6	# Which compiler and linker (eg. g++ or clang++)
7	-CXX = g++	7	-CXX = g++
8		8	-LD = g++
9	# Application name	9	+LD = $(CXX)
10	PROG = gspiceui	10	ifneq ($(GSPICEUI_MSWIN),0)
11		11	LD += -static-libstdc++ -static-libgcc
12	# wxWidgets configuration utility	12	WINDRES = windres
13	-WXCFG = wx-config --unicode --version=$(GSPICEUI_WXLIB)	13	@@ -62,7 +61,7 @@ endif
		14	WXCFG = /usr/bin/wx-config
		15	# WXCFG = /usr/local/bin/wx-config
		16	endif
		17	-WXCFG += --unicode --version=$(GSPICEUI_WXLIB)
14	+WXCFG = $(WX_CONFIG)	18	+WXCFG = $(WX_CONFIG)
15		19	ifneq ($(GSPICEUI_MSWIN),0)
16	# Dependency file	20	WXCFG += --static
17	DEPS = Makefile.deps	21	endif
18	@@ -71,7 +70,7 @@ BINDIR = $(ROOT)/bin	22	@@ -93,10 +92,10 @@ ifeq ($(GSPICEUI_DEBUG),0)
19	# -Og Optimize debugging experience but don't break debugging	23	# -std=[C++NO] The C++ standard to use where C++NO is eg. c++98, c++03, c++11, c++14, c++17, etc.
20	ifeq ($(GSPICEUI_DBG),0)	24	ifeq ($(GSPICEUI_DEBUG),0)
21	# Options for release (not using -Wall since it's GCC specific)	25	# Options for release (not using -Wall since it's GCC specific)
22	- CXXFLAGS := -O1 -pipe $(shell $(WXCFG) --cxxflags)	26	- CXXFLAGS := -O3 -std=c++17 -pipe $(shell $(WXCFG) --cxxflags)
23	+ CXXFLAGS += $(shell $(WXCFG) --cxxflags)	27	+ CXXFLAGS := $(CXXFLAGS) -std=c++17 $(shell $(WXCFG) --cxxflags)
24	else	28	else
25	# Options for development	29	# Options for development
26	CXXFLAGS := -g -Og -Wall -Wextra -pipe $(shell $(WXCFG) --cxxflags)	30	- CXXFLAGS := -g -Og -std=c++17 -Wall -Wextra -Wpedantic -pipe $(shell $(WXCFG) --cxxflags)
27	@@ -83,7 +82,7 @@ ifeq ($(GSPICEUI_WXLIB),2.8)	31	+ CXXFLAGS := $(CXXFLAGS) -g -Og -std=c++17 -Wall -Wextra -Wpedantic -pipe $(shell $(WXCFG) --cxxflags)
28	endif	32	endif
29		33
30	# Includes	34	# I like to compile using the option "-Wall" etc., tests that break wxWidgets are turned off below
31	-INCLUDES = -I/usr/include -I/usr/X11R6/include -I.
32	+INCLUDES = -I.
33
34	# Libraries
35	# (The pkg-config stuff was requested by a user, somehow pangox was missing)

Lines 1-25 Link Here

(-)b/cad/gspiceui/files/patch-src_TypeDefs.hpp (-18 / +4 lines)
1	--- src/TypeDefs.hpp.orig 2015-04-06 10:28:07 UTC	1	--- src/TypeDefs.hpp.orig 2020-08-18 15:57:04 UTC
2	+++ src/TypeDefs.hpp	2	+++ src/TypeDefs.hpp
3	@@ -57,16 +57,18 @@ extern bool g_bDebug; // Declared in	3	@@ -75,7 +75,7 @@ typedef wxStaticText wxLabel;
4	//**************************************************************************************************
5	// Type definitions
6
7	-//typedef unsigned long ulong;
8	-//typedef unsigned int uint;
9	-//typedef unsigned char uchar;
10	+#ifdef __BSD__
11	+typedef unsigned long ulong;
12	+typedef unsigned int uint;
13	+typedef unsigned char uchar;
14	+#endif
15
16	typedef wxStaticText wxLabel;
17
18	//**************************************************************************************************	4	//**************************************************************************************************
19	// Operating System specific macro declarations	5	// Operating System specific macro declarations
20		6
21	-#ifdef __WXOSX__	7	-#if defined( __WXMSW__ ) \|\| defined( __WXOSX__ )
22	+#if defined(__WXOSX__) \|\| defined(__BSD__)	8	+#if defined( __WXMSW__ ) \|\| defined( __WXOSX__ ) \|\| defined(__BSD__)
23	#define EXP10(X) pow(10.0,X)	9	#define EXP10(X) pow(10.0,X)
24	#define EXP10F(X) powf(10.0,X)	10	#define EXP10F(X) powf(10.0,X)
25	#else	11	#else