- Update to 0.69.0

PR:		118609
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

9 files changed, 56 insertions, 140 deletions

diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 5f564bf31ebd..390fd09f1ac2 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -7,21 +7,16 @@
 #
 
 PORTNAME=	oregano
-PORTVERSION=	0.60.0
-PORTREVISION=	4
+PORTVERSION=	0.69.0
 CATEGORIES=	cad gnome
-MASTER_SITES=	http://gforge.lug.fi.uba.ar/frs/download.php/84/
+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 \
-		libgnomeprintui libgnomeui
+		libgnomeui
+USE_GETTEXT=	yes
 USE_SCONS=	yes
 INSTALLS_OMF=	yes
 
@@ -40,7 +35,5 @@ post-install:
 	${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>
diff --git a/cad/oregano/distinfo b/cad/oregano/distinfo
index a03e7ad34b96..f8cec0c7548e 100644
--- a/cad/oregano/distinfo
+++ b/cad/oregano/distinfo
@@ -1,3 +1,3 @@
-MD5 (oregano-0.60.0.tar.bz2) = 576942f1b6d3348f16d2eff085eb03f4
-SHA256 (oregano-0.60.0.tar.bz2) = 1c6ee75a5b8d5926064ad8a953dc70bf858b8a47a951e9998dcde3233680a6d2
-SIZE (oregano-0.60.0.tar.bz2) = 525514
+MD5 (oregano-0.69.0.tar.gz) = f98abc5c79cc733b49cd07995afc9c1e
+SHA256 (oregano-0.69.0.tar.gz) = 86242822ba08be50b00e81a0afc7a5b9d8ab5e1ff2023707a362a87f597f107a
+SIZE (oregano-0.69.0.tar.gz) = 640385
diff --git a/cad/oregano/files/patch-src__engines__netlist.c b/cad/oregano/files/patch-src__engines__netlist.c
deleted file mode 100644
index 60d280468165..000000000000
--- a/cad/oregano/files/patch-src__engines__netlist.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 --git a/cad/oregano/files/patch-src__model__node-store.c b/cad/oregano/files/patch-src__model__node-store.c
deleted file mode 100644
index d4a39e52440a..000000000000
--- a/cad/oregano/files/patch-src__model__node-store.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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;
diff --git a/cad/oregano/files/patch-src__print.c b/cad/oregano/files/patch-src__print.c
deleted file mode 100644
index 5c84977472c0..000000000000
--- a/cad/oregano/files/patch-src__print.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/print.c.orig	Thu Mar 29 10:30:23 2007
-+++ src/print.c	Thu Mar 29 10:30:26 2007
-@@ -31,6 +31,7 @@
- #include <math.h>
- #include <gnome.h>
- #include <libgnomeprint/gnome-print.h>
-+#include <libgnomeprint/gnome-print-paper.h>
- #include "schematic.h"
- #include "schematic-view.h"
- #include "sheet.h"
diff --git a/cad/oregano/files/patch-src__schematic-view.c b/cad/oregano/files/patch-src__schematic-view.c
deleted file mode 100644
index c7fd3c690120..000000000000
--- a/cad/oregano/files/patch-src__schematic-view.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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) {
diff --git a/cad/oregano/files/patch-src__sheet__wire-item.c b/cad/oregano/files/patch-src__sheet__wire-item.c
deleted file mode 100644
index e6c85906d885..000000000000
--- a/cad/oregano/files/patch-src__sheet__wire-item.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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) &&
diff --git a/cad/oregano/pkg-descr b/cad/oregano/pkg-descr
index 6de9aa1ca8b1..89beb50dd7b0 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://arrakis.gforge.lug.fi.uba.ar/
+WWW: http://oregano.gforge.lug.fi.uba.ar/
diff --git a/cad/oregano/pkg-plist b/cad/oregano/pkg-plist
index 5672869c7b25..be3a4e741bfa 100644
--- a/cad/oregano/pkg-plist
+++ b/cad/oregano/pkg-plist
@@ -11,48 +11,48 @@ share/mime-info/oregano.mime
 share/omf/oregano/oregano-C.omf
 share/omf/oregano/oregano-es.omf
 share/omf/oregano/oregano-fr.omf
-share/oregano/dialogs/clamp-properties-dialog.glade2
-share/oregano/dialogs/log-window.glade2
-share/oregano/dialogs/page-properties.glade2
-share/oregano/dialogs/part-browser.glade2
-share/oregano/dialogs/part-properties-dialog.glade2
-share/oregano/dialogs/plot-add-function.glade2
-share/oregano/dialogs/plot-export.glade2
-share/oregano/dialogs/plot-window.glade2
-share/oregano/dialogs/properties.glade2
-share/oregano/dialogs/settings.glade2
-share/oregano/dialogs/sim-settings.glade2
-share/oregano/dialogs/simulation.glade2
-share/oregano/dialogs/splash.glade2
-share/oregano/dialogs/splash.xpm
-share/oregano/dialogs/textbox-properties-dialog.glade2
-share/oregano/dialogs/view-netlist.glade2
-share/oregano/examples/Full-wave bridge rectifier.oregano
-share/oregano/examples/carga_capacitor.oregano
-share/oregano/examples/opamp.oregano
-share/oregano/examples/opamp_ideal.oregano
-share/oregano/examples/pasa_altos.oregano
-share/oregano/examples/simple.oregano
-share/oregano/examples/simple2.oregano
-share/oregano/libraries/cmos.oreglib
-share/oregano/libraries/cpu.oreglib
-share/oregano/libraries/default.oreglib
-share/oregano/libraries/interface.oreglib
-share/oregano/libraries/linear.oreglib
-share/oregano/libraries/memory.oreglib
-share/oregano/libraries/miscellaneous.oreglib
-share/oregano/libraries/opamplib.oreglib
-share/oregano/libraries/peripheral.oreglib
-share/oregano/libraries/power.oreglib
-share/oregano/libraries/ttl.oreglib
-share/oregano/models/12AX7A.model
-share/oregano/models/1N750.model
-share/oregano/models/DiodeBridge.model
-share/oregano/models/NPN.model
-share/oregano/models/PNP.model
-share/oregano/models/TLC555.model
-share/oregano/models/UA741.model
-share/pixmaps/gnome-oregano.svg
+%%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
@@ -65,11 +65,12 @@ 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/oregano/models
-@dirrm share/oregano/libraries
-@dirrm share/oregano/examples
-@dirrm share/oregano/dialogs
-@dirrm share/oregano
+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