Update oregano to 0.20. Changes include:

 * A new part: wire jumper.
 * Drag'n'drop from the part preview to place parts.
 * A crude form of auto numbering when placing parts.
 * Cleaned up makefiles and put some samples in
   *<prefix>/share/oregano/samples/.
 * Changed default spice executable name to spice3.
 * Connection dots.
 * A simple voltmeter function.
 * Fix various ref/unref/sink design flaws, to
   increased stability.
 * Part browser remembers the previously selected part
   when switching libraries.
 * Should really work with libxml 2.x this time... :-)
 * Reorganization of installation directories for model
   and library files.
 * The plot widget now features axis values.
 * New parts: uA741 opamp and a simple zener diode.
 * Parts and wires can be flipped horizontally and vertically.
 * Enabled loading of simulation settings again.
 * Added a simple text label item to put text on the sheet.
 * Fixed the 'sometimes non-disappearing floating item' bug.
 * Should now also work with libxml 2.x (untested).
 * Switched C and B on the BJT transistor models.
 * Removed the unfinished printing support for now.
 * Redesign of lots of internals.
 * Added lots of functionality to the parts library,
   such as model files, and conditional values in templates.
 * Improved a few of the icons.
 * Fixed a bug where the name of the markers could not be edited.
 * You can inspect the connection span, by holding Control while
   moving the cursor over wires.
 * Added the ability to rotate parts while placing them; press 'r'
   to achieve this.
 * Logging of Spice warnings and errors during simulation.
   The messages can be shown in a log window.
 * Beautification of the part browser UI.
 * Added more tooltips and updated some translations.
 * Fixed a few non-critical bugs.
 * New and improved part properties editor.
 * Improved user interface for the plot window.
 * Internationalization fixes to netlist generation
   and schematic loading/saving.
 * The simulation now uses the user supplied time step size.
 * French translation from David Monniaux.
 * Even more refinement of the default library symbols/parts.
 * Mission 'Code Cleaning' continues.
 * Cut/copy/paste is implemented.
 * The symbols are redrawn to look much nicer and more standard.
 * Some new symbols, e.g. MOSFETs.
 * There can be more than one part library, thanks to Elker Cavina.
 * A bug with simulation time settings was fixed.
 * There is a problem with some spice packages, that make them generate
   binary output, even though the default should be ascii. This is now
   fixed by telling spice to always output text.
 * The help files are now installed in the rpm package.
 * Lots of code restructuring and cleaning.

4 files changed, 33 insertions, 20 deletions

diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 15e72166082..19c0c4a5d7d 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2000/08/16 00:07:32 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2000/11/25 11:59:18 rh Exp $
 #
 
-DISTNAME=		oregano-0.11
+DISTNAME=		oregano-0.20
 CATEGORIES=		cad gnome
 MASTER_SITES=		http://www.dtek.chalmers.se/~d4hult/oregano/download/
 
diff --git a/cad/oregano/files/md5 b/cad/oregano/files/md5
index 74cb7bed57c..aa9705925f9 100644
--- a/cad/oregano/files/md5
+++ b/cad/oregano/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/02/16 20:56:06 rh Exp $
+$NetBSD: md5,v 1.2 2000/11/25 11:59:18 rh Exp $
 
-MD5 (oregano-0.11.tar.gz) = 995a30d91d0de50d692a81aea3cdcdb3
+MD5 (oregano-0.20.tar.gz) = b74307cad009f56f691160bbc0c6a7c6
diff --git a/cad/oregano/patches/patch-aa b/cad/oregano/patches/patch-aa
deleted file mode 100644
index 0b31e355410..00000000000
--- a/cad/oregano/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/02/16 20:56:06 rh Exp $
-
---- configure.orig	Sun Jan 30 18:28:31 2000
-+++ configure	Wed Feb 16 21:00:08 2000
-@@ -2941,7 +2941,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lxml `$GNOME_CONFIG --libs xml` $LIBS"
-+LIBS="-lxml `$GNOME_CONFIG --libs xml` $LIBS -lz"
- cat > conftest.$ac_ext <<EOF
- #line 2947 "configure"
- #include "confdefs.h"
diff --git a/cad/oregano/pkg/PLIST b/cad/oregano/pkg/PLIST
index 7bb148ca77e..e395b6a34d3 100644
--- a/cad/oregano/pkg/PLIST
+++ b/cad/oregano/pkg/PLIST
@@ -1,21 +1,47 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/16 00:07:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/11/25 11:59:19 rh Exp $
 bin/oregano
-bin/oregano-convert
+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/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/sv/LC_MESSAGES/oregano.mo
 share/mime-info/oregano.keys
 share/mime-info/oregano.mime
-share/oregano/default.oreglib
 share/oregano/glade/part-browser.glade
 share/oregano/glade/settings.glade
 share/oregano/glade/sim-settings.glade
+share/oregano/glade/log-window.glade
+share/oregano/glade/part-properties-dialog.glade
+share/oregano/glade/plot-window.glade
+share/oregano/glade/simulation.glade
+share/oregano/glade/summary.glade
+share/oregano/glade/textbox-properties-dialog.glade
+share/oregano/libraries/default.oreglib
+share/oregano/libraries/opamplib.oreglib
+share/oregano/models/12AX7A.model
+share/oregano/models/1N750.model
+share/oregano/models/NPN.model
+share/oregano/models/PNP.model
+share/oregano/models/TLC555.model
+share/oregano/models/UA741.model
+share/oregano/samples/12ax7a.oregano
+share/oregano/samples/555.oregano
+share/oregano/samples/741.oregano
+share/oregano/samples/OP177B.oregano
+share/oregano/samples/opamp.oregano
+share/oregano/samples/transistors.oregano
+share/oregano/samples/zener.oregano
 share/pixmaps/gnome-oregano.png
 @dirrm share/gnome/help/oregano/C
 @dirrm share/gnome/help/oregano
+@dirrm share/oregano/samples
+@dirrm share/oregano/models
+@dirrm share/oregano/libraries
 @dirrm share/oregano/glade
 @dirrm share/oregano