update to vipec-3.2.0

ViPEC 3.2.0
-----------
- Migrated to Qt 3. ViPEC is no longer supported on the
  Windows platform. Please see the README file for details.
- Added German translation by Jens Flucke.
- Started working on improved tracing for debugging
- Changed calculation of font sizes in output graphs

4 files changed, 33 insertions, 20 deletions

diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 244f4911ecd..92925116ce5 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2004/12/03 15:14:52 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2005/02/11 04:09:20 dmcmahill Exp $
 #
 
-DISTNAME=	ViPEC-3.1.3
-PKGREVISION=	1
+DISTNAME=	ViPEC-3.2.0
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vipec/}
 
@@ -10,8 +9,6 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://vipec.sourceforge.net/
 COMMENT=	Network analyser for electrical networks
 
-BUILD_DEPENDS+=		tmake-*:../../devel/tmake
-
 USE_BUILDLINK3=		yes
 USE_X11=		yes
 USE_GNU_TOOLS+=		make
@@ -19,11 +16,8 @@ UNLIMIT_RESOURCES+=	datasize
 
 CONFLICTS+=		vipec-[0-9]*
 
-BUILD_TARGET=		ALL
-
-do-configure:
-	cd ${WRKSRC}/src && tmake vipec "CONFIG+=release" -o Makefile
-	#cd ${WRKSRC}/src && tmake vipec "CONFIG+=debug" -o Makefile
+QMAKE=			${QTDIR}/bin/qmake
+MAKE_ENV+=		QMAKE=${QMAKE}
 
 post-patch:
 	${SED} 's;@prefix@;${PREFIX};g' < ${FILESDIR}/vipec.sh.in > ${WRKDIR}/vipec.sh
@@ -31,6 +25,8 @@ post-patch:
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/vipec.sh ${PREFIX}/bin/vipec
 	${INSTALL_DATA} ${WRKSRC}/vipec.cfg ${PREFIX}/vipec
+	${RM} -fr ${PREFIX}/vipec/*/CVS  ${PREFIX}/vipec/help/models/CVS
 
-.include "../../x11/qt2-libs/buildlink3.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/vipec/PLIST b/cad/vipec/PLIST
index 63c64fb0a85..dd4b470fe66 100644
--- a/cad/vipec/PLIST
+++ b/cad/vipec/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/06 00:41:12 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/02/11 04:09:20 dmcmahill Exp $
 bin/vipec
 vipec/CHANGES
 vipec/COPYING
@@ -59,6 +59,8 @@ vipec/help/variables.html
 vipec/help/what_is.html
 vipec/messages/vipec_fr.qm
 vipec/messages/vipec_fr.ts
+vipec/messages/vipec_ger.qm
+vipec/messages/vipec_ger.ts
 vipec/messages/vipec_pt.qm
 vipec/messages/vipec_pt.ts
 vipec/vipec
@@ -68,4 +70,3 @@ vipec/vipec.cfg
 @dirrm vipec/help
 @dirrm vipec/ckt
 @dirrm vipec
-@dirrm opt
diff --git a/cad/vipec/distinfo b/cad/vipec/distinfo
index 7e226cca0fe..7b138cbdd47 100644
--- a/cad/vipec/distinfo
+++ b/cad/vipec/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2003/02/06 00:50:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2005/02/11 04:09:20 dmcmahill Exp $
 
-SHA1 (ViPEC-3.1.3.tar.gz) = 987d2dffe04309508cb9fb6e31ed2e7ca09fcb12
-Size (ViPEC-3.1.3.tar.gz) = 178029 bytes
-SHA1 (patch-aa) = 6b6b40760bfcc779d569f0f5a7bcac8f2550ab8b
+SHA1 (ViPEC-3.2.0.tar.gz) = 022bdd49effb22a64bf3da25ec1e48a072228ddf
+Size (ViPEC-3.2.0.tar.gz) = 191819 bytes
+SHA1 (patch-aa) = 55ddfbddc0c7206961ed16a3ea242c1e0d285ec6
diff --git a/cad/vipec/patches/patch-aa b/cad/vipec/patches/patch-aa
index bd50ec81f85..6323603eea9 100644
--- a/cad/vipec/patches/patch-aa
+++ b/cad/vipec/patches/patch-aa
@@ -1,13 +1,29 @@
-$NetBSD: patch-aa,v 1.11 2003/02/06 00:50:55 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.12 2005/02/11 04:09:20 dmcmahill Exp $
 
---- Makefile.orig	Sat Oct 12 19:12:19 2002
+--- Makefile.orig	2003-10-03 01:39:34.000000000 +0000
 +++ Makefile
 @@ -10,7 +10,7 @@
  SUBDIRS = src
  SOURCEPATH = `pwd`
- VERSION = 3.1.3
+ VERSION = 3.2.0
 -INSTALLDIR = $(PREFIX)/opt/vipec
 +INSTALLDIR = $(PREFIX)/vipec
  ICONFILE = vipec.gif
  
  export VERSION
+@@ -32,13 +32,13 @@ clean:
+ debug:
+ 	@(echo Creating makefile for debug version ...; \
+ 	  cd src; \
+-	  qmake "CONFIG+=debug" -o Makefile.tmp vipec.pro; \
++	  ${QMAKE} "CONFIG+=debug" -o Makefile.tmp vipec.pro; \
+ 	  cat Makefile.tmp | sed 's/no-exceptions/exceptions/g' > Makefile )
+ 
+ release:
+ 	@(echo Creating makefile for release version ...; \
+ 	  cd src; \
+-	  qmake -o Makefile.tmp vipec.pro; \
++	  ${QMAKE} -o Makefile.tmp vipec.pro; \
+ 	  cat Makefile.tmp | sed 's/no-exceptions/exceptions/g' > Makefile )
+ 
+ ts: