update to ViPEC-3.1.3.

The previous version was extremely out of date and the distfile is no
longer available.

Many, many changes since the last packaged version.  New 'tuner' feature
added.  New models added.  Several bug fixes too numerous to list.

7 files changed, 109 insertions, 194 deletions

diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 80b8376bed0..2a81770bc89 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,41 +1,28 @@
-# $NetBSD: Makefile,v 1.28 2002/09/20 21:13:39 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2003/02/06 00:41:12 dmcmahill Exp $
 #
 
-DISTNAME=	vipec-2.0.4
-PKGREVISION=		1
+DISTNAME=	ViPEC-3.1.3
 CATEGORIES=	cad
-MASTER_SITES=	http://netfold.com/~vipec/public_ftp/stable/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vipec/}
 
 MAINTAINER=	dmcmahill@netbsd.org
-HOMEPAGE=	http://www.netfold.com/~vipec/
+HOMEPAGE=	http://vipec.sourceforge.net
 COMMENT=	Network analyser for electrical networks
 
+BUILD_DEPENDS+=		tmake-*:../../devel/tmake
+
 USE_BUILDLINK2=		yes
 USE_X11=		yes
+USE_GMAKE=		yes
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-qt-dir=${QTDIR}
-CONFIGURE_ENV+=		USER_LDFLAGS="${LDFLAGS}"
-
-USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+CONFLICTS+=		vipec-[0-9]*
 
 post-patch:
-	${MV} -f ${WRKSRC}/vipec/helpwindow.cpp ${WRKSRC}/vipec/helpwindow.cpp.in
-	${SED} "s;@prefix@;${PREFIX};g" ${WRKSRC}/vipec/helpwindow.cpp.in > \
-		${WRKSRC}/vipec/helpwindow.cpp
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/vipec/vipec ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vipec
-	${INSTALL_DATA} ${WRKSRC}/vipec/ckt/*.ckt ${PREFIX}/share/examples/vipec
-	${INSTALL_DATA} ${WRKSRC}/vipec/ckt/*.s2p ${PREFIX}/share/examples/vipec
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vipec
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vipec/models
-	${INSTALL_DATA} ${WRKSRC}/vipec/help/*.html ${PREFIX}/share/doc/vipec
-	${INSTALL_DATA} ${WRKSRC}/vipec/help/*.png ${PREFIX}/share/doc/vipec
-	${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.html ${PREFIX}/share/doc/vipec/models
-	${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.png ${PREFIX}/share/doc/vipec/models
+	${SED} 's;@prefix@;${PREFIX};g' < ${FILESDIR}/vipec.sh.in > ${WRKDIR}/vipec.sh
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/vipec.sh ${PREFIX}/bin/vipec
+	${INSTALL_DATA} ${WRKSRC}/vipec.cfg ${PREFIX}/vipec
 
 .include "../../x11/qt2-libs/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/vipec/PLIST b/cad/vipec/PLIST
index 2a22678a546..63c64fb0a85 100644
--- a/cad/vipec/PLIST
+++ b/cad/vipec/PLIST
@@ -1,70 +1,71 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:49:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/02/06 00:41:12 dmcmahill Exp $
 bin/vipec
-share/doc/vipec/models/bipolar.png
-share/doc/vipec/models/bipolar.html
-share/doc/vipec/models/capacitor.png
-share/doc/vipec/models/capacitor.html
-share/doc/vipec/models/inductor.png
-share/doc/vipec/models/inductor.html
-share/doc/vipec/models/inductorq.png
-share/doc/vipec/models/inductorq.html
-share/doc/vipec/models/resistor.png
-share/doc/vipec/models/resistor.html
-share/doc/vipec/models/block.png
-share/doc/vipec/models/block.html
-share/doc/vipec/models/clin.png
-share/doc/vipec/models/clin.html
-share/doc/vipec/models/gyrator.png
-share/doc/vipec/models/gyrator.html
-share/doc/vipec/models/tlin2port.png
-share/doc/vipec/models/tlin2port.html
-share/doc/vipec/models/tlin4port.png
-share/doc/vipec/models/tlin4port.html
-share/doc/vipec/models/tloc.png
-share/doc/vipec/models/tloc.html
-share/doc/vipec/models/tlsc.png
-share/doc/vipec/models/tlsc.html
-share/doc/vipec/models/vccs.png
-share/doc/vipec/models/vccs.html
-share/doc/vipec/models/striplinesub.html
-share/doc/vipec/models/ustripsub.html
-share/doc/vipec/models/stripline.html
-share/doc/vipec/models/mustripline.html
-share/doc/vipec/models/mustripline.png
-share/doc/vipec/models/stripline.png
-share/doc/vipec/models/striplinecoupled.png
-share/doc/vipec/models/striplinesub.png
-share/doc/vipec/models/ustripcoupled.png
-share/doc/vipec/models/ustripsub.png
-share/doc/vipec/models/striplinecoupled.html
-share/doc/vipec/models/ustripcoupled.html
-share/doc/vipec/defining_circuit.html
-share/doc/vipec/disclaimer.html
-share/doc/vipec/index.html
-share/doc/vipec/license.html
-share/doc/vipec/structure_of_circuit_file.html
-share/doc/vipec/units_of_measure.html
-share/doc/vipec/what_is.html
-share/doc/vipec/circuit.png
-share/doc/vipec/defining_frequency.html
-share/doc/vipec/defining_output.html
-share/examples/vipec/3dbcoup.ckt
-share/examples/vipec/amplifier.ckt
-share/examples/vipec/amplifier.s2p
-share/examples/vipec/amplifier2.ckt
-share/examples/vipec/amplifier3.ckt
-share/examples/vipec/bandpass.ckt
-share/examples/vipec/bandpass2.ckt
-share/examples/vipec/bandpass2.s2p
-share/examples/vipec/coupled.ckt
-share/examples/vipec/filter.ckt
-share/examples/vipec/group_delay.ckt
-share/examples/vipec/lna.ckt
-share/examples/vipec/mustrip.ckt
-share/examples/vipec/nec70000.s2p
-share/examples/vipec/slin_coupled.ckt
-share/examples/vipec/stripline.ckt
-share/examples/vipec/vhfrx1.ckt
-@dirrm share/doc/vipec/models
-@dirrm share/doc/vipec
-@dirrm share/examples/vipec
+vipec/CHANGES
+vipec/COPYING
+vipec/COPYRIGHT
+vipec/INTERNATIONALIZATION
+vipec/LICENSE
+vipec/README
+vipec/ckt/amplifier.ckt
+vipec/ckt/bandpass.ckt
+vipec/ckt/bandpass.s2p
+vipec/ckt/bandpass2.ckt
+vipec/ckt/combined.ckt
+vipec/ckt/coupled_line_filter.ckt
+vipec/ckt/coupler.ckt
+vipec/ckt/datafile.ckt
+vipec/ckt/filter.ckt
+vipec/ckt/highpass.ckt
+vipec/ckt/nec70000.s2p
+vipec/ckt/stripline.ckt
+vipec/ckt/test.ckt
+vipec/help/analysing.html
+vipec/help/components.html
+vipec/help/disclaimer.html
+vipec/help/frequency.html
+vipec/help/index.html
+vipec/help/license.html
+vipec/help/models/block.html
+vipec/help/models/block.png
+vipec/help/models/capacitor.html
+vipec/help/models/capacitor.png
+vipec/help/models/coupled.png
+vipec/help/models/gyrator.html
+vipec/help/models/gyrator.png
+vipec/help/models/idealcoupled.html
+vipec/help/models/inductor.html
+vipec/help/models/inductor.png
+vipec/help/models/inductorq.html
+vipec/help/models/inductorq.png
+vipec/help/models/port.html
+vipec/help/models/port.png
+vipec/help/models/resistor.html
+vipec/help/models/resistor.png
+vipec/help/models/tlin2port.html
+vipec/help/models/tlin2port.png
+vipec/help/models/tlin4port.html
+vipec/help/models/tlin4port.png
+vipec/help/models/tlinphysical.html
+vipec/help/models/tlinphysical.png
+vipec/help/models/vccs.html
+vipec/help/models/vccs.png
+vipec/help/navigation.html
+vipec/help/outputs.html
+vipec/help/placing.html
+vipec/help/schematics.html
+vipec/help/substrates.html
+vipec/help/units.html
+vipec/help/variables.html
+vipec/help/what_is.html
+vipec/messages/vipec_fr.qm
+vipec/messages/vipec_fr.ts
+vipec/messages/vipec_pt.qm
+vipec/messages/vipec_pt.ts
+vipec/vipec
+vipec/vipec.cfg
+@dirrm vipec/messages
+@dirrm vipec/help/models
+@dirrm vipec/help
+@dirrm vipec/ckt
+@dirrm vipec
+@dirrm opt
diff --git a/cad/vipec/distinfo b/cad/vipec/distinfo
index f84cc02f609..e4e203d9fd1 100644
--- a/cad/vipec/distinfo
+++ b/cad/vipec/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/08/29 22:41:06 jlam Exp $
+$NetBSD: distinfo,v 1.5 2003/02/06 00:41:12 dmcmahill Exp $
 
-SHA1 (vipec-2.0.4.tar.gz) = 56e273d50fb9886fc25b91eb446da4812032508e
-Size (vipec-2.0.4.tar.gz) = 408479 bytes
-SHA1 (patch-aa) = 78ae035d59c4a1e674fb5f9a99be8be680ce089a
-SHA1 (patch-ab) = 3a6b0783950fae7aa79ff4f913a719ce26a70d81
-SHA1 (patch-ac) = e4ab38a8b41e9dfa83881f8b7fd50c01b76103ac
+SHA1 (ViPEC-3.1.3.tar.gz) = 987d2dffe04309508cb9fb6e31ed2e7ca09fcb12
+Size (ViPEC-3.1.3.tar.gz) = 178029 bytes
+SHA1 (patch-aa) = dcf8cdfd3c3d7e933a65235ef4524b4ac2779076
diff --git a/cad/vipec/files/vipec.sh.in b/cad/vipec/files/vipec.sh.in
new file mode 100644
index 00000000000..4ae4b3e0510
--- /dev/null
+++ b/cad/vipec/files/vipec.sh.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $Id: vipec.sh.in,v 1.1 2003/02/06 00:41:13 dmcmahill Exp $
+#
+
+VIPECHOME=@prefix@/vipec
+export VIPECHOME
+
+${VIPECHOME}/vipec $*
+
diff --git a/cad/vipec/patches/patch-aa b/cad/vipec/patches/patch-aa
index f7f42a1b8e3..d997a270cce 100644
--- a/cad/vipec/patches/patch-aa
+++ b/cad/vipec/patches/patch-aa
@@ -1,54 +1,13 @@
-$NetBSD: patch-aa,v 1.9 2001/08/29 22:41:06 jlam Exp $
+$NetBSD: patch-aa,v 1.10 2003/02/06 00:41:13 dmcmahill Exp $
 
---- configure.orig	Mon May 22 14:34:07 2000
-+++ configure
-@@ -3970,12 +3970,12 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   # One or both of the vars are not set, and there is no cached value.
--if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-+if test "${x_includes+set}" != set || test "$x_includes" = NONE; then
-    kde_x_includes=NO
- else
-    kde_x_includes=$x_includes
- fi
--if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-+if test "${x_libraries+set}" != set || test "$x_libraries" = NONE; then
-    kde_x_libraries=NO
- else
-    kde_x_libraries=$x_libraries
-@@ -4132,6 +4132,8 @@
- rm -f conftest*
- fi # $ac_x_libraries = NO
- 
-+# Don't second-guess the package builder.
-+if false; then
- rm -fr conftestdir
- if mkdir conftestdir; then
-   cd conftestdir
-@@ -4165,6 +4167,7 @@
-   cd ..
-   rm -fr conftestdir
- fi
-+fi
- 
- if test -z "$ac_x_includes"; then
- ac_x_includes="."
-@@ -4407,7 +4410,7 @@
- echo $ac_n "checking for Qt""... $ac_c" 1>&6
- echo "configure:4409: checking for Qt" >&5
- 
--LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSOCKET"
-+LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET"
- ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
- qt_libraries=""
- qt_includes=""
-@@ -4630,7 +4633,7 @@
- 
- CXXFLAGS="$CXXFLAGS -I$qt_includes"
- LDFLAGS="$X_LDFLAGS"
--LIBS="-lqt -lXext -lX11 $LIBSOCKET"
-+LIBS="-lqt -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET"
- LD_LIBRARY_PATH=
- export LD_LIBRARY_PATH
- LIBRARY_PATH=
+--- work.bondage/ViPEC-3.1.3/Makefile.orig	Sat Oct 12 19:12:19 2002
++++ work.bondage/ViPEC-3.1.3/Makefile
+@@ -10,7 +10,7 @@
+ SUBDIRS = src
+ SOURCEPATH = `pwd`
+ VERSION = 3.1.3
+-INSTALLDIR = $(PREFIX)/opt/vipec
++INSTALLDIR = $(PREFIX)/vipec
+ ICONFILE = vipec.gif
+ 
+ export VERSION
diff --git a/cad/vipec/patches/patch-ab b/cad/vipec/patches/patch-ab
deleted file mode 100644
index 8c9cd832669..00000000000
--- a/cad/vipec/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/08/28 19:52:35 dmcmahill Exp $
-
---- vipec/helpwindow.cpp.orig	Mon May 22 14:44:20 2000
-+++ vipec/helpwindow.cpp	Mon Aug 28 15:41:37 2000
-@@ -36,5 +36,5 @@
-       vipecHome = dir.absPath();
-     }
--  home_ = vipecHome + "/help/index.html";
-+  home_ = "@prefix@/share/doc/vipec/index.html";
- 
-   helpBrowser_ = new QTextBrowser( this );
diff --git a/cad/vipec/patches/patch-ac b/cad/vipec/patches/patch-ac
deleted file mode 100644
index e53263ee9b2..00000000000
--- a/cad/vipec/patches/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2000/08/28 19:52:35 dmcmahill Exp $
-
---- vipec/Makefile.in.orig	Mon May 22 16:11:40 2000
-+++ vipec/Makefile.in	Mon Aug 28 14:11:06 2000
-@@ -194,5 +194,5 @@
- bin_PROGRAMS = vipec
- vipec_SOURCES = helpwindow.cpp vipec.cpp view.cpp vector.cpp utils.cpp twoports.cpp table.cpp smith.cpp smallmatrix.cpp setup.cpp parser.cpp paramset.cpp netanal.cpp matrix.cpp main.cpp graphutils.cpp graph.cpp drawingframe.cpp convert.cpp config.cpp circuiteditor.cpp block.cpp analyser.cpp 
--vipec_LDADD = -lqt -lXext -lX11 $(LIBSOCKET)
-+vipec_LDADD = -lqt -lXext -lX11  -lz -lpng -ljpeg -lSM -lICE $(LIBSOCKET)
- 
- SUBDIRS = images ckt help 
-@@ -246,4 +246,5 @@
- #>+ 1
- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXCOMPILE2 = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS)  $(KDE_CXXFLAGS)
- #>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 1
-@@ -262,4 +263,11 @@
- SOURCES = $(vipec_SOURCES)
- OBJECTS = $(vipec_OBJECTS)
-+
-+# avoid a bug with "c++ -O*" on some machines.  This is noted with
-+# gcc version egcs-2.91.60 19981201 (egcs-1.1.1 release)
-+.if (${MACHINE_ARCH} == "mipsel")
-+analyser.o: analyser.cpp
-+	$(CXXCOMPILE2) -c analyser.cpp
-+.endif 
- 
- all: all-redirect