Date: Sun, 22 Aug 2004 02:00:18 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70784: Update port: cad/vipec Message-ID: <20040822020018.39c4c3f1.tkato432@yahoo.com> Resent-Message-ID: <200408211710.i7LHA82C058652@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70784
>Category: ports
>Synopsis: Update port: cad/vipec
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 21 17:10:08 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.10-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Fix build on -current after gcc 3.4 import
New file:
files/patch-HelpWindow.cpp
files/patch-Setup.cpp
files/patch-include::Component.h
files/patch-include::DataVector.h
files/patch-include::Schematic.h
Remove file:
files/vipec.sh.in
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/cad/vipec/Makefile cad/vipec/Makefile
--- /usr/ports/cad/vipec/Makefile Fri Feb 27 18:55:23 2004
+++ cad/vipec/Makefile Sat Aug 21 00:28:06 2004
@@ -8,7 +8,7 @@
PORTNAME= vipec
PORTVERSION= 3.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -23,19 +23,14 @@
USE_QT_VER= 3
USE_GMAKE= yes
-MAKE_ENV= QTDIR="${QT_PREFIX}"
-
-post-patch:
- @${SED} -e 's:@PREFIX@:${PREFIX}:g' \
- ${FILESDIR}/vipec.sh.in > ${WRKSRC}/../vipec.sh
+MAKE_ENV= QTDIR="${QT_PREFIX}" VIPECHOME="${DATADIR}"
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
+ ${INSTALL_PROGRAM} ${WRKSRC}/../vipec ${PREFIX}/bin/vipec
@${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/../vipec.cfg ${DATADIR}
@${MKDIR} ${DATADIR}/ckt
diff -urN /usr/ports/cad/vipec/files/patch-HelpWindow.cpp cad/vipec/files/patch-HelpWindow.cpp
--- /usr/ports/cad/vipec/files/patch-HelpWindow.cpp Thu Jan 1 09:00:00 1970
+++ cad/vipec/files/patch-HelpWindow.cpp Fri Aug 20 23:49:20 2004
@@ -0,0 +1,18 @@
+--- HelpWindow.cpp.orig Thu Oct 2 04:40:40 2003
++++ HelpWindow.cpp Fri Aug 20 23:49:10 2004
+@@ -36,7 +36,15 @@
+ QString vipecHome = QString(getenv("VIPECHOME"));
+ if ( vipecHome.isEmpty() )
+ {
++#ifdef VIPECHOME
++ vipecHome = QString(VIPECHOME);
++ if (vipecHome.isEmpty())
++ {
++ vipecHome = dir.absPath();
++ }
++#else
+ vipecHome = dir.absPath();
++#endif
+ }
+ home_ = vipecHome + "/help/index.html";
+ const QStringList currentDir(".");
diff -urN /usr/ports/cad/vipec/files/patch-Setup.cpp cad/vipec/files/patch-Setup.cpp
--- /usr/ports/cad/vipec/files/patch-Setup.cpp Thu Jan 1 09:00:00 1970
+++ cad/vipec/files/patch-Setup.cpp Fri Aug 20 23:50:01 2004
@@ -0,0 +1,22 @@
+--- Setup.cpp.orig Fri Oct 3 09:31:11 2003
++++ Setup.cpp Fri Aug 20 23:49:30 2004
+@@ -163,8 +163,17 @@
+ vipecHome_ = QString(getenv("VIPECHOME"));
+ if ( vipecHome_.isEmpty() )
+ {
+- vipecHome_ = dir.absPath();
+- Logger::warning("VIPECHOME not set, assuming " + vipecHome_);
++#ifdef VIPECHOME
++ vipecHome_ = QString(VIPECHOME);
++ if (vipecHome_.isEmpty())
++ {
++ vipecHome_ = dir.absPath();
++ Logger::warning("VIPECHOME not set, assuming " + vipecHome_);
++ }
++#else
++ vipecHome_ = dir.absPath();
++ Logger::warning("VIPECHOME not set, assuming " + vipecHome_);
++#endif
+ }
+ helpFilename_ = vipecHome_ + "/help/index.html";
+ configFilename_ = vipecHome_ + "/vipec.cfg";
diff -urN /usr/ports/cad/vipec/files/patch-include::Component.h cad/vipec/files/patch-include::Component.h
--- /usr/ports/cad/vipec/files/patch-include::Component.h Thu Jan 1 09:00:00 1970
+++ cad/vipec/files/patch-include::Component.h Fri Aug 20 22:15:14 2004
@@ -0,0 +1,24 @@
+--- ../include/Component.h.orig Fri Mar 30 18:50:58 2001
++++ ../include/Component.h Fri Aug 20 21:55:50 2004
+@@ -93,6 +93,10 @@
+
+ static int getNodeSize();
+
++ //Not implemented
++ Component( const Component& c );
++ Component& operator=( const Component& c );
++
+ protected:
+ virtual void drawSymbol(QPainter*) = 0;
+ CircuitNode* addNode(int, int, bool isPortNode = FALSE,
+@@ -106,10 +110,6 @@
+ void copyMemberData( Component& source );
+
+ private:
+- //Not implemented
+- Component( const Component& c );
+- Component& operator=( const Component& c );
+-
+ void drawAttributes(QPainter* painter);
+
+ protected:
diff -urN /usr/ports/cad/vipec/files/patch-include::DataVector.h cad/vipec/files/patch-include::DataVector.h
--- /usr/ports/cad/vipec/files/patch-include::DataVector.h Thu Jan 1 09:00:00 1970
+++ cad/vipec/files/patch-include::DataVector.h Fri Aug 20 22:15:26 2004
@@ -0,0 +1,10 @@
+--- ../include/DataVector.h.orig Tue Feb 13 06:23:19 2001
++++ ../include/DataVector.h Fri Aug 20 21:56:44 2004
+@@ -43,7 +43,6 @@
+ uint getSize();
+ void addPoint(TComplex value);
+
+-private:
+ DataVector(const DataVector& vector);
+
+
diff -urN /usr/ports/cad/vipec/files/patch-include::Schematic.h cad/vipec/files/patch-include::Schematic.h
--- /usr/ports/cad/vipec/files/patch-include::Schematic.h Thu Jan 1 09:00:00 1970
+++ cad/vipec/files/patch-include::Schematic.h Fri Aug 20 22:15:35 2004
@@ -0,0 +1,13 @@
+--- ../include/Schematic.h.orig Fri Mar 30 18:50:58 2001
++++ ../include/Schematic.h Fri Aug 20 21:48:46 2004
+@@ -91,9 +91,9 @@
+ QList<DataPoint>& getZData();
+ TComplex getPortImpedance( uint port );
+
+-private:
+ Schematic( const Schematic& );
+
++private:
+ int distanceFromLine( const QPoint& point,
+ const CircuitLine& line,
+ bool orthoganalOnly );
diff -urN /usr/ports/cad/vipec/files/patch-vipec.pro cad/vipec/files/patch-vipec.pro
--- /usr/ports/cad/vipec/files/patch-vipec.pro Tue Jan 27 04:56:58 2004
+++ cad/vipec/files/patch-vipec.pro Sat Aug 21 00:04:33 2004
@@ -1,11 +1,13 @@
--- vipec.pro.orig Thu Oct 2 04:58:40 2003
-+++ vipec.pro Mon Jan 26 00:17:52 2004
-@@ -8,7 +8,7 @@
++++ vipec.pro Sat Aug 21 00:04:24 2004
+@@ -8,8 +8,8 @@
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
+-DEFINES = QT_FATAL_ASSERT
++CONFIG += qt warn_on exceptions stl rtti
++DEFINES += QT_FATAL_ASSERT VIPECHOME=\"$(VIPECHOME)\"
RC_FILE = vipec.rc
HEADERS = \
+ ../include/Logger.h \
diff -urN /usr/ports/cad/vipec/files/vipec.sh.in cad/vipec/files/vipec.sh.in
--- /usr/ports/cad/vipec/files/vipec.sh.in Tue Jan 27 04:56:58 2004
+++ cad/vipec/files/vipec.sh.in Thu Jan 1 09:00:00 1970
@@ -1,4 +0,0 @@
-#!/bin/sh
-VIPECHOME=@PREFIX@/share/vipec/
-export VIPECHOME
-exec "@PREFIX@/bin/vipec.exec" "$@"
diff -urN /usr/ports/cad/vipec/pkg-plist cad/vipec/pkg-plist
--- /usr/ports/cad/vipec/pkg-plist Tue Jan 27 12:52:18 2004
+++ cad/vipec/pkg-plist Sat Aug 21 00:25:06 2004
@@ -1,5 +1,4 @@
bin/vipec
-bin/vipec.exec
%%DATADIR%%/ckt/amplifier.ckt
%%DATADIR%%/ckt/bandpass.ckt
%%DATADIR%%/ckt/bandpass.s2p
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040822020018.39c4c3f1.tkato432>