5 files changed, 102 insertions, 82 deletions

diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index a5fe1b9d0977..1b2fcb36a5fb 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -7,31 +7,41 @@
 #
 
 PORTNAME=	vipec
-PORTVERSION=	3.1.2b3
+PORTVERSION=	3.2.0
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	ViPEC-${PORTVERSION}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Analyze high frequency, linear electrical networks
 
-BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-USE_REINPLACE=	yes
-USE_QT_VER=	2
+USE_QT_VER=	3
 USE_GMAKE=	yes
-MAKE_ENV+=	TMAKEPATH="${LOCALBASE}/share/tmake/freebsd-g++" \
-		QTDIR="${X11BASE}" MOC="${X11BASE}/bin/moc2" \
-		SUBLIBS=${PTHREAD_LIBS}
+MAKE_ENV=	QTDIR="${QT_PREFIX}"
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,/opt,,g" ${WRKSRC}/Makefile
+	@${SED} -e 's:@PREFIX@:${PREFIX}:g' \
+		${FILESDIR}/vipec.sh.in > ${WRKSRC}/../vipec.sh
 
-pre-install:
-	@${RM} -rf ${WRKSRC}/help/models/CVS
-	@${RM} -rf ${WRKSRC}/help/CVS
-	@${RM} -rf ${WRKSRC}/ckt/CVS
-	@${RM} -rf ${WRKSRC}/messages/CVS
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
+		-spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ vipec.pro
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/../vipec.sh ${PREFIX}/bin/vipec
+	${INSTALL_PROGRAM} ${WRKSRC}/../vipec ${PREFIX}/bin/vipec.exec
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/../vipec.cfg ${DATADIR}
+	@${MKDIR} ${DATADIR}/ckt
+	${INSTALL_DATA} ${WRKSRC}/../ckt/*.* ${DATADIR}/ckt
+	@${MKDIR} ${DATADIR}/help
+	${INSTALL_DATA} ${WRKSRC}/../help/*.* ${DATADIR}/help
+	@${MKDIR} ${DATADIR}/help/models
+	${INSTALL_DATA} ${WRKSRC}/../help/models/*.* ${DATADIR}/help/models
+	@${MKDIR} ${DATADIR}/messages
+	${INSTALL_DATA} ${WRKSRC}/../messages/*.qm ${DATADIR}/messages
 
 .include <bsd.port.mk>
diff --git a/cad/vipec/distinfo b/cad/vipec/distinfo
index 344acb69a305..5b141c4d14f7 100644
--- a/cad/vipec/distinfo
+++ b/cad/vipec/distinfo
@@ -1 +1 @@
-MD5 (ViPEC-3.1.2b3.tar.gz) = 5df1537b6bc33228f253cf526af267fc
+MD5 (ViPEC-3.2.0.tar.gz) = caf74728ba2d1c00344794173a0460d2
diff --git a/cad/vipec/files/patch-vipec.pro b/cad/vipec/files/patch-vipec.pro
new file mode 100644
index 000000000000..c8565b6ba62f
--- /dev/null
+++ b/cad/vipec/files/patch-vipec.pro
@@ -0,0 +1,11 @@
+--- vipec.pro.orig	Thu Oct  2 04:58:40 2003
++++ vipec.pro	Mon Jan 26 00:17:52 2004
+@@ -8,7 +8,7 @@
+ CLEAN_FILES	= core Makefile *~ *moc* components/*~ dialogs/*~ images/*~ outputs/*~ widgets/*~
+ MOC_DIR		= moc
+ OBJECTS_DIR = obj
+-CONFIG		= qt warn_on exceptions stl rtti
++CONFIG		= qt warn_on exceptions stl rtti thread release
+ DEFINES		= QT_FATAL_ASSERT 
+ RC_FILE		= vipec.rc
+ HEADERS	= 	\
diff --git a/cad/vipec/files/vipec.sh.in b/cad/vipec/files/vipec.sh.in
new file mode 100644
index 000000000000..e2f11566948c
--- /dev/null
+++ b/cad/vipec/files/vipec.sh.in
@@ -0,0 +1,4 @@
+#!/bin/sh
+VIPECHOME=@PREFIX@/share/vipec/
+export VIPECHOME
+exec "@PREFIX@/bin/vipec.exec" "$@"
diff --git a/cad/vipec/pkg-plist b/cad/vipec/pkg-plist
index 67e2724e519c..6e2a4fa0c43e 100644
--- a/cad/vipec/pkg-plist
+++ b/cad/vipec/pkg-plist
@@ -1,67 +1,62 @@
-vipec/vipec
-vipec/CHANGES
-vipec/COPYRIGHT
-vipec/INTERNATIONALIZATION
-vipec/README
-vipec/COPYING
-vipec/LICENSE
-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/analysing.html
-vipec/help/components.html
-vipec/help/disclaimer.html
-vipec/help/frequency.html
-vipec/help/index.html
-vipec/help/license.html
-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/ckt/amplifier.ckt
-vipec/ckt/bandpass.ckt
-vipec/ckt/bandpass.s2p
-vipec/ckt/bandpass2.ckt
-vipec/ckt/coupled_line_filter.ckt
-vipec/ckt/coupler.ckt
-vipec/ckt/combined.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/messages/vipec_fr.qm
-vipec/messages/vipec_fr.ts
-vipec/messages/vipec_pt.qm
-vipec/messages/vipec_pt.ts
-@dirrm vipec/help/models
-@dirrm vipec/help
-@dirrm vipec/ckt
-@dirrm vipec/messages
-@dirrm vipec
+bin/vipec
+bin/vipec.exec
+%%DATADIR%%/ckt/amplifier.ckt
+%%DATADIR%%/ckt/bandpass.ckt
+%%DATADIR%%/ckt/bandpass.s2p
+%%DATADIR%%/ckt/bandpass2.ckt
+%%DATADIR%%/ckt/combined.ckt
+%%DATADIR%%/ckt/coupled_line_filter.ckt
+%%DATADIR%%/ckt/coupler.ckt
+%%DATADIR%%/ckt/datafile.ckt
+%%DATADIR%%/ckt/filter.ckt
+%%DATADIR%%/ckt/highpass.ckt
+%%DATADIR%%/ckt/nec70000.s2p
+%%DATADIR%%/ckt/stripline.ckt
+%%DATADIR%%/ckt/test.ckt
+%%DATADIR%%/help/analysing.html
+%%DATADIR%%/help/components.html
+%%DATADIR%%/help/disclaimer.html
+%%DATADIR%%/help/frequency.html
+%%DATADIR%%/help/index.html
+%%DATADIR%%/help/license.html
+%%DATADIR%%/help/models/block.html
+%%DATADIR%%/help/models/block.png
+%%DATADIR%%/help/models/capacitor.html
+%%DATADIR%%/help/models/capacitor.png
+%%DATADIR%%/help/models/coupled.png
+%%DATADIR%%/help/models/gyrator.html
+%%DATADIR%%/help/models/gyrator.png
+%%DATADIR%%/help/models/idealcoupled.html
+%%DATADIR%%/help/models/inductor.html
+%%DATADIR%%/help/models/inductor.png
+%%DATADIR%%/help/models/inductorq.html
+%%DATADIR%%/help/models/inductorq.png
+%%DATADIR%%/help/models/port.html
+%%DATADIR%%/help/models/port.png
+%%DATADIR%%/help/models/resistor.html
+%%DATADIR%%/help/models/resistor.png
+%%DATADIR%%/help/models/tlin2port.html
+%%DATADIR%%/help/models/tlin2port.png
+%%DATADIR%%/help/models/tlin4port.html
+%%DATADIR%%/help/models/tlin4port.png
+%%DATADIR%%/help/models/tlinphysical.html
+%%DATADIR%%/help/models/tlinphysical.png
+%%DATADIR%%/help/models/vccs.html
+%%DATADIR%%/help/models/vccs.png
+%%DATADIR%%/help/navigation.html
+%%DATADIR%%/help/outputs.html
+%%DATADIR%%/help/placing.html
+%%DATADIR%%/help/schematics.html
+%%DATADIR%%/help/substrates.html
+%%DATADIR%%/help/units.html
+%%DATADIR%%/help/variables.html
+%%DATADIR%%/help/what_is.html
+%%DATADIR%%/messages/vipec_fr.qm
+%%DATADIR%%/messages/vipec_ger.qm
+%%DATADIR%%/messages/vipec_pt.qm
+%%DATADIR%%/vipec.cfg
+@dirrm %%DATADIR%%/messages
+@dirrm %%DATADIR%%/help/models
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%/ckt
+@dirrm %%DATADIR%%