3 files changed, 90 insertions, 20 deletions

diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index 4acafcd14e3b..475600b88ab1 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -6,30 +6,63 @@
 #
 
 PORTNAME=	gwave
-PORTVERSION=	20030804
-PORTREVISION=	3
+PORTVERSION=	20051222
 CATEGORIES=	cad
 MASTER_SITES=	http://www.cs.unc.edu/~tell/dist/ \
 		http://geda.seul.org/dist/
 
-MAINTAINER=	dmlb@dmlb.org
+MAINTAINER=	ssedov@mbsd.msk.ru
 COMMENT=	Waveform viewer for analogue electronic simulation tools
 
-RUN_DEPENDS=	graph:${PORTSDIR}/graphics/plotutils
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile \
 		guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
 
-USE_AUTOTOOLS=	autoconf:253
 USE_GNOME=	gtk12
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+OPTIONS=	PLOTUTILS "Use GNU plotutils for plotting" off \
+		GNUPLOT "Use gnuplot for plotting" on \
+		EXAMPLES "Install example spice files" off
+
+DOCFILES=	Guile.notes \
+		gwave-concepts.txt \
+		gwave-hooks.txt \
+		gwave-procedures.txt \
+		gwave-variables.txt \
+		hspice-output.txt \
+		hspice.txt \
+		spice3.txt
 
 MAN1=		sp2sp.1
+PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
+.if defined(WITH_PLOTUTILS)
+RUN_DEPENDS+=	graph:${PORTSDIR}/graphics/plotutils
+.endif
+
+.if !defined(WITHOUT_GNUPLOT)
+RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
+.endif
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for FILE in ${DOCFILES}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
+.endfor
+.endif
+
+.if defined(WITH_EXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+PLIST_SUB+=	EXAMPLES=""
+.else
+PLIST_SUB+=	EXAMPLES="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/cad/gwave/distinfo b/cad/gwave/distinfo
index 9c88272781f4..48f5b1b13da6 100644
--- a/cad/gwave/distinfo
+++ b/cad/gwave/distinfo
@@ -1,3 +1,3 @@
-MD5 (gwave-20030804.tar.gz) = 4b8ae59dd4bd80520e64df43bc13f7ce
-SHA256 (gwave-20030804.tar.gz) = 4c1f162b01d2745607e68238d6ea75108225526cbe1fa4b65d025e6f306ed97b
-SIZE (gwave-20030804.tar.gz) = 437860
+MD5 (gwave-20051222.tar.gz) = 5defce2525247300dcd432ad12bbf173
+SHA256 (gwave-20051222.tar.gz) = 32c9d78f702f0620101a208efc3704c10c9c23be38868463a2db96a49c9344e3
+SIZE (gwave-20051222.tar.gz) = 479477
diff --git a/cad/gwave/pkg-plist b/cad/gwave/pkg-plist
index 610672a0c050..81f2c099ccef 100644
--- a/cad/gwave/pkg-plist
+++ b/cad/gwave/pkg-plist
@@ -1,22 +1,59 @@
-bin/sp2sp
 bin/gwave
 bin/gwave-exec
 bin/gwaverepl
+bin/sp2sp
+bin/sweepsplit
 share/guile/app/gwave/system.gwaverc
 share/guile/app/gwave/cmds.scm
 share/guile/app/gwave/dynlink.scm
+share/guile/app/gwave/export-gnugraph.scm
+share/guile/app/gwave/export-gnuplot.scm
+share/guile/app/gwave/export.scm
+share/guile/app/gwave/extra-menus.scm
 share/guile/app/gwave/globals.scm
+share/guile/app/gwave/gtk-helpers.scm
+share/guile/app/gwave/gwave-config.scm
+share/guile/app/gwave/gwave-startup.scm
 share/guile/app/gwave/minimal.scm
 share/guile/app/gwave/std-args.scm
 share/guile/app/gwave/std-menus.scm
 share/guile/app/gwave/std-toolbar.scm
-share/guile/app/gwave/extra-menus.scm
-share/guile/app/gwave/visiblewave-ops.scm
-share/guile/app/gwave/gwave-startup.scm
-share/guile/app/gwave/export-gnugraph.scm
-share/guile/app/gwave/export-gnuplot.scm
-share/guile/app/gwave/export.scm
-share/guile/app/gwave/gtk-helpers.scm
 share/guile/app/gwave/utils.scm
+share/guile/app/gwave/visiblewave-ops.scm
+%%EXAMPLES%%%%EXAMPLESDIR%%/Readme
+%%EXAMPLES%%%%EXAMPLESDIR%%/aoi.W
+%%EXAMPLES%%%%EXAMPLESDIR%%/aoi.W.gw
+%%EXAMPLES%%%%EXAMPLESDIR%%/aoi.W.tr0
+%%EXAMPLES%%%%EXAMPLESDIR%%/aoi.W.tr0.gw
+%%EXAMPLES%%%%EXAMPLESDIR%%/aoi.W1
+%%EXAMPLES%%%%EXAMPLESDIR%%/diffpair.braw
+%%EXAMPLES%%%%EXAMPLESDIR%%/diffpair.sp
+%%EXAMPLES%%%%EXAMPLESDIR%%/gw
+%%EXAMPLES%%%%EXAMPLESDIR%%/gwave.gw
+%%EXAMPLES%%%%EXAMPLESDIR%%/gwplot.dat
+%%EXAMPLES%%%%EXAMPLESDIR%%/gwplot.dat.0
+%%EXAMPLES%%%%EXAMPLESDIR%%/gwplot.dat.1
+%%EXAMPLES%%%%EXAMPLESDIR%%/gwplot.dat.gnuplot
+%%EXAMPLES%%%%EXAMPLESDIR%%/lpf.ac0
+%%EXAMPLES%%%%EXAMPLESDIR%%/lpf.sp
+%%EXAMPLES%%%%EXAMPLESDIR%%/nand.N.tr0
+%%EXAMPLES%%%%EXAMPLESDIR%%/nfet.N.sw0
+%%EXAMPLES%%%%EXAMPLESDIR%%/nfet.N.sw0.binary
+%%EXAMPLES%%%%EXAMPLESDIR%%/nisrc.N.sw0
+%%EXAMPLES%%%%EXAMPLESDIR%%/pd1.N.tr0
+%%EXAMPLES%%%%EXAMPLESDIR%%/pd2.N
+%%EXAMPLES%%%%EXAMPLESDIR%%/pd2.N.gw
+%%EXAMPLES%%%%EXAMPLESDIR%%/pd2long.N
+%%EXAMPLES%%%%EXAMPLESDIR%%/quickAC.ac0
+%%EXAMPLES%%%%EXAMPLESDIR%%/quickINV.tr0
+%%EXAMPLES%%%%EXAMPLESDIR%%/quickTRAN.tr0
+%%EXAMPLES%%%%EXAMPLESDIR%%/rcsq.raw
+%%EXAMPLES%%%%EXAMPLESDIR%%/rcsq.sp
+%%EXAMPLES%%%%EXAMPLESDIR%%/test1.tr0.binary
+%%EXAMPLES%%%%EXAMPLESDIR%%/tlong.tr0.9601
+%%EXAMPLES%%%%EXAMPLESDIR%%/tpwl.acs
+%%EXAMPLES%%%%EXAMPLESDIR%%/tscript
+%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm share/guile/app/gwave
 @dirrmtry share/guile/app
+@dirrmtry share/guile