diff options
author | dmcmahill <dmcmahill> | 2003-02-06 00:41:12 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill> | 2003-02-06 00:41:12 +0000 |
commit | ea72e183fc84626673d16fcd08137b0d652fd7ed (patch) | |
tree | 390d2379ccce620c1c3fb712e604072acab489cd /cad/vipec/patches | |
parent | 1e71e6cae93cc7620c52d2b5cca5755ce9da0b6c (diff) | |
download | pkgsrc-ea72e183fc84626673d16fcd08137b0d652fd7ed.tar.gz |
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.
Diffstat (limited to 'cad/vipec/patches')
-rw-r--r-- | cad/vipec/patches/patch-aa | 65 | ||||
-rw-r--r-- | cad/vipec/patches/patch-ab | 11 | ||||
-rw-r--r-- | cad/vipec/patches/patch-ac | 29 |
3 files changed, 12 insertions, 93 deletions
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 |