2 files changed, 36 insertions, 33 deletions

diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index a7389965ea3b..6c0f32780b94 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -1,29 +1,31 @@
-# New ports collection makefile for:	gspiceui
-# Date created:		30 April 2006
-# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
-#
+# Created by: Stanislav Sedov <ssedov@mbsd.msk.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	gspiceui
 PORTVERSION=	1.0.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${PORTVERSION}
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GUI frontend for gnucap/ng-spice circuit simulators
+MAINTAINER=	kevinz5000@gmail.com
+COMMENT=	GUI frontend to gnucap and ngspice circuit simulators
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/License
 
-RUN_DEPENDS=	gwave:${PORTSDIR}/cad/gwave
+RUN_DEPENDS=	# none if no options are set
 
-OPTIONS_DEFINE=	NGSPICE GNUCAP EXAMPLES DOCS
-OPTIONS_DEFAULT=	NGSPICE
-NGSPICE_DESC=	Use ng-spice as backend
-GNUCAP_DESC=	Use gnucap as backend
+OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_GROUP=	BACKEND VIEWER
+
+OPTIONS_GROUP_BACKEND=	GNUCAP NGSPICE
+OPTIONS_GROUP_VIEWER=	GWAVE
+
+GNUCAP_DESC=	Depend on gnucap as a simulation backend
+NGSPICE_DESC=	Depend on ngspice as a simulation backend
+GWAVE_DESC=	Depend on gwave waveform viewer
+
+OPTIONS_DEFAULT=	NGSPICE GWAVE
 
 USE_WX=		2.6+
 WX_UNICODE=	yes
@@ -31,19 +33,27 @@ USE_GCC=	4.6+
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
+DESKTOP_ENTRIES=	"GSpiceUI" "Circuit Simulator GUI" \
+			"${PREFIX}/share/pixmaps/gspiceui-48x48.xpm" \
+			"gspiceui" "Science;Electronics;" false
+
 MAN1=		gspiceui.1
 PORTDOCS=	*
 PORTEXAMPLES=	*
-PLIST_FILES=	bin/gspiceui
+PLIST_FILES=	bin/gspiceui share/pixmaps/gspiceui-48x48.xpm
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MGNUCAP}
+RUN_DEPENDS+=	gnucap:${PORTSDIR}/cad/gnucap
+.endif
+
 .if ${PORT_OPTIONS:MNGSPICE}
 RUN_DEPENDS+=	ngspice:${PORTSDIR}/cad/ngspice_rework
 .endif
 
-.if ${PORT_OPTIONS:MGNUCAP}
-RUN_DEPENDS+=	gnucap:${PORTSDIR}/cad/gnucap
+.if ${PORT_OPTIONS:MGWAVE}
+RUN_DEPENDS+=	gwave:${PORTSDIR}/cad/gwave
 .endif
 
 post-patch:
@@ -53,10 +63,13 @@ post-patch:
 		 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
+		's|share/gspiceui|${DOCSDIR}|g' \
+		${WRKSRC}/src/main/HelpTasks.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/gspiceui ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/src/icons/gspiceui-48x48.xpm \
+	    ${PREFIX}/share/pixmaps
 	${INSTALL_MAN} ${WRKSRC}/gspiceui.1 ${MANPREFIX}/man/man1
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
diff --git a/cad/gspiceui/pkg-descr b/cad/gspiceui/pkg-descr
index a30f2da897e4..55cc3b8f4022 100644
--- a/cad/gspiceui/pkg-descr
+++ b/cad/gspiceui/pkg-descr
@@ -1,16 +1,6 @@
-This port provides a GUI for two freely available SPICE electronic circuit
-simulation engines: GNU-Cap and Ng-Spice.
+GSpiceUI (GNU Spice GUI) is intended to provide a graphical frontend to freely
+available circuit simulators, including gnucap and ngspice. It can use
+gnetlist to import schematics or net list files and gwave to display
+simulation results.
 
-Current features:
-	Import gschem schematic files using gentlist. 
-	Load and parse circuit description (net list) files. 
-	Provides a GUI interface for GNU-Cap OP, DC, AC and Transient
-		analyses and generates appropriate simulator commands
-		based on user input. 
-	Provides a GUI interface for Ng-Spice DC, AC and Transient
-		analyses and generates appropriate simulator commands
-		based on user input. 
-	The raw output may be viewed for any processes initiated by gspiceui. 
-	Formatting of simulator output so that it may be plotted using gwave.
-
-WWW: http://www.geda.seul.org/tools/gspiceui/index.html
+WWW: http://sourceforge.net/projects/gspiceui/