update to vipec-2.0.1

the previous pkg was based on a development version of vipec.  This version
is considered a stable release.

8 files changed, 162 insertions, 46 deletions

diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 16adfa3e960..148e010675b 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,26 +1,41 @@
-# $NetBSD: Makefile,v 1.4 2000/03/28 00:09:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2000/03/28 21:48:41 dmcmahill Exp $
 #
 
-DISTNAME=	vipec-1.07
+DISTNAME=	vipec-2.0.1
 CATEGORIES=	cad
-MASTER_SITES=	http://netfold.com/~vipec/public_ftp/unstable/
+MASTER_SITES=	http://netfold.com/~vipec/public_ftp/stable/
 
 MAINTAINER=	dmcmahill@netbsd.org
 HOMEPAGE=	http://www.netfold.com/~vipec/
 
-DEPENDS+=	qt1-1.44:../../x11/qt1
+DEPENDS+=	qt-2.0.2:../../x11/qt
 
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 USE_X11=	yes
 
-PATH=	${X11BASE}/qt1/bin:$$PATH
+CONFIGURE_ENV+=	"QTDIR=${X11BASE}/qt2"
 
-MAKE_ENV+=	"QTDIR=${X11BASE}/qt1"
+post-extract:
+	${MV} -f ${WRKSRC}/bin/start_vipec_help ${WRKSRC}/bin/start_vipec_help.in
+
+pre-configure:
+	${RM} -f ${WRKSRC}/config.cache
+
+post-configure:
+	${SED} 's;@prefix@;${PREFIX};g' ${WRKSRC}/bin/start_vipec_help.in > ${WRKSRC}/bin/start_vipec_help
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/vipec ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/vipec/vipec ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/start_vipec_help ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vipec
-	${INSTALL_DATA} ${WRKSRC}/ckt/*.ckt ${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} ${WRKSRC}/help/* ${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/*.gif ${PREFIX}/share/doc/vipec
+	${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.html ${PREFIX}/share/doc/vipec/models
+	${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.gif ${PREFIX}/share/doc/vipec/models
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/vipec/files/md5 b/cad/vipec/files/md5
index 0e04846976b..3ce30ac09d2 100644
--- a/cad/vipec/files/md5
+++ b/cad/vipec/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/06/03 16:26:27 tron Exp $
+$NetBSD: md5,v 1.2 2000/03/28 21:48:42 dmcmahill Exp $
 
-MD5 (vipec-1.07.tar.gz) = 4ea37729efa0881f6be364e4db4c087f
+MD5 (vipec-2.0.1.tar.gz) = 40c8f97dc7c4ddb55b13703e1f1f0d4c
diff --git a/cad/vipec/files/patch-sum b/cad/vipec/files/patch-sum
index 734431e6464..1028cf21819 100644
--- a/cad/vipec/files/patch-sum
+++ b/cad/vipec/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.4 2000/03/28 21:48:42 dmcmahill Exp $
 
-MD5 (patch-aa) = 28831310d38588f82020bdcf415d0a2a
+MD5 (patch-aa) = ac3edc84e02d40220306c8452aaaf561
+MD5 (patch-ab) = 9649e880bbc32ea70e78fc1cfca0916e
+MD5 (patch-ac) = f53478bfdccbaa1a8e81ce2a8ac69d9f
+MD5 (patch-ad) = 9ad5068ca9710e3f1a88706508971d10
diff --git a/cad/vipec/patches/patch-aa b/cad/vipec/patches/patch-aa
index 65e59713065..163ca3f55da 100644
--- a/cad/vipec/patches/patch-aa
+++ b/cad/vipec/patches/patch-aa
@@ -1,17 +1,18 @@
-$NetBSD: patch-aa,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2000/03/28 21:48:42 dmcmahill Exp $
 
---- Makefile.orig	Tue May 25 02:52:00 1999
-+++ Makefile	Thu Mar 23 17:01:44 2000
-@@ -12,9 +12,9 @@
- CFLAGS	=	-Wall -W -O2 -fno-strength-reduce
- CXXFLAGS=	-Wall -W -O2 -fno-strength-reduce
--INCPATH	=	-I$(QTDIR)/include
-+INCPATH	=	-I${X11BASE}/include -I$(QTDIR)/include 
- LINK	=	g++
- LFLAGS	=	
--LIBS	=	-L$(QTDIR)/lib -lqt -lX11 -lXext
--MOC	=	moc
-+LIBS	=	-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -lqt  -lX11 -lXext
-+MOC	=	moc
- 
- TAR	=	tar -cf
+--- configure.orig	Wed Oct 27 19:59:43 1999
++++ configure	Mon Mar 27 19:29:18 2000
+@@ -10,5 +10,5 @@
+ # Defaults:
+ ac_help=
+-ac_default_prefix=/opt
++ac_default_prefix=/usr/local
+ # Any additions from configure.in:
+ ac_help="$ac_help
+@@ -32,5 +32,5 @@
+ build=NONE
+ cache_file=./config.cache
+-exec_prefix=/opt/vipec
++exec_prefix=NONE
+ host=NONE
+ no_create=
diff --git a/cad/vipec/patches/patch-ab b/cad/vipec/patches/patch-ab
new file mode 100644
index 00000000000..55a64515ed2
--- /dev/null
+++ b/cad/vipec/patches/patch-ab
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.1 2000/03/28 21:48:42 dmcmahill Exp $
+
+--- Makefile.in.orig	Wed Oct 27 20:00:46 1999
++++ Makefile.in	Mon Mar 27 20:14:11 2000
+@@ -89,5 +89,5 @@
+ LIBSOCKET = @LIBSOCKET@
+ LIBTIFF = @LIBTIFF@
+-LIBTOOL = @LIBTOOL@
++#LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
diff --git a/cad/vipec/patches/patch-ac b/cad/vipec/patches/patch-ac
new file mode 100644
index 00000000000..6903b234d51
--- /dev/null
+++ b/cad/vipec/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.1 2000/03/28 21:48:42 dmcmahill Exp $
+
+--- vipec/Makefile.in.orig	Wed Oct 27 20:01:06 1999
++++ vipec/Makefile.in	Mon Mar 27 20:13:59 2000
+@@ -89,5 +89,5 @@
+ LIBSOCKET = @LIBSOCKET@
+ LIBTIFF = @LIBTIFF@
+-LIBTOOL = @LIBTOOL@
++#LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
diff --git a/cad/vipec/patches/patch-ad b/cad/vipec/patches/patch-ad
new file mode 100644
index 00000000000..ea0311589e7
--- /dev/null
+++ b/cad/vipec/patches/patch-ad
@@ -0,0 +1,35 @@
+$NetBSD: patch-ad,v 1.1 2000/03/28 21:48:43 dmcmahill Exp $
+
+--- bin/start_vipec_help.in.orig	Sun Mar  5 07:38:28 2000
++++ bin/start_vipec_help.in	Tue Mar 28 13:10:55 2000
+@@ -1,15 +1,25 @@
++#!/bin/sh
++
+ # Script to start HTML browser and load help file
+ if [ -z $VIPECHOME ]
+ then
+-  VIPECHOME=/opt/vipec
++  VIPECHOME=@prefix@
+ fi
+ 
+-if [ -z "`ps -ef | grep netscape | grep -v grep`" ]
++URL="file://$VIPECHOME/share/doc/vipec/index.html"
++VIEWER=@prefix@/bin/netscape
++
++if [ -x $VIEWER ]
+ then
+-  netscape "file://$VIPECHOME/help/index.html"
++  if [ -z "`ps -alx | grep netscape | grep -v grep`" ]
++  then
++    $VIEWER $URL 
++  else
++    $VIEWER -noraise -remote "openURL($URL, newwindow)"
++  fi
+ else
+-  netscape -noraise -remote "openURL(file://$VIPECHOME/help/index.html, newwindow)"
++  echo "$VIEWER is not available for online help"
++  echo "Please refer to $URL for help"
+ fi
+-
+ 
+ 
diff --git a/cad/vipec/pkg/PLIST b/cad/vipec/pkg/PLIST
index 3595bfd7b05..9326d88dbfe 100644
--- a/cad/vipec/pkg/PLIST
+++ b/cad/vipec/pkg/PLIST
@@ -1,31 +1,71 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/06/03 16:26:26 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/03/28 21:48:43 dmcmahill Exp $
 bin/vipec
+bin/start_vipec_help
+share/doc/vipec/models/bipolar.gif
+share/doc/vipec/models/bipolar.html
+share/doc/vipec/models/capacitor.gif
+share/doc/vipec/models/capacitor.html
+share/doc/vipec/models/inductor.gif
+share/doc/vipec/models/inductor.html
+share/doc/vipec/models/inductorq.gif
+share/doc/vipec/models/inductorq.html
+share/doc/vipec/models/resistor.gif
+share/doc/vipec/models/resistor.html
+share/doc/vipec/models/block.gif
+share/doc/vipec/models/block.html
+share/doc/vipec/models/clin.gif
+share/doc/vipec/models/clin.html
+share/doc/vipec/models/gyrator.gif
+share/doc/vipec/models/gyrator.html
+share/doc/vipec/models/tlin2port.gif
+share/doc/vipec/models/tlin2port.html
+share/doc/vipec/models/tlin4port.gif
+share/doc/vipec/models/tlin4port.html
+share/doc/vipec/models/tloc.gif
+share/doc/vipec/models/tloc.html
+share/doc/vipec/models/tlsc.gif
+share/doc/vipec/models/tlsc.html
+share/doc/vipec/models/vccs.gif
+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.gif
+share/doc/vipec/models/stripline.gif
+share/doc/vipec/models/striplinecoupled.gif
+share/doc/vipec/models/striplinesub.gif
+share/doc/vipec/models/ustripcoupled.gif
+share/doc/vipec/models/ustripsub.gif
+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.gif
+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/bfr505.s2p
 share/examples/vipec/coupled.ckt
 share/examples/vipec/filter.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/test.ckt
 share/examples/vipec/vhfrx1.ckt
-share/doc/vipec/help0001.gif
-share/doc/vipec/help0002.gif
-share/doc/vipec/help0003.gif
-share/doc/vipec/help0004.gif
-share/doc/vipec/help0005.gif
-share/doc/vipec/help0006.gif
-share/doc/vipec/help0007.gif
-share/doc/vipec/help0008.gif
-share/doc/vipec/help0009.gif
-share/doc/vipec/help0010.gif
-share/doc/vipec/help0011.gif
-share/doc/vipec/help0012.gif
-share/doc/vipec/help0013.gif
-share/doc/vipec/help0014.gif
-share/doc/vipec/vipec.html
-@dirrm share/examples/vipec
+@dirrm share/doc/vipec/models
 @dirrm share/doc/vipec
+@dirrm share/examples/vipec