4 files changed, 23 insertions, 17 deletions

diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index ef018f35d2dd..34f794bbb658 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gspiceui
-PORTVERSION=	0.9.33
+PORTVERSION=	0.9.65
 PORTREVISION=	0
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/cad/gspiceui/distinfo b/cad/gspiceui/distinfo
index 7bd29e8f7d49..5b7b88517063 100644
--- a/cad/gspiceui/distinfo
+++ b/cad/gspiceui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gspiceui-v0.9.33.tar.gz) = 806cb0d2ff7f9256ab85541c9d788f34
-SHA256 (gspiceui-v0.9.33.tar.gz) = ddb62962f9889ba98efc2e0f561b84a28171627940a1ddaeb7bcf561626068af
-SIZE (gspiceui-v0.9.33.tar.gz) = 445826
+MD5 (gspiceui-v0.9.65.tar.gz) = 7243c51a7ad1d4138bc28db9695d18c2
+SHA256 (gspiceui-v0.9.65.tar.gz) = d914c7b4fa07c64e69a23920e48976a6d449d84478d8a788ad15483fe35da5ad
+SIZE (gspiceui-v0.9.65.tar.gz) = 461168
diff --git a/cad/gspiceui/files/patch-src_Makefile b/cad/gspiceui/files/patch-src_Makefile
index 0b714a426b8c..1b813dcf4c02 100644
--- a/cad/gspiceui/files/patch-src_Makefile
+++ b/cad/gspiceui/files/patch-src_Makefile
@@ -1,25 +1,25 @@
---- 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
- 
+--- src/Makefile.orig	2008-02-22 02:02:01.000000000 +0300
++++ src/Makefile	2008-04-13 23:31:07.000000000 +0400
+@@ -43,7 +43,7 @@
  # wxWidgets configuration utility
--WXCFG = wx-config
+ # (Arguments can be passed to wx-config to specify the version of wxWidgets to
+ # use, whether unicode is required, etc.)
+-WXCFG = wx-config --unicode --version=$(GSPICEUI_WXLIB)
 +WXCFG = /usr/local/bin/wxgtk2u-2.8-config
  
  # Dependency file
  DEPS = Makefile.deps
-@@ -51,20 +51,13 @@
+@@ -56,21 +56,14 @@
  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)
+-  CXXFLAGS = -O -pipe $(shell $(WXCFG) --cxxflags)
 -else
 -  # Options for development
--  CXXFLAGS = -Wall -g -pipe -c $(shell $(WXCFG) --cxxflags)
+-  CXXFLAGS = -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
 -endif
 +CXXFLAGS += -c $(shell $(WXCFG) --cxxflags)
  
@@ -28,8 +28,9 @@
 +INCLUDES = -I/usr/include -I${X11BASE}/include -I. $(shell /usr/local/bin/wxgtk2u-2.8-config --cxxflags)
  
  # Libraries
--LIBS := $(shell wx-config --libs) $(shell pkg-config --libs pangox)
+ # (The pkg-config stuff was requested by a user, somehow pangox was missing)
+-LIBS := $(shell $(WXCFG) --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
+ # Objects
+ OBJS := $(wildcard *.cpp) $(wildcard */*.cpp) $(wildcard */*/*.cpp)
diff --git a/cad/gspiceui/pkg-plist b/cad/gspiceui/pkg-plist
index 3d756affdae1..14404c512312 100644
--- a/cad/gspiceui/pkg-plist
+++ b/cad/gspiceui/pkg-plist
@@ -1,12 +1,15 @@
 bin/gspiceui
+%%MODELS%%%%DATADIR%%/lib/audio/spkr-25w-g12m.mod
 %%MODELS%%%%DATADIR%%/lib/diode/1n914.mod
 %%MODELS%%%%DATADIR%%/lib/diode/led.mod
 %%MODELS%%%%DATADIR%%/lib/npn/bc548.mod
 %%MODELS%%%%DATADIR%%/lib/npn/bc550.mod
 %%MODELS%%%%DATADIR%%/lib/npn/tip41.mod
+%%MODELS%%%%DATADIR%%/lib/opamp/lf411.mod
 %%MODELS%%%%DATADIR%%/lib/opamp/lm324.mod
 %%MODELS%%%%DATADIR%%/lib/opamp/lm358.mod
 %%MODELS%%%%DATADIR%%/lib/opamp/lm741.mod
+%%MODELS%%%%DATADIR%%/lib/opamp/lm747.mod
 %%MODELS%%%%DATADIR%%/lib/opamp/lmx358.mod
 %%MODELS%%%%DATADIR%%/lib/opamp/tl071.mod
 %%MODELS%%%%DATADIR%%/lib/opamp/ua741.mod
@@ -14,8 +17,8 @@ bin/gspiceui
 %%MODELS%%%%DATADIR%%/lib/pnp/bc558.mod
 %%MODELS%%%%DATADIR%%/lib/pnp/tip42.mod
 %%MODELS%%%%DATADIR%%/lib/reg/lm317.mod
+%%MODELS%%%%DATADIR%%/lib/rf/atf-34143.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
@@ -29,10 +32,12 @@ bin/gspiceui
 %%MODELS%%%%DATADIR%%/sch/opamp-lmx358-2.sch
 %%MODELS%%%%DATADIR%%/sch/opamp-ua741.sch
 %%MODELS%%@dirrm %%DATADIR%%/sch
+%%MODELS%%@dirrm %%DATADIR%%/lib/audio
 %%MODELS%%@dirrm %%DATADIR%%/lib/diode
 %%MODELS%%@dirrm %%DATADIR%%/lib/npn
 %%MODELS%%@dirrm %%DATADIR%%/lib/opamp
 %%MODELS%%@dirrm %%DATADIR%%/lib/pnp
 %%MODELS%%@dirrm %%DATADIR%%/lib/reg
+%%MODELS%%@dirrm %%DATADIR%%/lib/rf
 %%MODELS%%@dirrm %%DATADIR%%/lib
 %%MODELS%%@dirrm %%DATADIR%%