Attachment #70735 for bug #103142

View | Details | Raw Unified | Return to bug 103142
Collapse All | Expand All




#

PORTNAME=	qucs
PORTVERSION=	0.0.10
CATEGORIES=	cad science
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

USE_GMAKE=	yes
GNU_CONFIGURE=	yes

MAN1=		qucs.1 qucsator.1 qucsattenuator.1 qucsconv.1 qucsdigi.1 \
		qucsedit.1 qucsfilter.1 qucshelp.1 qucslib.1 qucstrans.1

.include <bsd.port.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>

Lines 1-3 Link Here

(-)cad/qucs/distinfo (-3 / +3 lines)
1	MD5 (qucs-0.0.9.tar.gz) = 863eba475f35d006325f9d49671a2031	1	MD5 (qucs-0.0.10.tar.gz) = e5647740dbfbbbf9cf8ea086a05d84b3
2	SHA256 (qucs-0.0.9.tar.gz) = 5ea6256ca5e2194a84a8710720b68d3a246d10c83b858668a521ecfc89d34822	2	SHA256 (qucs-0.0.10.tar.gz) = 182677223700a3c7d0d160cbdae94ae30b81d6a240b411514fc1709cf8460222
3	SIZE (qucs-0.0.9.tar.gz) = 2400770	3	SIZE (qucs-0.0.10.tar.gz) = 2622507




--- 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++) {

Lines 1-5 Link Here

(-)cad/qucs/pkg-plist (-1 / +12 lines)
1	bin/qucs	1	bin/qucs
2	bin/qucsator	2	bin/qucsator
		3	bin/qucsattenuator
3	bin/qucsconv	4	bin/qucsconv
4	bin/qucsdigi	5	bin/qucsdigi
5	bin/qucsedit	6	bin/qucsedit
Lines 14-20 Link Here
14	%%DATADIR%%/bitmaps/amplifier.png	15	%%DATADIR%%/bitmaps/amplifier.png
15	%%DATADIR%%/bitmaps/and.png	16	%%DATADIR%%/bitmaps/and.png
16	%%DATADIR%%/bitmaps/arrow.png	17	%%DATADIR%%/bitmaps/arrow.png
		18	%%DATADIR%%/bitmaps/att_bridge.png
		19	%%DATADIR%%/bitmaps/att_pi.png
		20	%%DATADIR%%/bitmaps/att_tee.png
17	%%DATADIR%%/bitmaps/attenuator.png	21	%%DATADIR%%/bitmaps/attenuator.png
		22	%%DATADIR%%/bitmaps/back.png
18	%%DATADIR%%/bitmaps/biast.png	23	%%DATADIR%%/bitmaps/biast.png
19	%%DATADIR%%/bitmaps/big.button.qucs.xpm	24	%%DATADIR%%/bitmaps/big.button.qucs.xpm
20	%%DATADIR%%/bitmaps/big.qucs.xpm	25	%%DATADIR%%/bitmaps/big.qucs.xpm
Lines 60-70 Link Here
60	%%DATADIR%%/bitmaps/filesaveall.png	65	%%DATADIR%%/bitmaps/filesaveall.png
61	%%DATADIR%%/bitmaps/filledellipse.png	66	%%DATADIR%%/bitmaps/filledellipse.png
62	%%DATADIR%%/bitmaps/filledrect.png	67	%%DATADIR%%/bitmaps/filledrect.png
		68	%%DATADIR%%/bitmaps/forward.png
63	%%DATADIR%%/bitmaps/gear.png	69	%%DATADIR%%/bitmaps/gear.png
64	%%DATADIR%%/bitmaps/gnd.png	70	%%DATADIR%%/bitmaps/gnd.png
65	%%DATADIR%%/bitmaps/ground.png	71	%%DATADIR%%/bitmaps/ground.png
66	%%DATADIR%%/bitmaps/gyrator.png	72	%%DATADIR%%/bitmaps/gyrator.png
67	%%DATADIR%%/bitmaps/hb.png	73	%%DATADIR%%/bitmaps/hb.png
		74	%%DATADIR%%/bitmaps/home.png
68	%%DATADIR%%/bitmaps/inductor.png	75	%%DATADIR%%/bitmaps/inductor.png
69	%%DATADIR%%/bitmaps/inverter.png	76	%%DATADIR%%/bitmaps/inverter.png
70	%%DATADIR%%/bitmaps/iprobe.png	77	%%DATADIR%%/bitmaps/iprobe.png
Lines 90-95 Link Here
90	%%DATADIR%%/bitmaps/mutual.png	97	%%DATADIR%%/bitmaps/mutual.png
91	%%DATADIR%%/bitmaps/mutual2.png	98	%%DATADIR%%/bitmaps/mutual2.png
92	%%DATADIR%%/bitmaps/nand.png	99	%%DATADIR%%/bitmaps/nand.png
		100	%%DATADIR%%/bitmaps/next.png
93	%%DATADIR%%/bitmaps/nfet.png	101	%%DATADIR%%/bitmaps/nfet.png
94	%%DATADIR%%/bitmaps/nmosfet.png	102	%%DATADIR%%/bitmaps/nmosfet.png
95	%%DATADIR%%/bitmaps/nmosfet_sub.png	103	%%DATADIR%%/bitmaps/nmosfet_sub.png
Lines 103-108 Link Here
103	%%DATADIR%%/bitmaps/npn.png	111	%%DATADIR%%/bitmaps/npn.png
104	%%DATADIR%%/bitmaps/npnsub.png	112	%%DATADIR%%/bitmaps/npnsub.png
105	%%DATADIR%%/bitmaps/opamp.png	113	%%DATADIR%%/bitmaps/opamp.png
		114	%%DATADIR%%/bitmaps/optimize.png
106	%%DATADIR%%/bitmaps/or.png	115	%%DATADIR%%/bitmaps/or.png
107	%%DATADIR%%/bitmaps/pfet.png	116	%%DATADIR%%/bitmaps/pfet.png
108	%%DATADIR%%/bitmaps/pm_mod.png	117	%%DATADIR%%/bitmaps/pm_mod.png
Lines 114-120 Link Here
114	%%DATADIR%%/bitmaps/polar.png	123	%%DATADIR%%/bitmaps/polar.png
115	%%DATADIR%%/bitmaps/polarsmith.png	124	%%DATADIR%%/bitmaps/polarsmith.png
116	%%DATADIR%%/bitmaps/port.png	125	%%DATADIR%%/bitmaps/port.png
		126	%%DATADIR%%/bitmaps/previous.png
117	%%DATADIR%%/bitmaps/pshifter.png	127	%%DATADIR%%/bitmaps/pshifter.png
		128	%%DATADIR%%/bitmaps/quit.png
118	%%DATADIR%%/bitmaps/rebuild.png	129	%%DATADIR%%/bitmaps/rebuild.png
119	%%DATADIR%%/bitmaps/rect.png	130	%%DATADIR%%/bitmaps/rect.png
120	%%DATADIR%%/bitmaps/rect3d.png	131	%%DATADIR%%/bitmaps/rect3d.png
Lines 278-281 Link Here
278	@dirrm %%DATADIR%%/docs/de	289	@dirrm %%DATADIR%%/docs/de
279	@dirrm %%DATADIR%%/docs	290	@dirrm %%DATADIR%%/docs
280	@dirrm %%DATADIR%%/bitmaps	291	@dirrm %%DATADIR%%/bitmaps
281	@dirrm %%DATADIR%%/	292	@dirrm %%DATADIR%%

Return to bug 103142

Lines 6-12 Link Here

(-)cad/qucs/Makefile (-14 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= qucs	8	PORTNAME= qucs
9	PORTVERSION= 0.0.9	9	PORTVERSION= 0.0.10
10	CATEGORIES= cad science	10	CATEGORIES= cad science
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 19-35 Link Here
19	USE_GMAKE= yes	19	USE_GMAKE= yes
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21		21
22	MAN1= qucs.1 qucsator.1 qucsconv.1 qucsdigi.1 qucsedit.1 \	22	MAN1= qucs.1 qucsator.1 qucsattenuator.1 qucsconv.1 qucsdigi.1 \
23	qucsfilter.1 qucshelp.1 qucslib.1 qucstrans.1	23	qucsedit.1 qucsfilter.1 qucshelp.1 qucslib.1 qucstrans.1
24		24
25	.include <bsd.port.pre.mk>	25	.include <bsd.port.mk>
26
27	.if ${OSVERSION} < 500000
28	EXTRA_PATCHES= ${FILESDIR}/extrapatch-qucs-core_src_evaluate.cpp
29	.endif
30
31	post-patch:
32	@${REINPLACE_CMD} -e 's#qucsdigi\.bat##g' \
33	${WRKSRC}/qucs/Makefile*
34
35	.include <bsd.port.post.mk>

Lines 1-46 Link Here

(-)cad/qucs/files/extrapatch-qucs-core_src_evaluate.cpp (-46 lines)
1	--- qucs-core/src/evaluate.cpp.orig Sat May 27 11:46:33 2006
2	+++ qucs-core/src/evaluate.cpp Tue Aug 8 00:52:02 2006
3	@@ -113,6 +113,7 @@
4	#define _DEFR() constant * res = new constant (TAG_RANGE);
5	#define _RETD(var) res->d = (var); return res;
6	#define _RETC(var) res->c = new complex (var); return res;
7	+#define _RETV2() res->v = new vector (); return res;
8	#define _RETV(var) res->v = new vector (var); return res;
9	#define _RETM(var) res->m = new matrix (var); return res;
10	#define _RETMV(var) res->mv = new matvec (var); return res;
11	@@ -3246,7 +3247,7 @@
12	if (n < 1) {
13	THROW_MATH_EXCEPTION ("runavg: number n to be averaged over must be "
14	"larger or equal 1");
15	- _RETV ();
16	+ _RETV2 ();
17	}
18	_RETV (runavg (rect (x, 0), n));
19	}
20	@@ -3258,7 +3259,7 @@
21	if (n < 1) {
22	THROW_MATH_EXCEPTION ("runavg: number n to be averaged over must be "
23	"larger or equal 1");
24	- _RETV ();
25	+ _RETV2 ();
26	}
27	_RETV (runavg (*x, n));
28	}
29	@@ -3271,7 +3272,7 @@
30	THROW_MATH_EXCEPTION ("runavg: number n to be averaged over must be "
31	"larger or equal 1 and less or equal than the "
32	"number of vector elements");
33	- _RETV ();
34	+ _RETV2 ();
35	}
36	_RETV (runavg (*x, n));
37	}
38	@@ -3285,7 +3286,7 @@
39	nr_double_t sval = 0.0;
40	if (size <= 0) {
41	THROW_MATH_EXCEPTION ("kbd: vector length must be greater than zero");
42	- _RETV ();
43	+ _RETV2 ();
44	}
45	vector v (size);
46	for (i = 0; i < size / 2; i++) {