Attachment #71528 for bug #104170

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




#

PORTNAME=	oregano
PORTVERSION=	0.60.0
CATEGORIES=	cad gnome
MASTER_SITES=	http://gforge.lug.fi.uba.ar/frs/download.php/84/

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

USE_X_PREFIX=	yes
USE_GNOME=	gnomehack gnomeprefix gtksourceview intlhack libglade2 \
		libgnomeprintui libgnomeui
USE_SCONS=	yes
INSTALLS_OMF=	yes

.include <bsd.port.pre.mk>

post-patch:
	@${REINPLACE_CMD} -e "s|-Wall|${CFLAGS}|g ; \
		 s|'/share'|'/share/gnome'|g ; \
		 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"

post-install:
	@cd ${BUILD_WRKSRC} && scons PREFIX=${PREFIX}

do-install:
	@cd ${BUILD_WRKSRC} && scons install PREFIX=${PREFIX}
	@${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 \

.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 <bsd.port.post.mk>

Lines 1-3 Link Here

(-)cad/oregano/distinfo (-3 / +3 lines)
1	MD5 (oregano-0.50.0.tar.bz2) = 9816761944b0163029942f2e113b7827	1	MD5 (oregano-0.60.0.tar.bz2) = 576942f1b6d3348f16d2eff085eb03f4
2	SHA256 (oregano-0.50.0.tar.bz2) = a7a44daa150d589f34f134682ecec5e3a50ce3e418fef991f0ef6a127ab155d5	2	SHA256 (oregano-0.60.0.tar.bz2) = 1c6ee75a5b8d5926064ad8a953dc70bf858b8a47a951e9998dcde3233680a6d2
3	SIZE (oregano-0.50.0.tar.bz2) = 521434	3	SIZE (oregano-0.60.0.tar.bz2) = 525514




--- 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/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.");




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




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

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

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

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

Return to bug 104170

Lines 6-14 Link Here

(-)cad/oregano/Makefile (-18 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= oregano	8	PORTNAME= oregano
9	PORTVERSION= 0.50.0	9	PORTVERSION= 0.60.0
10	CATEGORIES= cad gnome	10	CATEGORIES= cad gnome
11	MASTER_SITES= http://gforge.lug.fi.uba.ar/frs/download.php/80/	11	MASTER_SITES= http://gforge.lug.fi.uba.ar/frs/download.php/84/
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
14	COMMENT= Schematic capture and simulation of electrical circuits	14	COMMENT= Schematic capture and simulation of electrical circuits
Lines 19-24 Link Here
19	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
20	USE_GNOME= gnomehack gnomeprefix gtksourceview intlhack libglade2 \	20	USE_GNOME= gnomehack gnomeprefix gtksourceview intlhack libglade2 \
21	libgnomeprintui libgnomeui	21	libgnomeprintui libgnomeui
		22	USE_SCONS= yes
22	INSTALLS_OMF= yes	23	INSTALLS_OMF= yes
23		24
24	.include <bsd.port.pre.mk>	25	.include <bsd.port.pre.mk>
Lines 26-48 Link Here
26	post-patch:	27	post-patch:
27	@${REINPLACE_CMD} -e "s\|-Wall\|${CFLAGS}\|g ; \	28	@${REINPLACE_CMD} -e "s\|-Wall\|${CFLAGS}\|g ; \
28	s\|'/share'\|'/share/gnome'\|g ; \	29	s\|'/share'\|'/share/gnome'\|g ; \
29	s\|'gnome/apps/Applications'\|'applications'\|g ; \	30	s\|'share/applications'\|'share/gnome/applications'\|g ; \
30	/oregano\.xml/d" ${WRKSRC}/SConstruct	31	s\|'share/mime-info'\|'share/gnome/mime-info'\|g" ${WRKSRC}/SConstruct
31	@${FIND} ${WRKSRC} -name "SConscript" \| ${XARGS} ${REINPLACE_CMD} -e \	32	@${FIND} ${WRKSRC} -name "SConscript" \| ${XARGS} ${REINPLACE_CMD} -e \
32	"s\|share/oregano\|share/gnome/oregano\|g"	33	"s\|share/oregano\|share/gnome/oregano\|g"
33		34
34	do-build:	35	post-install:
35	@cd ${BUILD_WRKSRC} && scons PREFIX=${PREFIX}
36
37	do-install:
38	@cd ${BUILD_WRKSRC} && scons install PREFIX=${PREFIX}
39	@${STRIP_CMD} ${PREFIX}/bin/oregano	36	@${STRIP_CMD} ${PREFIX}/bin/oregano
40	@${MKDIR} ${PREFIX}/share/gnome/oregano/models
41	${INSTALL_DATA} ${WRKSRC}/data/models/*.model \
42	${PREFIX}/share/gnome/oregano/models
43	@${MKDIR} ${PREFIX}/share/gnome/oregano/samples
44	${INSTALL_DATA} ${WRKSRC}/src/samples/*.oregano \
45	${PREFIX}/share/gnome/oregano/samples
46	.for lang in C es fr	37	.for lang in C es fr
47	@${MKDIR} ${PREFIX}/share/gnome/help/oregano/${lang}	38	@${MKDIR} ${PREFIX}/share/gnome/help/oregano/${lang}
48	${INSTALL_DATA} ${WRKSRC}/help/${lang}/*.xml \	39	${INSTALL_DATA} ${WRKSRC}/help/${lang}/*.xml \
Lines 53-60 Link Here
53	.endfor	44	.endfor
54	${INSTALL_DATA} ${WRKSRC}/gnome-oregano.svg \	45	${INSTALL_DATA} ${WRKSRC}/gnome-oregano.svg \
55	${PREFIX}/share/gnome/pixmaps/gnome-oregano.svg	46	${PREFIX}/share/gnome/pixmaps/gnome-oregano.svg
56	${INSTALL_DATA} ${WRKSRC}/oregano.xml.in \
57	${PREFIX}/share/mime/packages/oregano.xml
58	@-update-mime-database ${PREFIX}/share/mime
59		47
60	.include <bsd.port.post.mk>	48	.include <bsd.port.post.mk>

Line 0 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-22 Link Here

(-)cad/oregano/files/patch-src__sim-engine.c (-22 lines)
1	--- src/sim-engine.c.orig Wed May 24 14:16:30 2006
2	+++ src/sim-engine.c Wed May 24 21:39:29 2006
3	@@ -268,9 +268,9 @@
4	/* TODO Would be recomendable to use pthread? */
5	engine->child_pid = fork();
6	if (engine->child_pid == 0) {
7	- setpgrp ();
8	+ setpgrp(0, getpid());
9	/* Now oregano.simtype has gnucap or ngspice */
10	- gchar *simexec = oregano.simexec;
11	+ { gchar *simexec = oregano.simexec;
12	/* !!!!!!!!!!! "-s" "-n" */
13	gchar args[4] = { simexec, oregano.simtype, (gchar )netlist, NULL };
14
15	@@ -300,6 +300,7 @@
16	* path y todo
17	*/
18	execvp(simexec, args);
19	+ }
20
21	/* We should never get here. */
22	g_warning ("Error executing the simulation engine.");

Lines 1-14 Link Here

(-)cad/oregano/files/patch-src__simulate.c (-14 lines)
1	--- src/simulate.c.orig Wed May 24 14:16:30 2006
2	+++ src/simulate.c Wed May 24 21:39:29 2006
3	@@ -188,10 +188,10 @@
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
11	+ parts = node_store_get_parts (store);
12	out = g_string_new ("");
13
14	for(p=parts; p; p = p->next) {

Lines 1-5 Link Here

(-)cad/oregano/pkg-plist (-15 / +9 lines)
1	bin/oregano	1	bin/oregano
2	bin/oregano_parser.pl
3	share/gnome/applications/oregano.desktop	2	share/gnome/applications/oregano.desktop
4	share/gnome/help/oregano/C/legal.xml	3	share/gnome/help/oregano/C/legal.xml
5	share/gnome/help/oregano/C/oregano.xml	4	share/gnome/help/oregano/C/oregano.xml
Lines 28-33 Link Here
28	share/gnome/oregano/dialogs/splash.xpm	27	share/gnome/oregano/dialogs/splash.xpm
29	share/gnome/oregano/dialogs/textbox-properties-dialog.glade2	28	share/gnome/oregano/dialogs/textbox-properties-dialog.glade2
30	share/gnome/oregano/dialogs/view-netlist.glade2	29	share/gnome/oregano/dialogs/view-netlist.glade2
		30	share/gnome/oregano/examples/Full-wave bridge rectifier.oregano
		31	share/gnome/oregano/examples/carga_capacitor.oregano
		32	share/gnome/oregano/examples/opamp.oregano
		33	share/gnome/oregano/examples/opamp_ideal.oregano
		34	share/gnome/oregano/examples/pasa_altos.oregano
		35	share/gnome/oregano/examples/simple.oregano
		36	share/gnome/oregano/examples/simple2.oregano
31	share/gnome/oregano/libraries/cmos.oreglib	37	share/gnome/oregano/libraries/cmos.oreglib
32	share/gnome/oregano/libraries/cpu.oreglib	38	share/gnome/oregano/libraries/cpu.oreglib
33	share/gnome/oregano/libraries/default.oreglib	39	share/gnome/oregano/libraries/default.oreglib
Lines 41-62 Link Here
41	share/gnome/oregano/libraries/ttl.oreglib	47	share/gnome/oregano/libraries/ttl.oreglib
42	share/gnome/oregano/models/12AX7A.model	48	share/gnome/oregano/models/12AX7A.model
43	share/gnome/oregano/models/1N750.model	49	share/gnome/oregano/models/1N750.model
		50	share/gnome/oregano/models/DiodeBridge.model
44	share/gnome/oregano/models/NPN.model	51	share/gnome/oregano/models/NPN.model
45	share/gnome/oregano/models/PNP.model	52	share/gnome/oregano/models/PNP.model
46	share/gnome/oregano/models/TLC555.model	53	share/gnome/oregano/models/TLC555.model
47	share/gnome/oregano/models/UA741.model	54	share/gnome/oregano/models/UA741.model
48	share/gnome/oregano/samples/12ax7a.oregano
49	share/gnome/oregano/samples/555.oregano
50	share/gnome/oregano/samples/741.oregano
51	share/gnome/oregano/samples/OP177B.oregano
52	share/gnome/oregano/samples/carga_capacitor.oregano
53	share/gnome/oregano/samples/opamp.oregano
54	share/gnome/oregano/samples/opamp_ideal.oregano
55	share/gnome/oregano/samples/pasa_altos.oregano
56	share/gnome/oregano/samples/simple.oregano
57	share/gnome/oregano/samples/simple2.oregano
58	share/gnome/oregano/samples/transistors.oregano
59	share/gnome/oregano/samples/zener.oregano
60	share/gnome/pixmaps/gnome-oregano.svg	55	share/gnome/pixmaps/gnome-oregano.svg
61	share/locale/ca/LC_MESSAGES/oregano.mo	56	share/locale/ca/LC_MESSAGES/oregano.mo
62	share/locale/de/LC_MESSAGES/oregano.mo	57	share/locale/de/LC_MESSAGES/oregano.mo
Lines 64-78 Link Here
64	share/locale/fr/LC_MESSAGES/oregano.mo	59	share/locale/fr/LC_MESSAGES/oregano.mo
65	share/locale/it/LC_MESSAGES/oregano.mo	60	share/locale/it/LC_MESSAGES/oregano.mo
66	share/locale/ja/LC_MESSAGES/oregano.mo	61	share/locale/ja/LC_MESSAGES/oregano.mo
67	share/locale/pl/LC_MESSAGES/oregano.mo
68	share/locale/pt_BR/LC_MESSAGES/oregano.mo	62	share/locale/pt_BR/LC_MESSAGES/oregano.mo
69	share/locale/ro/LC_MESSAGES/oregano.mo	63	share/locale/ro/LC_MESSAGES/oregano.mo
70	share/locale/ru/LC_MESSAGES/oregano.mo	64	share/locale/ru/LC_MESSAGES/oregano.mo
71	share/locale/sv/LC_MESSAGES/oregano.mo	65	share/locale/sv/LC_MESSAGES/oregano.mo
72	share/mime/packages/oregano.xml	66	share/mime/packages/oregano.xml
73	@dirrm share/gnome/oregano/samples
74	@dirrm share/gnome/oregano/models	67	@dirrm share/gnome/oregano/models
75	@dirrm share/gnome/oregano/libraries	68	@dirrm share/gnome/oregano/libraries
		69	@dirrm share/gnome/oregano/examples
76	@dirrm share/gnome/oregano/dialogs	70	@dirrm share/gnome/oregano/dialogs
77	@dirrm share/gnome/oregano	71	@dirrm share/gnome/oregano
78	@dirrm share/gnome/omf/oregano	72	@dirrm share/gnome/omf/oregano