- Update to 0.9.33

- Switch to wxgtk 2.8.

4 files changed, 31 insertions, 18 deletions

diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index 2da529df9602..ef018f35d2dd 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gspiceui
-PORTVERSION=	0.8.90
-PORTREVISION=	1
+PORTVERSION=	0.9.33
+PORTREVISION=	0
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	GUI frontend for gnucap/ng-spice circuit simulators
 
 RUN_DEPENDS=	gwave:${PORTSDIR}/cad/gwave
 
-USE_WX=		2.6
+USE_WX=		2.6+
 WX_UNICODE=	yes
 USE_GMAKE=	yes
 
diff --git a/cad/gspiceui/distinfo b/cad/gspiceui/distinfo
index 68d58b4e4f5c..7bd29e8f7d49 100644
--- a/cad/gspiceui/distinfo
+++ b/cad/gspiceui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gspiceui-v0.8.90.tar.gz) = 6e0de5b02a5b4707d197bd8648b2d8df
-SHA256 (gspiceui-v0.8.90.tar.gz) = 9618ba20a80baf054b5e0c25a75a6a5a6b54078e6e40ce196d0101a78b16d4d5
-SIZE (gspiceui-v0.8.90.tar.gz) = 438270
+MD5 (gspiceui-v0.9.33.tar.gz) = 806cb0d2ff7f9256ab85541c9d788f34
+SHA256 (gspiceui-v0.9.33.tar.gz) = ddb62962f9889ba98efc2e0f561b84a28171627940a1ddaeb7bcf561626068af
+SIZE (gspiceui-v0.9.33.tar.gz) = 445826
diff --git a/cad/gspiceui/files/patch-src_Makefile b/cad/gspiceui/files/patch-src_Makefile
index 4d80dd673f84..0b714a426b8c 100644
--- a/cad/gspiceui/files/patch-src_Makefile
+++ b/cad/gspiceui/files/patch-src_Makefile
@@ -1,24 +1,35 @@
---- src/Makefile.orig	Tue Oct 17 12:17:20 2006
-+++ src/Makefile	Wed Nov 15 19:14:19 2006
-@@ -23,7 +23,7 @@
+--- src/Makefile.orig	2007-06-01 03:43:24.000000000 +0400
++++ src/Makefile	2007-09-15 16:03:27.000000000 +0400
+@@ -38,7 +38,7 @@
  PROG = gspiceui
  
  # wxWidgets configuration utility
 -WXCFG = wx-config
-+WXCFG = %%WX_CONFIG%%
++WXCFG = /usr/local/bin/wxgtk2u-2.8-config
  
- # Directories
- #ROOT := $(shell cd .. ; pwd)
-@@ -45,10 +45,10 @@
- endif
+ # Dependency file
+ DEPS = Makefile.deps
+@@ -51,20 +51,13 @@
+ BINDIR     = $(ROOT)/bin
+ INSTALLDIR = /usr/local/bin
+ 
+-# Compiler options
+-ifeq ($(GSPICEUI_DBG),0)
+-  # Options for release (Not using -Wall since it's GCC specific)
+-  CXXFLAGS = -O -pipe -c $(shell $(WXCFG) --cxxflags)
+-else
+-  # Options for development
+-  CXXFLAGS = -Wall -g -pipe -c $(shell $(WXCFG) --cxxflags)
+-endif
++CXXFLAGS += -c $(shell $(WXCFG) --cxxflags)
  
  # Includes
--INCLUDES =-I/usr/include -I/usr/X11R6/include -I.
-+INCLUDES =-I/usr/include -I${X11BASE}/include -I. $(shell %%WX_CONFIG%% --cxxflags)
+-INCLUDES = -I/usr/include -I/usr/X11R6/include -I.
++INCLUDES = -I/usr/include -I${X11BASE}/include -I. $(shell /usr/local/bin/wxgtk2u-2.8-config --cxxflags)
  
  # Libraries
--LIB := $(shell wx-config --libs) $(shell pkg-config --libs pangox)
-+LIB := $(shell %%WX_CONFIG%% --libs) $(shell pkg-config --libs pangox)
+-LIBS := $(shell wx-config --libs) $(shell pkg-config --libs pangox)
++LIBS := $(shell /usr/local/bin/wxgtk2u-2.8-config --libs) $(shell pkg-config --libs pangox)
  
  # Sources & headers
  SRCS = *.cpp
diff --git a/cad/gspiceui/pkg-plist b/cad/gspiceui/pkg-plist
index 3383b9eb8d81..3d756affdae1 100644
--- a/cad/gspiceui/pkg-plist
+++ b/cad/gspiceui/pkg-plist
@@ -15,8 +15,10 @@ bin/gspiceui
 %%MODELS%%%%DATADIR%%/lib/pnp/tip42.mod
 %%MODELS%%%%DATADIR%%/lib/reg/lm317.mod
 %%MODELS%%%%DATADIR%%/sch/amp-tce-1.sch
+%%MODELS%%%%DATADIR%%/sch/anemtr-intfc.sch
 %%MODELS%%%%DATADIR%%/sch/astable-npn.sch
 %%MODELS%%%%DATADIR%%/sch/astable-pnp.sch
+%%MODELS%%%%DATADIR%%/sch/filter-bp-1.sch
 %%MODELS%%%%DATADIR%%/sch/filter-lp-1.sch
 %%MODELS%%%%DATADIR%%/sch/filter-lp-2.sch
 %%MODELS%%%%DATADIR%%/sch/gyrator.sch