Update to version 0.40.0

PR:		ports/74422
Submitted by:	Ports Fury

8 files changed, 122 insertions, 22 deletions

diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 8ef5ae980fd2..febaa143eac6 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -6,19 +6,28 @@
 #
 
 PORTNAME=	oregano
-PORTVERSION=	0.23
-PORTREVISION=	1
+PORTVERSION=	0.40.0
 CATEGORIES=	cad
-MASTER_SITES=	http://people.imendio.com/richard/oregano/download/
+MASTER_SITES=	http://gforge.lug.fi.uba.ar/frs/download.php/47/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Schematic capture and simulation of electrical circuits
 
+LIB_DEPENDS=	cairo.1:${PORTSDIR}/graphics/cairo
+
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomeprint libglade
+USE_GNOME=	gnomehack gnomeprefix gtksourceview intlhack libglade2 \
+		libgnomeprintui
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=	15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
+		AUTOMAKE="${TRUE}"
+INSTALLS_OMF=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|src/main\.c|${PORTNAME}|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/cad/oregano/distinfo b/cad/oregano/distinfo
index 6a9135868def..3d916424416f 100644
--- a/cad/oregano/distinfo
+++ b/cad/oregano/distinfo
@@ -1,2 +1,2 @@
-MD5 (oregano-0.23.tar.gz) = 226b84622dd1b877ee87228ba74d68d1
-SIZE (oregano-0.23.tar.gz) = 602017
+MD5 (oregano-0.40.0.tar.bz2) = 6c82193ab796d49adbef79aec0b99015
+SIZE (oregano-0.40.0.tar.bz2) = 894616
diff --git a/cad/oregano/files/patch-Makefile.in b/cad/oregano/files/patch-Makefile.in
new file mode 100644
index 000000000000..90d13a8ac214
--- /dev/null
+++ b/cad/oregano/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	Fri Nov 26 13:09:27 2004
++++ Makefile.in	Fri Nov 26 18:58:35 2004
+@@ -130,7 +130,7 @@
+ 
+ MIMEFILES = oregano.xml.in
+ 
+-mimedir = $(datadir)/mime/packages
++mimedir = $(prefix)/share/mime/packages
+ mime_DATA = oregano.xml
+ 
+ CLEANFILES = $(mime_DATA)
+@@ -527,7 +527,7 @@
+ @INTLTOOL_XML_RULE@
+ 
+ install-data-hook: 
+-@UPDATE_MIME_TRUE@	update-mime-database $(datadir)/mime
++@UPDATE_MIME_TRUE@	update-mime-database $(prefix)/share/mime
+ @UPDATE_MIME_FALSE@	@true
+ 
+ oregano.keys: oregano.keys.in Makefile
diff --git a/cad/oregano/files/patch-src::node-store.c b/cad/oregano/files/patch-src::node-store.c
new file mode 100644
index 000000000000..66de4602016f
--- /dev/null
+++ b/cad/oregano/files/patch-src::node-store.c
@@ -0,0 +1,25 @@
+--- src/node-store.c.orig	Tue Oct 12 04:04:27 2004
++++ src/node-store.c	Fri Nov 26 18:05:48 2004
+@@ -431,9 +431,10 @@
+ 
+ 		if (IS_EQ (x1, x2) && ((ipoint->pos.y == y1) || (ipoint->pos.y == y2))) {
+ 			SheetPos w_pos, w_length;
+-			wire_get_pos_and_length (ipoint->wire, &w_pos, &w_length);
+ 			gdouble _x1, _x2, _y1, _y2;
+ 
++			wire_get_pos_and_length (ipoint->wire, &w_pos, &w_length);
++
+ 			_x1 = w_pos.x;
+ 			_y1 = w_pos.y;
+ 			_x2 = x1 + w_length.x;
+@@ -457,8 +458,9 @@
+ 			}
+ 		} else if (IS_EQ (y1, y2) && ((ipoint->pos.x == x1) || (ipoint->pos.x == x2))) {
+ 			SheetPos w_pos, w_length;
+-			wire_get_pos_and_length (ipoint->wire, &w_pos, &w_length);
+ 			gdouble _x1, _x2, _y1, _y2;
++
++			wire_get_pos_and_length (ipoint->wire, &w_pos, &w_length);
+ 
+ 			_x1 = w_pos.x;
+ 			_y1 = w_pos.y;
diff --git a/cad/oregano/files/patch-src::schematic-view.c b/cad/oregano/files/patch-src::schematic-view.c
new file mode 100644
index 000000000000..7cc677b8291f
--- /dev/null
+++ b/cad/oregano/files/patch-src::schematic-view.c
@@ -0,0 +1,19 @@
+--- src/schematic-view.c.orig	Fri Nov 12 10:09:14 2004
++++ src/schematic-view.c	Fri Nov 26 18:08:32 2004
+@@ -1840,6 +1840,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';
+@@ -1849,8 +1850,6 @@
+ 						i++;
+ 						continue;
+ 					}
+-
+-					gchar *fname = files[i];
+ 
+ 					new_sm = schematic_read (fname);
+ 					if (new_sm) {
diff --git a/cad/oregano/files/patch-src::simulate.c b/cad/oregano/files/patch-src::simulate.c
new file mode 100644
index 000000000000..4391181847da
--- /dev/null
+++ b/cad/oregano/files/patch-src::simulate.c
@@ -0,0 +1,14 @@
+--- src/simulate.c.orig	Tue Nov 23 04:20:05 2004
++++ src/simulate.c	Fri Nov 26 18:10:37 2004
+@@ -200,10 +200,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 --git a/cad/oregano/pkg-descr b/cad/oregano/pkg-descr
index 5817c531f661..6de9aa1ca8b1 100644
--- a/cad/oregano/pkg-descr
+++ b/cad/oregano/pkg-descr
@@ -2,4 +2,4 @@ Oregano is a tool for schematic capture and simulation of electrical
 circuits.  It simplifies design of simple circuits by letting the user
 draw the circuit and then simulate its electrical characteristics.
 
-WWW: http://people.imendio.com/richard/oregano/
+WWW: http://arrakis.gforge.lug.fi.uba.ar/
diff --git a/cad/oregano/pkg-plist b/cad/oregano/pkg-plist
index 1e25b97b395d..48791c656a1e 100644
--- a/cad/oregano/pkg-plist
+++ b/cad/oregano/pkg-plist
@@ -1,21 +1,29 @@
 bin/oregano
 bin/pspice2oregano
 share/gnome/apps/Applications/oregano.desktop
-share/gnome/help/oregano/C/editing.html
-share/gnome/help/oregano/C/oregano.html
-share/gnome/help/oregano/C/simulation.html
-share/gnome/help/oregano/C/topic.dat
+share/gnome/help/oregano/C/legal.xml
+share/gnome/help/oregano/C/oregano.xml
+share/gnome/help/oregano/es/legal.xml
+share/gnome/help/oregano/es/oregano.xml
 share/gnome/mime-info/oregano.keys
 share/gnome/mime-info/oregano.mime
-share/gnome/oregano/glade/log-window.glade
-share/gnome/oregano/glade/part-browser.glade
-share/gnome/oregano/glade/part-properties-dialog.glade
-share/gnome/oregano/glade/plot-window.glade
-share/gnome/oregano/glade/settings.glade
-share/gnome/oregano/glade/sim-settings.glade
-share/gnome/oregano/glade/simulation.glade
-share/gnome/oregano/glade/summary.glade
-share/gnome/oregano/glade/textbox-properties-dialog.glade
+share/gnome/omf/oregano/oregano-C.omf
+share/gnome/omf/oregano/oregano-es.omf
+share/gnome/oregano/glade/clamp-properties-dialog.glade2
+share/gnome/oregano/glade/log-window.glade2
+share/gnome/oregano/glade/page-properties.glade2
+share/gnome/oregano/glade/part-browser.glade2
+share/gnome/oregano/glade/part-properties-dialog.glade2
+share/gnome/oregano/glade/plot-export.glade2
+share/gnome/oregano/glade/plot-window.glade2
+share/gnome/oregano/glade/properties.glade2
+share/gnome/oregano/glade/settings.glade2
+share/gnome/oregano/glade/sim-settings.glade2
+share/gnome/oregano/glade/simulation.glade2
+share/gnome/oregano/glade/splash.glade2
+share/gnome/oregano/glade/splash.xpm
+share/gnome/oregano/glade/textbox-properties-dialog.glade2
+share/gnome/oregano/glade/view-netlist.glade2
 share/gnome/oregano/libraries/cmos.oreglib
 share/gnome/oregano/libraries/cpu.oreglib
 share/gnome/oregano/libraries/default.oreglib
@@ -40,7 +48,7 @@ share/gnome/oregano/samples/OP177B.oregano
 share/gnome/oregano/samples/opamp.oregano
 share/gnome/oregano/samples/transistors.oregano
 share/gnome/oregano/samples/zener.oregano
-share/gnome/pixmaps/gnome-oregano.png
+share/gnome/pixmaps/gnome-oregano.svg
 share/locale/ca/LC_MESSAGES/oregano.mo
 share/locale/de/LC_MESSAGES/oregano.mo
 share/locale/es/LC_MESSAGES/oregano.mo
@@ -51,10 +59,15 @@ 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/glade
 @dirrm share/gnome/oregano
+@dirrm share/gnome/omf/oregano
+@dirrm share/gnome/help/oregano/es
 @dirrm share/gnome/help/oregano/C
 @dirrm share/gnome/help/oregano
+@exec update-mime-database %D/share/mime
+@unexec update-mime-database %D/share/mime