Attachment #82972 for bug #118609

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




#

PORTNAME=	oregano
PORTVERSION=	0.69.0
PORTREVISION=	4
CATEGORIES=	cad gnome
MASTER_SITES=	http://gforge.lug.fi.uba.ar/frs/download.php/86/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Schematic capture and simulation of electrical circuits

BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons

USE_BZIP2=	yes
USE_XLIB=	yes
USE_GETTEXT=	yes
USE_GNOME=	gnomehack gnomeprefix gtksourceview intlhack libglade2 \
		libgnomeui
USE_GETTEXT=	yes
USE_SCONS=	yes
INSTALLS_OMF=	yes


	${INSTALL_DATA} ${WRKSRC}/help/${lang}/*.omf \
		${PREFIX}/share/omf/oregano
.endfor
	${INSTALL_DATA} ${WRKSRC}/gnome-oregano.svg \
		${PREFIX}/share/pixmaps/gnome-oregano.svg

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)cad/oregano/distinfo (-3 / +3 lines)
1	MD5 (oregano-0.60.0.tar.bz2) = 576942f1b6d3348f16d2eff085eb03f4	1	MD5 (oregano-0.69.0.tar.gz) = f98abc5c79cc733b49cd07995afc9c1e
2	SHA256 (oregano-0.60.0.tar.bz2) = 1c6ee75a5b8d5926064ad8a953dc70bf858b8a47a951e9998dcde3233680a6d2	2	SHA256 (oregano-0.69.0.tar.gz) = 86242822ba08be50b00e81a0afc7a5b9d8ab5e1ff2023707a362a87f597f107a
3	SIZE (oregano-0.60.0.tar.bz2) = 525514	3	SIZE (oregano-0.69.0.tar.gz) = 640385




--- 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 ("");
 




--- src/model/node-store.c.orig	Wed May 24 14:16:30 2006
+++ src/model/node-store.c	Wed May 24 19:07:00 2006
@@ -432,9 +432,9 @@
 			SheetPos w_pos, w_length;
 			gboolean can_join;
 			GSList *nodes;
+			gdouble _x1, _x2, _y1, _y2;
 
 			wire_get_pos_and_length (ipoint->wire, &w_pos, &w_length);
-			gdouble _x1, _x2, _y1, _y2;
 
 			_x1 = w_pos.x;
 			_y1 = w_pos.y;
@@ -481,9 +481,9 @@
 			SheetPos w_pos, w_length;
 			gboolean can_join;
 			GSList *nodes;
+			gdouble _x1, _x2, _y1, _y2;
 
 			wire_get_pos_and_length (ipoint->wire, &w_pos, &w_length);
-			gdouble _x1, _x2, _y1, _y2;
 
 			_x1 = w_pos.x;
 			_y1 = w_pos.y;

Lines 1-10 Link Here

(-)cad/oregano/files/patch-src__print.c (-10 lines)
1	--- src/print.c.orig Thu Mar 29 10:30:23 2007
2	+++ src/print.c Thu Mar 29 10:30:26 2007
3	@@ -31,6 +31,7 @@
4	#include <math.h>
5	#include <gnome.h>
6	#include <libgnomeprint/gnome-print.h>
7	+#include <libgnomeprint/gnome-print-paper.h>
8	#include "schematic.h"
9	#include "schematic-view.h"
10	#include "sheet.h"




--- src/schematic-view.c.orig	Wed May 24 14:16:30 2006
+++ src/schematic-view.c	Wed May 24 21:39:29 2006
@@ -1849,6 +1849,7 @@
 				int i=0;
 				while (files[i]) {
 					Schematic *new_sm = NULL;
+					gchar *fname = files[i];
 					int l = strlen(files[i]);
 					/* Algo queda mal al final luego del split, agrego un \0 */
 					files[i][l-1] = '\0';
@@ -1858,8 +1859,6 @@
 						i++;
 						continue;
 					}
-
-					gchar *fname = files[i];
 
 					new_sm = schematic_read (fname, &error);
 					if (new_sm) {




--- src/sheet/wire-item.c.orig	Wed May 24 14:16:30 2006
+++ src/sheet/wire-item.c	Wed May 24 21:13:43 2006
@@ -363,8 +363,8 @@
 		case GDK_BUTTON_PRESS:
 			switch (event->button.button) {
 				case 1: {
-					g_signal_stop_emission_by_name (G_OBJECT (sheet), "event");
 					double x, y;
+					g_signal_stop_emission_by_name (G_OBJECT (sheet), "event");
 					x = event->button.x - start_pos.x;
 					y = event->button.y - start_pos.y;
 					if ((x > -RESIZER_SIZE) && (x < RESIZER_SIZE) &&

Lines 2-5 Link Here

(-)cad/oregano/pkg-descr (-1 / +1 lines)
2	circuits. It simplifies design of simple circuits by letting the user	2	circuits. It simplifies design of simple circuits by letting the user
3	draw the circuit and then simulate its electrical characteristics.	3	draw the circuit and then simulate its electrical characteristics.
4		4
5	WWW: http://arrakis.gforge.lug.fi.uba.ar/	5	WWW: http://oregano.gforge.lug.fi.uba.ar/




share/omf/oregano/oregano-C.omf
share/omf/oregano/oregano-es.omf
share/omf/oregano/oregano-fr.omf
%%DATADIR%%/dialogs/clamp-properties-dialog.glade2
%%DATADIR%%/dialogs/export.glade2
%%DATADIR%%/dialogs/log-window.glade2
%%DATADIR%%/dialogs/part-browser.glade2
%%DATADIR%%/dialogs/part-properties-dialog.glade2
%%DATADIR%%/dialogs/plot-add-function.glade2
%%DATADIR%%/dialogs/plot-window.glade2
%%DATADIR%%/dialogs/print-options.glade2
%%DATADIR%%/dialogs/properties.glade2
%%DATADIR%%/dialogs/settings.glade2
%%DATADIR%%/dialogs/sim-settings.glade2
%%DATADIR%%/dialogs/simulation.glade2
%%DATADIR%%/dialogs/splash.glade2
%%DATADIR%%/dialogs/splash.xpm
%%DATADIR%%/dialogs/textbox-properties-dialog.glade2
%%DATADIR%%/dialogs/view-netlist.glade2
%%DATADIR%%/examples/Full-wave bridge rectifier.oregano
%%DATADIR%%/examples/carga_capacitor.oregano
%%DATADIR%%/examples/opamp.oregano
%%DATADIR%%/examples/opamp_ideal.oregano
%%DATADIR%%/examples/pasa_altos.oregano
%%DATADIR%%/examples/simple.oregano
%%DATADIR%%/examples/simple2.oregano
%%DATADIR%%/libraries/cmos.oreglib
%%DATADIR%%/libraries/cpu.oreglib
%%DATADIR%%/libraries/default.oreglib
%%DATADIR%%/libraries/interface.oreglib
%%DATADIR%%/libraries/linear.oreglib
%%DATADIR%%/libraries/memory.oreglib
%%DATADIR%%/libraries/miscellaneous.oreglib
%%DATADIR%%/libraries/opamplib.oreglib
%%DATADIR%%/libraries/peripheral.oreglib
%%DATADIR%%/libraries/power.oreglib
%%DATADIR%%/libraries/ttl.oreglib
%%DATADIR%%/models/12AX7A.model
%%DATADIR%%/models/1N4148.model
%%DATADIR%%/models/1N750.model
%%DATADIR%%/models/DiodeBridge.model
%%DATADIR%%/models/NPN.model
%%DATADIR%%/models/PNP.model
%%DATADIR%%/models/TLC555.model
%%DATADIR%%/models/UA741.model
share/locale/ca/LC_MESSAGES/oregano.mo
share/locale/de/LC_MESSAGES/oregano.mo
share/locale/es/LC_MESSAGES/oregano.mo

share/locale/ru/LC_MESSAGES/oregano.mo
share/locale/sv/LC_MESSAGES/oregano.mo
share/mime/packages/oregano.xml
share/pixmaps/gnome-oregano.svg
@dirrm %%DATADIR%%/models
@dirrm %%DATADIR%%/libraries
@dirrm %%DATADIR%%/examples
@dirrm %%DATADIR%%/dialogs
@dirrm %%DATADIR%%
@dirrm share/omf/oregano
@dirrm share/gnome/help/oregano/fr
@dirrm share/gnome/help/oregano/es

Return to bug 118609

Lines 7-27 Link Here

(-)cad/oregano/Makefile (-11 / +4 lines)
7	#	7	#
8		8
9	PORTNAME= oregano	9	PORTNAME= oregano
10	PORTVERSION= 0.60.0	10	PORTVERSION= 0.69.0
11	PORTREVISION= 4
12	CATEGORIES= cad gnome	11	CATEGORIES= cad gnome
13	MASTER_SITES= http://gforge.lug.fi.uba.ar/frs/download.php/84/	12	MASTER_SITES= http://gforge.lug.fi.uba.ar/frs/download.php/86/
14		13
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= Schematic capture and simulation of electrical circuits	15	COMMENT= Schematic capture and simulation of electrical circuits
17		16
18	BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons
19
20	USE_BZIP2= yes
21	USE_XLIB= yes
22	USE_GETTEXT= yes
23	USE_GNOME= gnomehack gnomeprefix gtksourceview intlhack libglade2 \	17	USE_GNOME= gnomehack gnomeprefix gtksourceview intlhack libglade2 \
24	libgnomeprintui libgnomeui	18	libgnomeui
		19	USE_GETTEXT= yes
25	USE_SCONS= yes	20	USE_SCONS= yes
26	INSTALLS_OMF= yes	21	INSTALLS_OMF= yes
27		22
Lines 40-46 Link Here
40	${INSTALL_DATA} ${WRKSRC}/help/${lang}/*.omf \	35	${INSTALL_DATA} ${WRKSRC}/help/${lang}/*.omf \
41	${PREFIX}/share/omf/oregano	36	${PREFIX}/share/omf/oregano
42	.endfor	37	.endfor
43	${INSTALL_DATA} ${WRKSRC}/gnome-oregano.svg \
44	${PREFIX}/share/pixmaps/gnome-oregano.svg
45		38
46	.include <bsd.port.post.mk>	39	.include <bsd.port.post.mk>

Lines 1-13 Link Here

(-)cad/oregano/files/patch-src__engines__netlist.c (-13 lines)
1	--- src/engines/netlist.c.orig Sat Sep 30 13:47:23 2006
2	+++ src/engines/netlist.c Sat Sep 30 21:26:42 2006
3	@@ -628,9 +628,9 @@
4	GList *parts;
5	GList *p;
6	gchar prop, type, *ac;
7	- parts = node_store_get_parts (store);
8	GString *out;
9	gchar *ret;
10	+ parts = node_store_get_parts (store);
11
12	out = g_string_new ("");
13

Lines 1-24 Link Here

(-)cad/oregano/files/patch-src__model__node-store.c (-24 lines)
1	--- src/model/node-store.c.orig Wed May 24 14:16:30 2006
2	+++ src/model/node-store.c Wed May 24 19:07:00 2006
3	@@ -432,9 +432,9 @@
4	SheetPos w_pos, w_length;
5	gboolean can_join;
6	GSList *nodes;
7	+ gdouble _x1, _x2, _y1, _y2;
8
9	wire_get_pos_and_length (ipoint->wire, &w_pos, &w_length);
10	- gdouble _x1, _x2, _y1, _y2;
11
12	_x1 = w_pos.x;
13	_y1 = w_pos.y;
14	@@ -481,9 +481,9 @@
15	SheetPos w_pos, w_length;
16	gboolean can_join;
17	GSList *nodes;
18	+ gdouble _x1, _x2, _y1, _y2;
19
20	wire_get_pos_and_length (ipoint->wire, &w_pos, &w_length);
21	- gdouble _x1, _x2, _y1, _y2;
22
23	_x1 = w_pos.x;
24	_y1 = w_pos.y;

Lines 1-19 Link Here

(-)cad/oregano/files/patch-src__schematic-view.c (-19 lines)
1	--- src/schematic-view.c.orig Wed May 24 14:16:30 2006
2	+++ src/schematic-view.c Wed May 24 21:39:29 2006
3	@@ -1849,6 +1849,7 @@
4	int i=0;
5	while (files[i]) {
6	Schematic *new_sm = NULL;
7	+ gchar *fname = files[i];
8	int l = strlen(files[i]);
9	/* Algo queda mal al final luego del split, agrego un \0 */
10	files[i][l-1] = '\0';
11	@@ -1858,8 +1859,6 @@
12	i++;
13	continue;
14	}
15	-
16	- gchar *fname = files[i];
17
18	new_sm = schematic_read (fname, &error);
19	if (new_sm) {

Lines 1-12 Link Here

(-)cad/oregano/files/patch-src__sheet__wire-item.c (-12 lines)
1	--- src/sheet/wire-item.c.orig Wed May 24 14:16:30 2006
2	+++ src/sheet/wire-item.c Wed May 24 21:13:43 2006
3	@@ -363,8 +363,8 @@
4	case GDK_BUTTON_PRESS:
5	switch (event->button.button) {
6	case 1: {
7	- g_signal_stop_emission_by_name (G_OBJECT (sheet), "event");
8	double x, y;
9	+ g_signal_stop_emission_by_name (G_OBJECT (sheet), "event");
10	x = event->button.x - start_pos.x;
11	y = event->button.y - start_pos.y;
12	if ((x > -RESIZER_SIZE) && (x < RESIZER_SIZE) &&

Lines 11-58 Link Here

(-)cad/oregano/pkg-plist (-47 / +48 lines)
11	share/omf/oregano/oregano-C.omf	11	share/omf/oregano/oregano-C.omf
12	share/omf/oregano/oregano-es.omf	12	share/omf/oregano/oregano-es.omf
13	share/omf/oregano/oregano-fr.omf	13	share/omf/oregano/oregano-fr.omf
14	share/oregano/dialogs/clamp-properties-dialog.glade2	14	%%DATADIR%%/dialogs/clamp-properties-dialog.glade2
15	share/oregano/dialogs/log-window.glade2	15	%%DATADIR%%/dialogs/export.glade2
16	share/oregano/dialogs/page-properties.glade2	16	%%DATADIR%%/dialogs/log-window.glade2
17	share/oregano/dialogs/part-browser.glade2	17	%%DATADIR%%/dialogs/part-browser.glade2
18	share/oregano/dialogs/part-properties-dialog.glade2	18	%%DATADIR%%/dialogs/part-properties-dialog.glade2
19	share/oregano/dialogs/plot-add-function.glade2	19	%%DATADIR%%/dialogs/plot-add-function.glade2
20	share/oregano/dialogs/plot-export.glade2	20	%%DATADIR%%/dialogs/plot-window.glade2
21	share/oregano/dialogs/plot-window.glade2	21	%%DATADIR%%/dialogs/print-options.glade2
22	share/oregano/dialogs/properties.glade2	22	%%DATADIR%%/dialogs/properties.glade2
23	share/oregano/dialogs/settings.glade2	23	%%DATADIR%%/dialogs/settings.glade2
24	share/oregano/dialogs/sim-settings.glade2	24	%%DATADIR%%/dialogs/sim-settings.glade2
25	share/oregano/dialogs/simulation.glade2	25	%%DATADIR%%/dialogs/simulation.glade2
26	share/oregano/dialogs/splash.glade2	26	%%DATADIR%%/dialogs/splash.glade2
27	share/oregano/dialogs/splash.xpm	27	%%DATADIR%%/dialogs/splash.xpm
28	share/oregano/dialogs/textbox-properties-dialog.glade2	28	%%DATADIR%%/dialogs/textbox-properties-dialog.glade2
29	share/oregano/dialogs/view-netlist.glade2	29	%%DATADIR%%/dialogs/view-netlist.glade2
30	share/oregano/examples/Full-wave bridge rectifier.oregano	30	%%DATADIR%%/examples/Full-wave bridge rectifier.oregano
31	share/oregano/examples/carga_capacitor.oregano	31	%%DATADIR%%/examples/carga_capacitor.oregano
32	share/oregano/examples/opamp.oregano	32	%%DATADIR%%/examples/opamp.oregano
33	share/oregano/examples/opamp_ideal.oregano	33	%%DATADIR%%/examples/opamp_ideal.oregano
34	share/oregano/examples/pasa_altos.oregano	34	%%DATADIR%%/examples/pasa_altos.oregano
35	share/oregano/examples/simple.oregano	35	%%DATADIR%%/examples/simple.oregano
36	share/oregano/examples/simple2.oregano	36	%%DATADIR%%/examples/simple2.oregano
37	share/oregano/libraries/cmos.oreglib	37	%%DATADIR%%/libraries/cmos.oreglib
38	share/oregano/libraries/cpu.oreglib	38	%%DATADIR%%/libraries/cpu.oreglib
39	share/oregano/libraries/default.oreglib	39	%%DATADIR%%/libraries/default.oreglib
40	share/oregano/libraries/interface.oreglib	40	%%DATADIR%%/libraries/interface.oreglib
41	share/oregano/libraries/linear.oreglib	41	%%DATADIR%%/libraries/linear.oreglib
42	share/oregano/libraries/memory.oreglib	42	%%DATADIR%%/libraries/memory.oreglib
43	share/oregano/libraries/miscellaneous.oreglib	43	%%DATADIR%%/libraries/miscellaneous.oreglib
44	share/oregano/libraries/opamplib.oreglib	44	%%DATADIR%%/libraries/opamplib.oreglib
45	share/oregano/libraries/peripheral.oreglib	45	%%DATADIR%%/libraries/peripheral.oreglib
46	share/oregano/libraries/power.oreglib	46	%%DATADIR%%/libraries/power.oreglib
47	share/oregano/libraries/ttl.oreglib	47	%%DATADIR%%/libraries/ttl.oreglib
48	share/oregano/models/12AX7A.model	48	%%DATADIR%%/models/12AX7A.model
49	share/oregano/models/1N750.model	49	%%DATADIR%%/models/1N4148.model
50	share/oregano/models/DiodeBridge.model	50	%%DATADIR%%/models/1N750.model
51	share/oregano/models/NPN.model	51	%%DATADIR%%/models/DiodeBridge.model
52	share/oregano/models/PNP.model	52	%%DATADIR%%/models/NPN.model
53	share/oregano/models/TLC555.model	53	%%DATADIR%%/models/PNP.model
54	share/oregano/models/UA741.model	54	%%DATADIR%%/models/TLC555.model
55	share/pixmaps/gnome-oregano.svg	55	%%DATADIR%%/models/UA741.model
56	share/locale/ca/LC_MESSAGES/oregano.mo	56	share/locale/ca/LC_MESSAGES/oregano.mo
57	share/locale/de/LC_MESSAGES/oregano.mo	57	share/locale/de/LC_MESSAGES/oregano.mo
58	share/locale/es/LC_MESSAGES/oregano.mo	58	share/locale/es/LC_MESSAGES/oregano.mo
Lines 65-75 Link Here
65	share/locale/ru/LC_MESSAGES/oregano.mo	65	share/locale/ru/LC_MESSAGES/oregano.mo
66	share/locale/sv/LC_MESSAGES/oregano.mo	66	share/locale/sv/LC_MESSAGES/oregano.mo
67	share/mime/packages/oregano.xml	67	share/mime/packages/oregano.xml
68	@dirrm share/oregano/models	68	share/pixmaps/gnome-oregano.svg
69	@dirrm share/oregano/libraries	69	@dirrm %%DATADIR%%/models
70	@dirrm share/oregano/examples	70	@dirrm %%DATADIR%%/libraries
71	@dirrm share/oregano/dialogs	71	@dirrm %%DATADIR%%/examples
72	@dirrm share/oregano	72	@dirrm %%DATADIR%%/dialogs
		73	@dirrm %%DATADIR%%
73	@dirrm share/omf/oregano	74	@dirrm share/omf/oregano
74	@dirrm share/gnome/help/oregano/fr	75	@dirrm share/gnome/help/oregano/fr
75	@dirrm share/gnome/help/oregano/es	76	@dirrm share/gnome/help/oregano/es