From 63528c98d5002f448527fe41645f149959920fe1 Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Tue, 30 Nov 2004 00:27:35 +0000 Subject: update to transcalc-0.14 Changes since 0.13: * Fixed multiline string problems in help.h which prevented compilation in gcc >3.2 * Moved build environment automake, autoheader, autoconf to a more modern version (autoconf support is for >2.50). * Ported transcalc to gtk2.0, which means that the dependency on gdk-imlib is now gone. gtk2.0 included gdk-imlib natively. * Corrected some minor bugs related to config file * Changed speed of light symbol from C to C0 * Modified configure.in to work also with Mingw32 (and hopefully cygwin) * Added fnmatch.c and fnmatch.h (needed for Win32) * Added program version number to saved files * Updated speed of light constant (!) and changed its name from C to C0 to avoid clash with variables in other f iles. Updated vacuum dielectric constant * Moved examples from src directory to a separate examples dir * Clean-up most warnings during compilation * Upon running for first time, $HOME/.transcalc dir will be created with config file and save file * Units default values now saved in config file * Upon exit, last transmission line values remembered in save file * Made some slight changes in gui setup * Added coupled microstrip image * Update manpage --- cad/transcalc/Makefile | 9 ++++----- cad/transcalc/distinfo | 12 ++++-------- cad/transcalc/patches/patch-aa | 10 ++++++---- cad/transcalc/patches/patch-ab | 19 ------------------- cad/transcalc/patches/patch-ac | 16 ---------------- cad/transcalc/patches/patch-ad | 12 ------------ cad/transcalc/patches/patch-ae | 18 ------------------ 7 files changed, 14 insertions(+), 82 deletions(-) delete mode 100644 cad/transcalc/patches/patch-ab delete mode 100644 cad/transcalc/patches/patch-ac delete mode 100644 cad/transcalc/patches/patch-ad delete mode 100644 cad/transcalc/patches/patch-ae (limited to 'cad/transcalc') diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile index 18cb7da16b2..7b360d66e2e 100644 --- a/cad/transcalc/Makefile +++ b/cad/transcalc/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2004/10/03 00:13:13 tv Exp $ +# $NetBSD: Makefile,v 1.10 2004/11/30 00:27:35 dmcmahill Exp $ # -DISTNAME= transcalc-0.13 -PKGREVISION= 4 +DISTNAME= transcalc-0.14 CATEGORIES= cad MASTER_SITES= http://transcalc.sourceforge.net/ #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=transcalc/} @@ -15,6 +14,6 @@ GNU_CONFIGURE= YES USE_BUILDLINK3= YES USE_GNU_TOOLS+= make -.include "../../x11/gtk/buildlink3.mk" -.include "../../graphics/imlib/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +#.include "../../graphics/imlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/transcalc/distinfo b/cad/transcalc/distinfo index a72384b0322..5863e8f3926 100644 --- a/cad/transcalc/distinfo +++ b/cad/transcalc/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.2 2004/03/21 21:14:03 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3 2004/11/30 00:27:35 dmcmahill Exp $ -SHA1 (transcalc-0.13.tar.gz) = c0fe6ebca5efa44a03e6f5790cac83fd78acf6b0 -Size (transcalc-0.13.tar.gz) = 125666 bytes -SHA1 (patch-aa) = 620596687c96f4e5ab453ca77949643d9c9960ad -SHA1 (patch-ab) = 8be1a7ecaf9ed5083720a192f416c09abb6982d0 -SHA1 (patch-ac) = 9d00660ab3dd801644bb103181375814e3b4095d -SHA1 (patch-ad) = 7904ec6e250da56bad3703a77c8a606f42511da2 -SHA1 (patch-ae) = 3a0f06309cf58c0af4c2bc68a8ef042441ed993b +SHA1 (transcalc-0.14.tar.gz) = bb860b9caf30acfd446cafbacfb14ad99f1f4a58 +Size (transcalc-0.14.tar.gz) = 186434 bytes +SHA1 (patch-aa) = 809bbf0ca7429bed360a134562ecabe2c199f7df diff --git a/cad/transcalc/patches/patch-aa b/cad/transcalc/patches/patch-aa index f60a618bdda..403952ad5f8 100644 --- a/cad/transcalc/patches/patch-aa +++ b/cad/transcalc/patches/patch-aa @@ -1,14 +1,16 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/03/23 12:25:03 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.2 2004/11/30 00:27:35 dmcmahill Exp $ fixes minor bug in the computation. Correct constant (0.7913) found in original reference for this model. ---- src/c_microstrip.c.orig Tue May 28 15:59:49 2002 -+++ src/c_microstrip.c Wed Jan 15 05:32:42 2003 -@@ -217,5 +235,5 @@ +--- src/c_microstrip.c.orig Thu Jul 25 19:48:39 2002 ++++ src/c_microstrip.c +@@ -520,7 +520,7 @@ static void er_eff_freq(c_microstrip * c + er_eff = c_ms->er_eff_o_0; P_8 = 0.7168 * (1.0 + 1.076 / (1.0 + 0.0576 * (er - 1.0))); - P_9 = P_8 - 0.7193 * (1.0 - exp(-pow(f_n / 20.0, 1.424))) * atan(2.481 * pow(er / 8.0, 0.946)); + P_9 = P_8 - 0.7913 * (1.0 - exp(-pow(f_n / 20.0, 1.424))) * atan(2.481 * pow(er / 8.0, 0.946)); P_10 = 0.242 * pow(er - 1.0, 0.55); P_11 = 0.6366 * (exp(-0.3401 * f_n) - 1.0) * atan(1.263 * pow(u / 3.0, 1.629)); + P_12 = P_9 + (1.0 - P_9) / (1.0 + 1.183 * pow(u, 1.376)); diff --git a/cad/transcalc/patches/patch-ab b/cad/transcalc/patches/patch-ab deleted file mode 100644 index 72b79554a7a..00000000000 --- a/cad/transcalc/patches/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/03/23 12:25:03 dmcmahill Exp $ - ---- src/transcalc.c.orig Mon Jul 15 07:20:38 2002 -+++ src/transcalc.c -@@ -170,10 +170,10 @@ read_config_file (void) - /* make sure it terminates with '\0' */ - *end = '\0'; - -- sscanf(ip,"%s %d\n",tmp_str1,&freq_unit); -- fscanf(fp,"%s %d\n",tmp_str1,&length_unit); -- fscanf(fp, "%s %d\n",tmp_str1,&res_unit); -- fscanf(fp, "%s %d\n",tmp_str1,&ang_unit); -+ sscanf(ip,"%s %hd\n",tmp_str1,&freq_unit); -+ fscanf(fp,"%s %hd\n",tmp_str1,&length_unit); -+ fscanf(fp, "%s %hd\n",tmp_str1,&res_unit); -+ fscanf(fp, "%s %hd\n",tmp_str1,&ang_unit); - } - } - } diff --git a/cad/transcalc/patches/patch-ac b/cad/transcalc/patches/patch-ac deleted file mode 100644 index 1c653d4d517..00000000000 --- a/cad/transcalc/patches/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/03/23 12:25:03 dmcmahill Exp $ - ---- src/setup_body.c.orig Mon Jul 15 07:38:37 2002 -+++ src/setup_body.c -@@ -68,6 +68,11 @@ transtype_int () - if ((strcmp(text,"Rectangular Waveguide")) == 0) return RECTWAVEGUIDE; - if ((strcmp(text,"Coaxial Line")) == 0) return COAX; - if ((strcmp(text,"Coupled Microstrip")) == 0) return C_MICROSTRIP; -+ fprintf(stderr, "Error: transtype_int(). Unknown line type \"%s\"\n", text); -+ exit(1); -+ } else { -+ fprintf(stderr, "Error: transtype_int(). gtk_entry_get_text returned NULL pointer\n"); -+ exit(1); - } - } - diff --git a/cad/transcalc/patches/patch-ad b/cad/transcalc/patches/patch-ad deleted file mode 100644 index 3f81d2e7ed7..00000000000 --- a/cad/transcalc/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2003/03/23 12:25:03 dmcmahill Exp $ - ---- src/unitscombo.c.orig Mon Jul 15 07:46:36 2002 -+++ src/unitscombo.c -@@ -31,6 +31,7 @@ USA. - #include - - #include "transcalc.h" -+#include "unitscombo.h" - - gchar *length_unit_name[] = { "mil", - "cm", diff --git a/cad/transcalc/patches/patch-ae b/cad/transcalc/patches/patch-ae deleted file mode 100644 index b10e91d4cb6..00000000000 --- a/cad/transcalc/patches/patch-ae +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2004/03/21 21:14:03 dmcmahill Exp $ - ---- src/help.h.orig Mon Jul 15 12:02:52 2002 -+++ src/help.h -@@ -63,11 +63,11 @@ coupled microstrips\n\ - " - - #define ABOUTTEXT \ --"\n -+"\n\ - Gopal Narayanan \n\ - \n\ - Copyright (C) 2001-2002 Gopal Narayanan \n\ --Copyright (C) 2002 Claudio Girardi -+Copyright (C) 2002 Claudio Girardi \n\ - \n\ - This program is free software; you can redistribute it and/or\n\ - modify it under the terms of the GNU General Public License\n\ -- cgit v1.2.3