4 files changed, 19 insertions, 64 deletions

diff --git a/cad/qucs/Makefile b/cad/qucs/Makefile
index c26a91c7d60a..6f3fb363437c 100644
--- a/cad/qucs/Makefile
+++ b/cad/qucs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qucs
-PORTVERSION=	0.0.9
+PORTVERSION=	0.0.10
 CATEGORIES=	cad science
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,17 +19,7 @@ USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-MAN1=		qucs.1 qucsator.1 qucsconv.1 qucsdigi.1 qucsedit.1 \
-		qucsfilter.1 qucshelp.1 qucslib.1 qucstrans.1
+MAN1=		qucs.1 qucsator.1 qucsattenuator.1 qucsconv.1 qucsdigi.1 \
+		qucsedit.1 qucsfilter.1 qucshelp.1 qucslib.1 qucstrans.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-qucs-core_src_evaluate.cpp
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's#qucsdigi\.bat##g' \
-	                  ${WRKSRC}/qucs/Makefile*
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/qucs/distinfo b/cad/qucs/distinfo
index 8d832ddc428c..cf0f41668a67 100644
--- a/cad/qucs/distinfo
+++ b/cad/qucs/distinfo
@@ -1,3 +1,3 @@
-MD5 (qucs-0.0.9.tar.gz) = 863eba475f35d006325f9d49671a2031
-SHA256 (qucs-0.0.9.tar.gz) = 5ea6256ca5e2194a84a8710720b68d3a246d10c83b858668a521ecfc89d34822
-SIZE (qucs-0.0.9.tar.gz) = 2400770
+MD5 (qucs-0.0.10.tar.gz) = e5647740dbfbbbf9cf8ea086a05d84b3
+SHA256 (qucs-0.0.10.tar.gz) = 182677223700a3c7d0d160cbdae94ae30b81d6a240b411514fc1709cf8460222
+SIZE (qucs-0.0.10.tar.gz) = 2622507
diff --git a/cad/qucs/files/extrapatch-qucs-core_src_evaluate.cpp b/cad/qucs/files/extrapatch-qucs-core_src_evaluate.cpp
deleted file mode 100644
index 8a4ba273c825..000000000000
--- a/cad/qucs/files/extrapatch-qucs-core_src_evaluate.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- qucs-core/src/evaluate.cpp.orig	Sat May 27 11:46:33 2006
-+++ qucs-core/src/evaluate.cpp	Tue Aug  8 00:52:02 2006
-@@ -113,6 +113,7 @@
- #define _DEFR() constant * res = new constant (TAG_RANGE);
- #define _RETD(var) res->d = (var); return res;
- #define _RETC(var) res->c = new complex (var); return res;
-+#define _RETV2() res->v = new vector (); return res;
- #define _RETV(var) res->v = new vector (var); return res;
- #define _RETM(var) res->m = new matrix (var); return res;
- #define _RETMV(var) res->mv = new matvec (var); return res;
-@@ -3246,7 +3247,7 @@
-   if (n < 1) {
-     THROW_MATH_EXCEPTION ("runavg: number n to be averaged over must be "
- 			  "larger or equal 1");
--    _RETV ();
-+    _RETV2 ();
-   }
-   _RETV (runavg (rect (x, 0), n));
- }
-@@ -3258,7 +3259,7 @@
-   if (n < 1) {
-     THROW_MATH_EXCEPTION ("runavg: number n to be averaged over must be "
- 			  "larger or equal 1");
--    _RETV ();
-+    _RETV2 ();
-   }
-   _RETV (runavg (*x, n));
- }
-@@ -3271,7 +3272,7 @@
-     THROW_MATH_EXCEPTION ("runavg: number n to be averaged over must be "
- 			  "larger or equal 1 and less or equal than the "
- 			  "number of vector elements");
--    _RETV ();
-+    _RETV2 ();
-   }
-   _RETV (runavg (*x, n));
- }
-@@ -3285,7 +3286,7 @@
-   nr_double_t sval = 0.0;
-   if (size <= 0) {
-     THROW_MATH_EXCEPTION ("kbd: vector length must be greater than zero");
--    _RETV ();
-+    _RETV2 ();
-   }
-   vector v (size);
-   for (i = 0; i < size / 2; i++) {
diff --git a/cad/qucs/pkg-plist b/cad/qucs/pkg-plist
index d82a5402d296..2d1da28ec365 100644
--- a/cad/qucs/pkg-plist
+++ b/cad/qucs/pkg-plist
@@ -1,5 +1,6 @@
 bin/qucs
 bin/qucsator
+bin/qucsattenuator
 bin/qucsconv
 bin/qucsdigi
 bin/qucsedit
@@ -14,7 +15,11 @@ bin/qucstrans
 %%DATADIR%%/bitmaps/amplifier.png
 %%DATADIR%%/bitmaps/and.png
 %%DATADIR%%/bitmaps/arrow.png
+%%DATADIR%%/bitmaps/att_bridge.png
+%%DATADIR%%/bitmaps/att_pi.png
+%%DATADIR%%/bitmaps/att_tee.png
 %%DATADIR%%/bitmaps/attenuator.png
+%%DATADIR%%/bitmaps/back.png
 %%DATADIR%%/bitmaps/biast.png
 %%DATADIR%%/bitmaps/big.button.qucs.xpm
 %%DATADIR%%/bitmaps/big.qucs.xpm
@@ -60,11 +65,13 @@ bin/qucstrans
 %%DATADIR%%/bitmaps/filesaveall.png
 %%DATADIR%%/bitmaps/filledellipse.png
 %%DATADIR%%/bitmaps/filledrect.png
+%%DATADIR%%/bitmaps/forward.png
 %%DATADIR%%/bitmaps/gear.png
 %%DATADIR%%/bitmaps/gnd.png
 %%DATADIR%%/bitmaps/ground.png
 %%DATADIR%%/bitmaps/gyrator.png
 %%DATADIR%%/bitmaps/hb.png
+%%DATADIR%%/bitmaps/home.png
 %%DATADIR%%/bitmaps/inductor.png
 %%DATADIR%%/bitmaps/inverter.png
 %%DATADIR%%/bitmaps/iprobe.png
@@ -90,6 +97,7 @@ bin/qucstrans
 %%DATADIR%%/bitmaps/mutual.png
 %%DATADIR%%/bitmaps/mutual2.png
 %%DATADIR%%/bitmaps/nand.png
+%%DATADIR%%/bitmaps/next.png
 %%DATADIR%%/bitmaps/nfet.png
 %%DATADIR%%/bitmaps/nmosfet.png
 %%DATADIR%%/bitmaps/nmosfet_sub.png
@@ -103,6 +111,7 @@ bin/qucstrans
 %%DATADIR%%/bitmaps/npn.png
 %%DATADIR%%/bitmaps/npnsub.png
 %%DATADIR%%/bitmaps/opamp.png
+%%DATADIR%%/bitmaps/optimize.png
 %%DATADIR%%/bitmaps/or.png
 %%DATADIR%%/bitmaps/pfet.png
 %%DATADIR%%/bitmaps/pm_mod.png
@@ -114,7 +123,9 @@ bin/qucstrans
 %%DATADIR%%/bitmaps/polar.png
 %%DATADIR%%/bitmaps/polarsmith.png
 %%DATADIR%%/bitmaps/port.png
+%%DATADIR%%/bitmaps/previous.png
 %%DATADIR%%/bitmaps/pshifter.png
+%%DATADIR%%/bitmaps/quit.png
 %%DATADIR%%/bitmaps/rebuild.png
 %%DATADIR%%/bitmaps/rect.png
 %%DATADIR%%/bitmaps/rect3d.png
@@ -278,4 +289,4 @@ bin/qucstrans
 @dirrm %%DATADIR%%/docs/de
 @dirrm %%DATADIR%%/docs
 @dirrm %%DATADIR%%/bitmaps
-@dirrm %%DATADIR%%/
+@dirrm %%DATADIR%%