From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 8 17:10:34 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A8C0316A417 for ; Sun, 8 Oct 2006 17:10:34 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8522E43D55 for ; Sun, 8 Oct 2006 17:10:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k98HAMnL057274 for ; Sun, 8 Oct 2006 17:10:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k98HAMG1057273; Sun, 8 Oct 2006 17:10:22 GMT (envelope-from gnats) Resent-Date: Sun, 8 Oct 2006 17:10:22 GMT Resent-Message-Id: <200610081710.k98HAMG1057273@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5FA9F16A40F for ; Sun, 8 Oct 2006 17:01:17 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from nm05omta055.dion.ne.jp (nm05mta.dion.ne.jp [219.125.112.6]) by mx1.FreeBSD.org (Postfix) with SMTP id 301D443D49 for ; Sun, 8 Oct 2006 17:01:15 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([218.222.67.139]) by nm05mta.dion.ne.jp id <20061009020111549.MA51.819F1F8@nm05mta.dion.ne.jp>; Mon, 9 Oct 2006 02:01:11 +0900 Message-Id: <20061009020009.4b19967c.tkato432@yahoo.com> Date: Mon, 9 Oct 2006 02:00:09 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org X-Mailman-Approved-At: Tue, 10 Oct 2006 20:18:08 +0000 Cc: Subject: ports/104170: Update port: cad/oregano to 0.60.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Oct 2006 17:10:34 -0000 >Number: 104170 >Category: ports >Synopsis: Update port: cad/oregano to 0.60.0 >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: Sun Oct 08 17:10:22 GMT 2006 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p22 i386 >Organization: >Environment: >Description: - Update to version 0.60.0 New file: files/patch-src__engines__netlist.c Remove file: files/patch-src__sim-engine.c files/patch-src__simulate.c >How-To-Repeat: >Fix: diff -urN /usr/ports/cad/oregano/Makefile cad/oregano/Makefile --- /usr/ports/cad/oregano/Makefile Sun Jun 11 04:04:15 2006 +++ cad/oregano/Makefile Sun Oct 1 00:15:05 2006 @@ -6,9 +6,9 @@ # PORTNAME= oregano -PORTVERSION= 0.50.0 +PORTVERSION= 0.60.0 CATEGORIES= cad gnome -MASTER_SITES= http://gforge.lug.fi.uba.ar/frs/download.php/80/ +MASTER_SITES= http://gforge.lug.fi.uba.ar/frs/download.php/84/ MAINTAINER= ports@FreeBSD.org COMMENT= Schematic capture and simulation of electrical circuits @@ -19,6 +19,7 @@ USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix gtksourceview intlhack libglade2 \ libgnomeprintui libgnomeui +USE_SCONS= yes INSTALLS_OMF= yes .include @@ -26,23 +27,13 @@ post-patch: @${REINPLACE_CMD} -e "s|-Wall|${CFLAGS}|g ; \ s|'/share'|'/share/gnome'|g ; \ - s|'gnome/apps/Applications'|'applications'|g ; \ - /oregano\.xml/d" ${WRKSRC}/SConstruct + s|'share/applications'|'share/gnome/applications'|g ; \ + s|'share/mime-info'|'share/gnome/mime-info'|g" ${WRKSRC}/SConstruct @${FIND} ${WRKSRC} -name "SConscript" | ${XARGS} ${REINPLACE_CMD} -e \ "s|share/oregano|share/gnome/oregano|g" -do-build: - @cd ${BUILD_WRKSRC} && scons PREFIX=${PREFIX} - -do-install: - @cd ${BUILD_WRKSRC} && scons install PREFIX=${PREFIX} +post-install: @${STRIP_CMD} ${PREFIX}/bin/oregano - @${MKDIR} ${PREFIX}/share/gnome/oregano/models - ${INSTALL_DATA} ${WRKSRC}/data/models/*.model \ - ${PREFIX}/share/gnome/oregano/models - @${MKDIR} ${PREFIX}/share/gnome/oregano/samples - ${INSTALL_DATA} ${WRKSRC}/src/samples/*.oregano \ - ${PREFIX}/share/gnome/oregano/samples .for lang in C es fr @${MKDIR} ${PREFIX}/share/gnome/help/oregano/${lang} ${INSTALL_DATA} ${WRKSRC}/help/${lang}/*.xml \ @@ -53,8 +44,5 @@ .endfor ${INSTALL_DATA} ${WRKSRC}/gnome-oregano.svg \ ${PREFIX}/share/gnome/pixmaps/gnome-oregano.svg - ${INSTALL_DATA} ${WRKSRC}/oregano.xml.in \ - ${PREFIX}/share/mime/packages/oregano.xml - @-update-mime-database ${PREFIX}/share/mime .include diff -urN /usr/ports/cad/oregano/distinfo cad/oregano/distinfo --- /usr/ports/cad/oregano/distinfo Sun Jun 11 04:04:15 2006 +++ cad/oregano/distinfo Sat Sep 30 21:20:04 2006 @@ -1,3 +1,3 @@ -MD5 (oregano-0.50.0.tar.bz2) = 9816761944b0163029942f2e113b7827 -SHA256 (oregano-0.50.0.tar.bz2) = a7a44daa150d589f34f134682ecec5e3a50ce3e418fef991f0ef6a127ab155d5 -SIZE (oregano-0.50.0.tar.bz2) = 521434 +MD5 (oregano-0.60.0.tar.bz2) = 576942f1b6d3348f16d2eff085eb03f4 +SHA256 (oregano-0.60.0.tar.bz2) = 1c6ee75a5b8d5926064ad8a953dc70bf858b8a47a951e9998dcde3233680a6d2 +SIZE (oregano-0.60.0.tar.bz2) = 525514 diff -urN /usr/ports/cad/oregano/files/patch-src__engines__netlist.c cad/oregano/files/patch-src__engines__netlist.c --- /usr/ports/cad/oregano/files/patch-src__engines__netlist.c Thu Jan 1 09:00:00 1970 +++ cad/oregano/files/patch-src__engines__netlist.c Sat Sep 30 21:27:21 2006 @@ -0,0 +1,13 @@ +--- src/engines/netlist.c.orig Sat Sep 30 13:47:23 2006 ++++ src/engines/netlist.c Sat Sep 30 21:26:42 2006 +@@ -628,9 +628,9 @@ + GList *parts; + GList *p; + gchar *prop, *type, *ac; +- parts = node_store_get_parts (store); + GString *out; + gchar *ret; ++ parts = node_store_get_parts (store); + + out = g_string_new (""); + diff -urN /usr/ports/cad/oregano/files/patch-src__sim-engine.c cad/oregano/files/patch-src__sim-engine.c --- /usr/ports/cad/oregano/files/patch-src__sim-engine.c Sat Jun 10 21:50:45 2006 +++ cad/oregano/files/patch-src__sim-engine.c Thu Jan 1 09:00:00 1970 @@ -1,22 +0,0 @@ ---- src/sim-engine.c.orig Wed May 24 14:16:30 2006 -+++ src/sim-engine.c Wed May 24 21:39:29 2006 -@@ -268,9 +268,9 @@ - /* TODO Would be recomendable to use pthread? */ - engine->child_pid = fork(); - if (engine->child_pid == 0) { -- setpgrp (); -+ setpgrp(0, getpid()); - /* Now oregano.simtype has gnucap or ngspice */ -- gchar *simexec = oregano.simexec; -+ { gchar *simexec = oregano.simexec; - /* !!!!!!!!!!! "-s" "-n" */ - gchar *args[4] = { simexec, oregano.simtype, (gchar *)netlist, NULL }; - -@@ -300,6 +300,7 @@ - * path y todo - */ - execvp(simexec, args); -+ } - - /* We should never get here. */ - g_warning ("Error executing the simulation engine."); diff -urN /usr/ports/cad/oregano/files/patch-src__simulate.c cad/oregano/files/patch-src__simulate.c --- /usr/ports/cad/oregano/files/patch-src__simulate.c Sat Jun 10 21:50:45 2006 +++ cad/oregano/files/patch-src__simulate.c Thu Jan 1 09:00:00 1970 @@ -1,14 +0,0 @@ ---- src/simulate.c.orig Wed May 24 14:16:30 2006 -+++ src/simulate.c Wed May 24 21:39:29 2006 -@@ -188,10 +188,10 @@ - GList *parts; - GList *p; - gchar *prop, *type, *ac; -- parts = node_store_get_parts (store); - GString *out; - gchar *ret; - -+ parts = node_store_get_parts (store); - out = g_string_new (""); - - for(p=parts; p; p = p->next) { diff -urN /usr/ports/cad/oregano/pkg-plist cad/oregano/pkg-plist --- /usr/ports/cad/oregano/pkg-plist Sun Jun 11 04:04:16 2006 +++ cad/oregano/pkg-plist Sat Sep 30 23:32:36 2006 @@ -1,5 +1,4 @@ bin/oregano -bin/oregano_parser.pl share/gnome/applications/oregano.desktop share/gnome/help/oregano/C/legal.xml share/gnome/help/oregano/C/oregano.xml @@ -28,6 +27,13 @@ share/gnome/oregano/dialogs/splash.xpm share/gnome/oregano/dialogs/textbox-properties-dialog.glade2 share/gnome/oregano/dialogs/view-netlist.glade2 +share/gnome/oregano/examples/Full-wave bridge rectifier.oregano +share/gnome/oregano/examples/carga_capacitor.oregano +share/gnome/oregano/examples/opamp.oregano +share/gnome/oregano/examples/opamp_ideal.oregano +share/gnome/oregano/examples/pasa_altos.oregano +share/gnome/oregano/examples/simple.oregano +share/gnome/oregano/examples/simple2.oregano share/gnome/oregano/libraries/cmos.oreglib share/gnome/oregano/libraries/cpu.oreglib share/gnome/oregano/libraries/default.oreglib @@ -41,22 +47,11 @@ share/gnome/oregano/libraries/ttl.oreglib share/gnome/oregano/models/12AX7A.model share/gnome/oregano/models/1N750.model +share/gnome/oregano/models/DiodeBridge.model share/gnome/oregano/models/NPN.model share/gnome/oregano/models/PNP.model share/gnome/oregano/models/TLC555.model share/gnome/oregano/models/UA741.model -share/gnome/oregano/samples/12ax7a.oregano -share/gnome/oregano/samples/555.oregano -share/gnome/oregano/samples/741.oregano -share/gnome/oregano/samples/OP177B.oregano -share/gnome/oregano/samples/carga_capacitor.oregano -share/gnome/oregano/samples/opamp.oregano -share/gnome/oregano/samples/opamp_ideal.oregano -share/gnome/oregano/samples/pasa_altos.oregano -share/gnome/oregano/samples/simple.oregano -share/gnome/oregano/samples/simple2.oregano -share/gnome/oregano/samples/transistors.oregano -share/gnome/oregano/samples/zener.oregano share/gnome/pixmaps/gnome-oregano.svg share/locale/ca/LC_MESSAGES/oregano.mo share/locale/de/LC_MESSAGES/oregano.mo @@ -64,15 +59,14 @@ share/locale/fr/LC_MESSAGES/oregano.mo share/locale/it/LC_MESSAGES/oregano.mo share/locale/ja/LC_MESSAGES/oregano.mo -share/locale/pl/LC_MESSAGES/oregano.mo share/locale/pt_BR/LC_MESSAGES/oregano.mo share/locale/ro/LC_MESSAGES/oregano.mo share/locale/ru/LC_MESSAGES/oregano.mo share/locale/sv/LC_MESSAGES/oregano.mo share/mime/packages/oregano.xml -@dirrm share/gnome/oregano/samples @dirrm share/gnome/oregano/models @dirrm share/gnome/oregano/libraries +@dirrm share/gnome/oregano/examples @dirrm share/gnome/oregano/dialogs @dirrm share/gnome/oregano @dirrm share/gnome/omf/oregano >Release-Note: >Audit-Trail: >Unformatted: