Attachment #161453 for bug #202232




# $FreeBSD$

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

MAINTAINER=	kevinz5000@gmail.com
COMMENT=	GUI for ngspice and gnucap circuit simulators

LICENSE=	GPLv3

RUN_DEPENDS=	# none if no options are set

OPTIONS_DEFINE=	DOCS EXAMPLES
OPTIONS_GROUP=	BACKEND

OPTIONS_GROUP_BACKEND=	GNUCAP NGSPICE

GNUCAP_DESC=	Depend on gnucap as a simulation backend
NGSPICE_DESC=	Depend on ngspice as a simulation backend

USE_WX=		2.8 3.0

USE_WX=		2.8+
WX_UNICODE=	yes
USES=		compiler:c++11-lib gmake pkgconfig

CXXFLAGS+=	-std=c++11

DESKTOP_ENTRIES=	"GSpiceUI" "Circuit Simulator GUI" \
			"${PREFIX}/share/pixmaps/gspiceui-48x48.xpm" \

PLIST_FILES=	bin/gspiceui share/pixmaps/gspiceui-48x48.xpm \
		man/man1/gspiceui.1.gz

GNUCAP_RUN_DEPENDS=	gnucap:${PORTSDIR}/cad/gnucap
NGSPICE_RUN_DEPENDS=	ngspice:${PORTSDIR}/cad/ngspice_rework

post-patch:
	@${REINPLACE_CMD} -e 's|share/gspiceui|${DOCSDIR}|g' \
	    ${WRKSRC}/src/main/HelpTasks.cpp
		 s|^INCLUDES |#INCLUDES |g ; \
		 s|$$(WXCFG)|$$(WX_CONFIG)|g ; \
		 s|$$(CC)|$$(CXX)|g' ${WRKSRC}/src/Makefile
	@${REINPLACE_CMD} -e \
		's|share/gspiceui|${DOCSDIR}|g' \
		${WRKSRC}/src/main/HelpTasks.cpp

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

Lines 1-2 Link Here

(-)b/cad/gspiceui/distinfo (-2 / +2 lines)
1	SHA256 (gspiceui-v1.0.00.tar.gz) = ff8d38b9bb10bf695c00a0660dcbd14a43072e93851c5100a85133919736d5da	1	SHA256 (gspiceui-v1.1.00.tar.gz) = 22cbe0a8800f9fade43235c74df2e3defb06f2d6e0ac57cff81d058ab89da564
2	SIZE (gspiceui-v1.0.00.tar.gz) = 612517	2	SIZE (gspiceui-v1.1.00.tar.gz) = 1048236




--- src/Makefile.orig	2015-03-29 12:25:24 UTC
+++ src/Makefile
@@ -38,13 +38,12 @@ DESTDIR = /usr/local/bin
 #***************************************************************************************************
 
 # Which compiler
-CXX = g++
 
 # Application name
 PROG = gspiceui
 
 # wxWidgets configuration utility
-WXCFG = wx-config --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)
   # Options for release (not using -Wall since it's GCC specific)
-  CXXFLAGS := -O1 -pipe $(shell $(WXCFG) --cxxflags)
+  CXXFLAGS += $(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)
 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)




--- src/TypeDefs.hpp.orig	2015-04-06 10:28:07 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;
 
 //**************************************************************************************************
 // Operating System specific macro declarations
 
-#ifdef __WXOSX__
+#if defined(__WXOSX__) || defined(__BSD__)
   #define  EXP10(X)   pow(10.0,X)
   #define  EXP10F(X)  powf(10.0,X)
 #else

Lines 1-6 Link Here

(-)b/cad/gspiceui/pkg-descr (-5 / +5 lines)
1	GSpiceUI (GNU Spice GUI) is intended to provide a graphical frontend to freely	1	gSpiceUI is intended to provide a GUI for freely available electronic
2	available circuit simulators, including gnucap and ngspice. It can use	2	circuit simulation engines ie. NG-Spice and GNU-Cap. The utility gnetlist is
3	gnetlist to import schematics or net list files and gwave to display	3	used to convert schematic files to netlist files, Gwave or Gaw to display
4	simulation results.	4	simulation results and gschem is the preferred schematic capture tool.
5		5
6	WWW: http://sourceforge.net/projects/gspiceui/	6	WWW: http://users.tpg.com.au/micksw012/gspiceui.html

Return to bug 202232

Lines 2-33 Link Here

(-)b/cad/gspiceui/Makefile (-27 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gspiceui	4	PORTNAME= gspiceui
5	PORTVERSION= 1.0.00	5	PORTVERSION= 1.1.00
6	PORTREVISION= 8
7	CATEGORIES= cad	6	CATEGORIES= cad
8	MASTER_SITES= SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${PORTVERSION}
9	DISTNAME= ${PORTNAME}-v${PORTVERSION}	8	DISTNAME= ${PORTNAME}-v${PORTVERSION}
10		9
11	MAINTAINER= kevinz5000@gmail.com	10	MAINTAINER= kevinz5000@gmail.com
12	COMMENT= GUI frontend to gnucap and ngspice circuit simulators	11	COMMENT= GUI for ngspice and gnucap circuit simulators
13		12
14	LICENSE= GPLv2	13	LICENSE= GPLv3
15
16	RUN_DEPENDS= # none if no options are set
17		14
18	OPTIONS_DEFINE= DOCS EXAMPLES	15	OPTIONS_DEFINE= DOCS EXAMPLES
19	OPTIONS_GROUP= BACKEND
20
21	OPTIONS_GROUP_BACKEND= GNUCAP NGSPICE
22
23	GNUCAP_DESC= Depend on gnucap as a simulation backend
24	NGSPICE_DESC= Depend on ngspice as a simulation backend
25		16
26	OPTIONS_DEFAULT= NGSPICE	17	USE_WX= 2.8 3.0
27
28	USE_WX= 2.8+
29	WX_UNICODE= yes	18	WX_UNICODE= yes
30	USES= gmake compiler:c++11-lib	19	USES= compiler:c++11-lib gmake pkgconfig
		20
		21	CXXFLAGS+= -std=c++11
31		22
32	DESKTOP_ENTRIES= "GSpiceUI" "Circuit Simulator GUI" \	23	DESKTOP_ENTRIES= "GSpiceUI" "Circuit Simulator GUI" \
33	"${PREFIX}/share/pixmaps/gspiceui-48x48.xpm" \	24	"${PREFIX}/share/pixmaps/gspiceui-48x48.xpm" \
Lines 38-55 PORTEXAMPLES= * Link Here
38	PLIST_FILES= bin/gspiceui share/pixmaps/gspiceui-48x48.xpm \	29	PLIST_FILES= bin/gspiceui share/pixmaps/gspiceui-48x48.xpm \
39	man/man1/gspiceui.1.gz	30	man/man1/gspiceui.1.gz
40		31
41	GNUCAP_RUN_DEPENDS= gnucap:${PORTSDIR}/cad/gnucap
42	NGSPICE_RUN_DEPENDS= ngspice:${PORTSDIR}/cad/ngspice_rework
43
44	post-patch:	32	post-patch:
45	@${REINPLACE_CMD} -e \	33	@${REINPLACE_CMD} -e 's\|share/gspiceui\|${DOCSDIR}\|g' \
46	's\|:= -Ofast -pipe\|+= -I.\|g ; \	34	${WRKSRC}/src/main/HelpTasks.cpp
47	s\|^INCLUDES \|#INCLUDES \|g ; \
48	s\|$$(WXCFG)\|$$(WX_CONFIG)\|g ; \
49	s\|$$(CC)\|$$(CXX)\|g' ${WRKSRC}/src/Makefile
50	@${REINPLACE_CMD} -e \
51	's\|share/gspiceui\|${DOCSDIR}\|g' \
52	${WRKSRC}/src/main/HelpTasks.cpp
53		35
54	do-install:	36	do-install:
55	${INSTALL_PROGRAM} ${WRKSRC}/bin/gspiceui ${STAGEDIR}${PREFIX}/bin	37	${INSTALL_PROGRAM} ${WRKSRC}/bin/gspiceui ${STAGEDIR}${PREFIX}/bin

Added Link Here

(-)b/cad/gspiceui/files/patch-src_Makefile (+35 lines)
1	--- src/Makefile.orig 2015-03-29 12:25:24 UTC
2	+++ src/Makefile
3	@@ -38,13 +38,12 @@ DESTDIR = /usr/local/bin
4	#***************************************************************************************************
5
6	# Which compiler
7	-CXX = g++
8
9	# Application name
10	PROG = gspiceui
11
12	# wxWidgets configuration utility
13	-WXCFG = wx-config --unicode --version=$(GSPICEUI_WXLIB)
14	+WXCFG = $(WX_CONFIG)
15
16	# Dependency file
17	DEPS = Makefile.deps
18	@@ -71,7 +70,7 @@ BINDIR = $(ROOT)/bin
19	# -Og Optimize debugging experience but don't break debugging
20	ifeq ($(GSPICEUI_DBG),0)
21	# Options for release (not using -Wall since it's GCC specific)
22	- CXXFLAGS := -O1 -pipe $(shell $(WXCFG) --cxxflags)
23	+ CXXFLAGS += $(shell $(WXCFG) --cxxflags)
24	else
25	# Options for development
26	CXXFLAGS := -g -Og -Wall -Wextra -pipe $(shell $(WXCFG) --cxxflags)
27	@@ -83,7 +82,7 @@ ifeq ($(GSPICEUI_WXLIB),2.8)
28	endif
29
30	# Includes
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)

Added Link Here

(-)b/cad/gspiceui/files/patch-src_TypeDefs.hpp (+25 lines)
1	--- src/TypeDefs.hpp.orig 2015-04-06 10:28:07 UTC
2	+++ src/TypeDefs.hpp
3	@@ -57,16 +57,18 @@ extern bool g_bDebug; // Declared in
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	//**************************************************************************************************
19	// Operating System specific macro declarations
20
21	-#ifdef __WXOSX__
22	+#if defined(__WXOSX__) \|\| defined(__BSD__)
23	#define EXP10(X) pow(10.0,X)
24	#define EXP10F(X) powf(10.0,X)
25	#else