- Update to version 1.0.00

PR:		162828
Submitted by:	Ports Fury
Feature safe:	yes

4 files changed, 34 insertions, 103 deletions

diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index 566134584519..6ccdbc15969c 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gspiceui
-PORTVERSION=	0.9.65
-PORTREVISION=	5
+PORTVERSION=	1.0.00
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${PORTVERSION}
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
@@ -15,24 +14,27 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI frontend for gnucap/ng-spice circuit simulators
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/License
+
 RUN_DEPENDS=	gwave:${PORTSDIR}/cad/gwave
 
+OPTIONS=	NGSPICE "Use ng-spice as backend" on \
+		GNUCAP "Use gnucap as backend" off
+
 USE_WX=		2.6+
 WX_UNICODE=	yes
+USE_GCC=	4.6+
 USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	NGSPICE "Use ng-spice as backend" on \
-		GNUCAP "Use gnucap as backend" off \
-		MODELS "Install example models" on
-
+MAN1=		gspiceui.1
 PORTDOCS=	*
+PORTEXAMPLES=	*
+PLIST_FILES=	bin/gspiceui
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -E -e "s,%%WX_CONFIG%%,${WX_CONFIG},g" \
-		${WRKSRC}/src/Makefile
-
 .if !defined(WITHOUT_NGSPICE)
 RUN_DEPENDS+=	ngspice:${PORTSDIR}/cad/ngspice_rework
 .endif
@@ -41,23 +43,31 @@ RUN_DEPENDS+=	ngspice:${PORTSDIR}/cad/ngspice_rework
 RUN_DEPENDS+=	gnucap:${PORTSDIR}/cad/gnucap
 .endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|:= -Ofast -pipe|+= -I.|g ; \
+		 s|^INCLUDES |#INCLUDES |g ; \
+		 s|$$(WXCFG)|$$(WX_CONFIG)|g ; \
+		 s|$$(CC)|$$(CXX)|g' ${WRKSRC}/src/Makefile
+	@${REINPLACE_CMD} -e \
+		's|share/gspiceui|share/doc/gspiceui|g' ${WRKSRC}/src/main/HelpTasks.cpp
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/gspiceui ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/gspiceui.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/html && ${COPYTREE_SHARE} \* ${DOCSDIR} \
+.for dir in html
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DOCSDIR} \
 		"! -name Makefile")
+.endfor
 .endif
-.if !defined(WITHOUT_MODELS)
-	@${MKDIR} ${DATADIR}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} sch ${DATADIR} \
-		"! -name Makefile" && \
-		${COPYTREE_SHARE} lib ${DATADIR} "! -name Makefile")
-PLIST_SUB+=	MODELS=""
-.else
-PLIST_SUB+=	MODELS="@comment "
+.if !defined(WITHOUT_EXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+.for dir in lib sch
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${EXAMPLESDIR} \
+		"! -name Makefile")
+.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/cad/gspiceui/distinfo b/cad/gspiceui/distinfo
index 9142343c1e03..30bf7b17f073 100644
--- a/cad/gspiceui/distinfo
+++ b/cad/gspiceui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gspiceui-v0.9.65.tar.gz) = d914c7b4fa07c64e69a23920e48976a6d449d84478d8a788ad15483fe35da5ad
-SIZE (gspiceui-v0.9.65.tar.gz) = 461168
+SHA256 (gspiceui-v1.0.00.tar.gz) = ff8d38b9bb10bf695c00a0660dcbd14a43072e93851c5100a85133919736d5da
+SIZE (gspiceui-v1.0.00.tar.gz) = 612517
diff --git a/cad/gspiceui/files/patch-src_Makefile b/cad/gspiceui/files/patch-src_Makefile
deleted file mode 100644
index 84389617a6c5..000000000000
--- a/cad/gspiceui/files/patch-src_Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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
- # (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 = %%WX_CONFIG%%
- 
- # Dependency file
- DEPS = Makefile.deps
-@@ -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 $(shell $(WXCFG) --cxxflags)
--else
--  # Options for development
--  CXXFLAGS = -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
--endif
-+CXXFLAGS += -c $(shell $(WXCFG) --cxxflags)
- 
- # Includes
--INCLUDES = -I/usr/include -I/usr/X11R6/include -I.
-+INCLUDES = -I/usr/include -I${LOCALBASE}/include -I. $(shell %%WX_CONFIG%% --cxxflags)
- 
- # Libraries
- # (The pkg-config stuff was requested by a user, somehow pangox was missing)
--LIBS := $(shell $(WXCFG) --libs) $(shell pkg-config --libs pangox)
-+LIBS := $(shell %%WX_CONFIG%% --libs) $(shell pkg-config --libs pangox)
- 
- # Objects
- OBJS := $(wildcard *.cpp) $(wildcard */*.cpp) $(wildcard */*/*.cpp)
diff --git a/cad/gspiceui/pkg-plist b/cad/gspiceui/pkg-plist
deleted file mode 100644
index 14404c512312..000000000000
--- a/cad/gspiceui/pkg-plist
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-%%MODELS%%%%DATADIR%%/lib/pnp/2n5401.mod
-%%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/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
-%%MODELS%%%%DATADIR%%/sch/opamp-lm358-1.sch
-%%MODELS%%%%DATADIR%%/sch/opamp-lm358-2.sch
-%%MODELS%%%%DATADIR%%/sch/opamp-lm741.sch
-%%MODELS%%%%DATADIR%%/sch/opamp-lmx358-1.sch
-%%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%%