Update dia to 0.90

Note: dia may crash if LC_CTYPE is unset. Setting it to
      "en_US.ISO8859-1" works for me)

* in FreeType mode, dia now looks for the xfs configuration files too
  to retrieve the font path.
* Polish version of the manual added
* a load-time compatibility issue with files produced by 0.88.1 was
  found and fixed for some UML objects.
* we now better use the intltool facilities
* increased tolerance to broken XML files
* ER objects can have their text size changed
* a couple bugs (i18n, l10n, p9y) fixed
* from now on, all XML files produced by dia will be encoded as UTF-8.
* Metapost renderer
* Faster Postscript files.
* More options in the UML Class dialog.
* An optional menu bar can be added to each display window, in
  addition to the popup menu.
* All RenderObjects have been replaced by equivalent shapes, and
  RenderObject support code removed.
* All Lazyprop objects have been converted to Standard Properties
  instead. Lazyprop support code removed.
* lots of internal changes and cleanups in the StdProp code. This
  breaks binary compatibility.
* Shapes can now have a <svg:text> element.
* polybeziers and beziergons now have their bounding box properly computed.
* a few new shapes have been added.
* crashes in the right-click menu have been nailed.

5 files changed, 455 insertions, 383 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index cac2dbf0577..db7a6a0c633 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2002/05/21 20:39:20 jwise Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/01 00:38:08 mjl Exp $
 
-DISTNAME=		dia-0.88.1
-PKGREVISION=		1
+DISTNAME=		dia-0.90
+# PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/dia/}
 
@@ -9,22 +9,23 @@ MAINTAINER=		jmcneill@invisible.yi.org
 HOMEPAGE=		http://www.lysator.liu.se/~alla/dia/
 COMMENT=		program for creating diagrams of all kinds
 
-DEPENDS+=		gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
-DEPENDS+=		libxml>=1.8.9:../../textproc/libxml
-DEPENDS+=		gnome-print>=0.29nb1:../../print/gnome-print
-DEPENDS+=		gdk-pixbuf>=0.11.0nb1:../../graphics/gdk-pixbuf
+BUILD_DEPENDS+=		bison>=1.35:../../devel/bison
+BUILDLINK_DEPENDS.gnome_libs=	gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
+BUILDLINK_DEPENDS.gdk-pixbuf=	gdk-pixbuf>=0.7.0:../../graphics/gdk-pixbuf
 
-USE_X11=		yes
-USE_GMAKE=		yes
-USE_LIBTOOL=		YES
-USE_BUILDLINK_ONLY=	YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+USE_X11=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	YES
+USE_BUILDLINK2=	YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-gnome --enable-gnome-print
+CONFIGURE_ARGS+=	--enable-gnome
+
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../textproc/libunicode/buildlink2.mk"
 
-.include "../../print/gnome-print/buildlink.mk"
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../x11/gnome-libs/buildlink.mk"
-.include "../../textproc/libxml/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dia/PLIST b/graphics/dia/PLIST
index 77b3143531c..e506e5dd191 100644
--- a/graphics/dia/PLIST
+++ b/graphics/dia/PLIST
@@ -1,181 +1,208 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:25 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/01 00:38:08 mjl Exp $
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/dia.mo
 bin/dia
-lib/dia/libstandard_objects.so
-lib/dia/libstandard_objects.la
-lib/dia/libnetwork_objects.so
-lib/dia/libnetwork_objects.la
-lib/dia/libuml_objects.so
-lib/dia/libuml_objects.la
-lib/dia/liber_objects.so
+lib/dia/libcgm_filter.la
+lib/dia/libcgm_filter.so
+lib/dia/libchronogram_objects.la
+lib/dia/libchronogram_objects.so
+lib/dia/libcustom_objects.la
+lib/dia/libcustom_objects.so
+lib/dia/libdxf_filter.la
+lib/dia/libdxf_filter.so
 lib/dia/liber_objects.la
-lib/dia/libeml_objects.so
-lib/dia/libeml_objects.la
-lib/dia/libfs_objects.so
-lib/dia/libfs_objects.la
-lib/dia/libsybase_objects.so
-lib/dia/libsybase_objects.la
-lib/dia/libflowchart_objects.so
+lib/dia/liber_objects.so
 lib/dia/libflowchart_objects.la
-lib/dia/libcustom_objects.so
-lib/dia/libcustom_objects.la
-lib/dia/libgrafcet_objects.so
+lib/dia/libflowchart_objects.so
+lib/dia/libfs_objects.la
+lib/dia/libfs_objects.so
 lib/dia/libgrafcet_objects.la
-lib/dia/libchronogram_objects.so
-lib/dia/libchronogram_objects.la
-lib/dia/libsadt_objects.so
-lib/dia/libsadt_objects.la
-lib/dia/libcgm_filter.so
-lib/dia/libcgm_filter.la
-lib/dia/libpstricks_filter.so
-lib/dia/libpstricks_filter.la
-lib/dia/libdxf_filter.so
-lib/dia/libdxf_filter.la
-lib/dia/libxfig_filter.so
-lib/dia/libxfig_filter.la
-lib/dia/libhpgl_filter.so
+lib/dia/libgrafcet_objects.so
 lib/dia/libhpgl_filter.la
-lib/dia/libwpg_filter.so
-lib/dia/libwpg_filter.la
-lib/dia/libsvg_filter.so
-lib/dia/libsvg_filter.la
-lib/dia/libshape_filter.so
+lib/dia/libhpgl_filter.so
+lib/dia/libnetwork_objects.la
+lib/dia/libnetwork_objects.so
+lib/dia/libpstricks_filter.la
+lib/dia/libpstricks_filter.so
+lib/dia/libsadt_objects.la
+lib/dia/libsadt_objects.so
 lib/dia/libshape_filter.la
+lib/dia/libshape_filter.so
+lib/dia/libstandard_objects.a
+lib/dia/libstandard_objects.la
+lib/dia/libstandard_objects.so
+lib/dia/libnetwork_objects.a
+lib/dia/libuml_objects.a
+lib/dia/liber_objects.a
+lib/dia/libfs_objects.a
+lib/dia/libflowchart_objects.a
+lib/dia/libcustom_objects.a
+lib/dia/libgrafcet_objects.a
+lib/dia/libchronogram_objects.a
+lib/dia/libsadt_objects.a
+lib/dia/libcgm_filter.a
+lib/dia/libmetapost_filter.so
+lib/dia/libmetapost_filter.la
+lib/dia/libpstricks_filter.a
+lib/dia/libhpgl_filter.a
+lib/dia/libwpg_filter.a
+lib/dia/libsvg_filter.a
+lib/dia/libshape_filter.a
+lib/dia/libdxf_filter.a
+lib/dia/libxfig_filter.a
+lib/dia/libmetapost_filter.a
+lib/dia/libsvg_filter.la
+lib/dia/libsvg_filter.so
+lib/dia/libuml_objects.la
+lib/dia/libuml_objects.so
+lib/dia/libwpg_filter.la
+lib/dia/libwpg_filter.so
+lib/dia/libxfig_filter.la
+lib/dia/libxfig_filter.so
 man/man1/dia.1
-share/locale/az/LC_MESSAGES/dia.mo
-share/locale/ca/LC_MESSAGES/dia.mo
-share/locale/da/LC_MESSAGES/dia.mo
-share/locale/de/LC_MESSAGES/dia.mo
-share/locale/el/LC_MESSAGES/dia.mo
-share/locale/en_GB/LC_MESSAGES/dia.mo
-share/locale/es/LC_MESSAGES/dia.mo
-share/locale/fi/LC_MESSAGES/dia.mo
-share/locale/fr/LC_MESSAGES/dia.mo
-share/locale/ga/LC_MESSAGES/dia.mo
-share/locale/hu/LC_MESSAGES/dia.mo
-share/locale/it/LC_MESSAGES/dia.mo
-share/locale/ja/LC_MESSAGES/dia.mo
-share/locale/ko/LC_MESSAGES/dia.mo
-share/locale/nl/LC_MESSAGES/dia.mo
-share/locale/no/LC_MESSAGES/dia.mo
-share/locale/pl/LC_MESSAGES/dia.mo
-share/locale/pt/LC_MESSAGES/dia.mo
-share/locale/pt_BR/LC_MESSAGES/dia.mo
-share/locale/ru/LC_MESSAGES/dia.mo
-share/locale/sl/LC_MESSAGES/dia.mo
-share/locale/sv/LC_MESSAGES/dia.mo
-share/locale/tr/LC_MESSAGES/dia.mo
-share/locale/uk/LC_MESSAGES/dia.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/dia.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/dia.mo
+share/dia/dia_logo.png
 share/dia/shapes/Circuit/ground.shape
 share/dia/shapes/Circuit/ground.xpm
 share/dia/shapes/Circuit/hcapacitor.shape
 share/dia/shapes/Circuit/hcapacitor.xpm
 share/dia/shapes/Circuit/hdiode.shape
 share/dia/shapes/Circuit/hdiode.xpm
+share/dia/shapes/Circuit/hfuse_de.shape
+share/dia/shapes/Circuit/hfuse_de.xpm
 share/dia/shapes/Circuit/hinductor.shape
 share/dia/shapes/Circuit/hinductor.xpm
+share/dia/shapes/Circuit/hinductor_de.shape
+share/dia/shapes/Circuit/hinductor_de.xpm
+share/dia/shapes/Circuit/hjumper.shape
+share/dia/shapes/Circuit/hled_de.shape
+share/dia/shapes/Circuit/hled_de.xpm
+share/dia/shapes/Circuit/hpowersource_de.shape
+share/dia/shapes/Circuit/hpowersource_de.xpm
 share/dia/shapes/Circuit/hresistor.shape
 share/dia/shapes/Circuit/hresistor.xpm
+share/dia/shapes/Circuit/hresistor_de.shape
+share/dia/shapes/Circuit/hresistor_de.xpm
 share/dia/shapes/Circuit/hzener.shape
 share/dia/shapes/Circuit/hzener.xpm
+share/dia/shapes/Circuit/lamp_de.shape
+share/dia/shapes/Circuit/lamp_de.xpm
+share/dia/shapes/Circuit/microphone_de.shape
+share/dia/shapes/Circuit/microphone_de.xpm
+share/dia/shapes/Circuit/nmos_de.shape
+share/dia/shapes/Circuit/nmos_de.xpm
 share/dia/shapes/Circuit/npn.shape
 share/dia/shapes/Circuit/npn.xpm
 share/dia/shapes/Circuit/opamp.shape
 share/dia/shapes/Circuit/opamp.xpm
+share/dia/shapes/Circuit/pmos_de.shape
+share/dia/shapes/Circuit/pmos_de.xpm
 share/dia/shapes/Circuit/pnp.shape
 share/dia/shapes/Circuit/pnp.xpm
+share/dia/shapes/Circuit/speaker_de.shape
+share/dia/shapes/Circuit/speaker_de.xpm
 share/dia/shapes/Circuit/vcapacitor.shape
 share/dia/shapes/Circuit/vcapacitor.xpm
 share/dia/shapes/Circuit/vdiode.shape
 share/dia/shapes/Circuit/vdiode.xpm
+share/dia/shapes/Circuit/vfuse_de.shape
+share/dia/shapes/Circuit/vfuse_de.xpm
 share/dia/shapes/Circuit/vinductor.shape
 share/dia/shapes/Circuit/vinductor.xpm
-share/dia/shapes/Circuit/vresistor.shape
-share/dia/shapes/Circuit/vresistor.xpm
-share/dia/shapes/Circuit/vzener.shape
-share/dia/shapes/Circuit/vzener.xpm
-share/dia/shapes/Circuit/hinductor_de.shape
-share/dia/shapes/Circuit/hinductor_de.xpm
 share/dia/shapes/Circuit/vinductor_de.shape
 share/dia/shapes/Circuit/vinductor_de.xpm
-share/dia/shapes/Circuit/hresistor_de.shape
-share/dia/shapes/Circuit/vresistor_de.xpm
-share/dia/shapes/Circuit/vresistor_de.shape
-share/dia/shapes/Circuit/hresistor_de.xpm
-share/dia/shapes/Circuit/hpowersource_de.shape
-share/dia/shapes/Circuit/hpowersource_de.xpm
-share/dia/shapes/Circuit/vpowersource_de.shape
-share/dia/shapes/Circuit/vpowersource_de.xpm
-share/dia/shapes/Circuit/lamp_de.shape
-share/dia/shapes/Circuit/lamp_de.xpm
-share/dia/shapes/Circuit/speaker_de.shape
-share/dia/shapes/Circuit/speaker_de.xpm
-share/dia/shapes/Circuit/hfuse_de.shape
-share/dia/shapes/Circuit/hfuse_de.xpm
-share/dia/shapes/Circuit/vfuse_de.shape
-share/dia/shapes/Circuit/vfuse_de.xpm
-share/dia/shapes/Circuit/hled_de.shape
-share/dia/shapes/Circuit/hled_de.xpm
 share/dia/shapes/Circuit/vled_de.shape
 share/dia/shapes/Circuit/vled_de.xpm
-share/dia/shapes/Circuit/nmos_de.shape
-share/dia/shapes/Circuit/nmos_de.xpm
-share/dia/shapes/Circuit/pmos_de.shape
-share/dia/shapes/Circuit/pmos_de.xpm
-share/dia/shapes/Circuit/hjumper.shape
-share/dia/shapes/Flowchart/display.shape
-share/dia/shapes/Flowchart/document.shape
-share/dia/shapes/Flowchart/transaction.shape
-share/dia/shapes/Flowchart/offpageconn.shape
-share/dia/shapes/Flowchart/manualop.shape
-share/dia/shapes/Flowchart/preparation.shape
-share/dia/shapes/Flowchart/manualinput.shape
-share/dia/shapes/Flowchart/predefdproc.shape
-share/dia/shapes/Flowchart/terminal.shape
-share/dia/shapes/Flowchart/magdisk.shape
-share/dia/shapes/Flowchart/magtape.shape
-share/dia/shapes/Flowchart/intstorage.shape
-share/dia/shapes/Flowchart/merge.shape
-share/dia/shapes/Flowchart/extract.shape
-share/dia/shapes/Flowchart/delay.shape
-share/dia/shapes/Flowchart/sumjunction.shape
-share/dia/shapes/Flowchart/collate.shape
-share/dia/shapes/Flowchart/sort.shape
-share/dia/shapes/Flowchart/or.shape
-share/dia/shapes/Flowchart/display.xpm
-share/dia/shapes/Flowchart/magdrum.shape
-share/dia/shapes/Flowchart/offlinestore.shape
-share/dia/shapes/Flowchart/punchedcard.shape
-share/dia/shapes/Flowchart/punchedtape.shape
-share/dia/shapes/Flowchart/transmittape.shape
-share/dia/shapes/Flowchart/document.xpm
-share/dia/shapes/Flowchart/transaction.xpm
-share/dia/shapes/Flowchart/offpageconn.xpm
-share/dia/shapes/Flowchart/manualop.xpm
-share/dia/shapes/Flowchart/preparation.xpm
-share/dia/shapes/Flowchart/manualinput.xpm
-share/dia/shapes/Flowchart/predefdproc.xpm
-share/dia/shapes/Flowchart/terminal.xpm
-share/dia/shapes/Flowchart/magdisk.xpm
-share/dia/shapes/Flowchart/magtape.xpm
-share/dia/shapes/Flowchart/intstorage.xpm
-share/dia/shapes/Flowchart/merge.xpm
-share/dia/shapes/Flowchart/extract.xpm
-share/dia/shapes/Flowchart/delay.xpm
-share/dia/shapes/Flowchart/sumjunction.xpm
-share/dia/shapes/Flowchart/collate.xpm
-share/dia/shapes/Flowchart/or.xpm
-share/dia/shapes/Flowchart/sort.xpm
-share/dia/shapes/Flowchart/magdrum.xpm
-share/dia/shapes/Flowchart/offlinestore.xpm
-share/dia/shapes/Flowchart/punchedcard.xpm
-share/dia/shapes/Flowchart/punchedtape.xpm
-share/dia/shapes/Flowchart/transmittape.xpm
-share/dia/shapes/Contact/c_ifnot.shape
-share/dia/shapes/Contact/c_ifnot.xpm
+share/dia/shapes/Circuit/vpowersource_de.shape
+share/dia/shapes/Circuit/vpowersource_de.xpm
+share/dia/shapes/Circuit/vresistor.shape
+share/dia/shapes/Circuit/vresistor.xpm
+share/dia/shapes/Circuit/vresistor_de.shape
+share/dia/shapes/Circuit/vresistor_de.xpm
+share/dia/shapes/Circuit/vzener.shape
+share/dia/shapes/Circuit/vzener.xpm
+share/dia/shapes/Civil/bvrest.shape
+share/dia/shapes/Civil/bvrest.xpm
+share/dia/shapes/Civil/civil_aerator.shape
+share/dia/shapes/Civil/civil_aerator.xpm
+share/dia/shapes/Civil/civil_arrow_right.shape
+share/dia/shapes/Civil/civil_arrow_right.xpm
+share/dia/shapes/Civil/civil_arrow_up.shape
+share/dia/shapes/Civil/civil_arrow_up.xpm
+share/dia/shapes/Civil/civil_backflow_preventer.shape
+share/dia/shapes/Civil/civil_backflow_preventer.xpm
+share/dia/shapes/Civil/civil_basin.shape
+share/dia/shapes/Civil/civil_basin.xpm
+share/dia/shapes/Civil/civil_container.shape
+share/dia/shapes/Civil/civil_container.xpm
+share/dia/shapes/Civil/civil_final-settling_basin.shape
+share/dia/shapes/Civil/civil_final-settling_basin.xpm
+share/dia/shapes/Civil/civil_frequency_converter.shape
+share/dia/shapes/Civil/civil_frequency_converter.xpm
+share/dia/shapes/Civil/civil_gas_bottle.shape
+share/dia/shapes/Civil/civil_gas_bottle.xpm
+share/dia/shapes/Civil/civil_horizontal_limiting_line.shape
+share/dia/shapes/Civil/civil_horizontal_limiting_line.xpm
+share/dia/shapes/Civil/civil_horizontal_valve.shape
+share/dia/shapes/Civil/civil_horizontal_valve.xpm
+share/dia/shapes/Civil/civil_motor.shape
+share/dia/shapes/Civil/civil_motor.xpm
+share/dia/shapes/Civil/civil_preliminary_clarification_tank.shape
+share/dia/shapes/Civil/civil_preliminary_clarification_tank.xpm
+share/dia/shapes/Civil/civil_rotor.shape
+share/dia/shapes/Civil/civil_rotor.xpm
+share/dia/shapes/Civil/civil_soil.shape
+share/dia/shapes/Civil/civil_soil.xpm
+share/dia/shapes/Civil/civil_vertical_limiting_line.shape
+share/dia/shapes/Civil/civil_vertical_limiting_line.xpm
+share/dia/shapes/Civil/civil_vertical_propeller.shape
+share/dia/shapes/Civil/civil_vertical_propeller.xpm
+share/dia/shapes/Civil/hcompressor.shape
+share/dia/shapes/Civil/hcompressor.xpm
+share/dia/shapes/Civil/hpump.shape
+share/dia/shapes/Civil/hpump.xpm
+share/dia/shapes/Civil/hrest.shape
+share/dia/shapes/Civil/hrest.xpm
+share/dia/shapes/Civil/line.shape
+share/dia/shapes/Civil/line.xpm
+share/dia/shapes/Civil/vcompressor.shape
+share/dia/shapes/Civil/vcompressor.xpm
+share/dia/shapes/Civil/vpump.shape
+share/dia/shapes/Civil/vpump.xpm
+share/dia/shapes/Civil/vrest.shape
+share/dia/shapes/Civil/vrest.xpm
+share/dia/shapes/Civil/water_level.shape
+share/dia/shapes/Civil/water_level.xpm
 share/dia/shapes/Contact/c_if.shape
 share/dia/shapes/Contact/c_if.xpm
+share/dia/shapes/Contact/c_ifnot.shape
+share/dia/shapes/Contact/c_ifnot.xpm
 share/dia/shapes/Contact/c_lamp.shape
 share/dia/shapes/Contact/c_lamp.xpm
 share/dia/shapes/Contact/c_relay.shape
@@ -186,16 +213,16 @@ share/dia/shapes/Contact/l_ifnot.shape
 share/dia/shapes/Contact/l_ifnot.xpm
 share/dia/shapes/Contact/l_out.shape
 share/dia/shapes/Contact/l_out.xpm
+share/dia/shapes/Contact/l_outj.shape
+share/dia/shapes/Contact/l_outj.xpm
 share/dia/shapes/Contact/l_outnot.shape
 share/dia/shapes/Contact/l_outnot.xpm
 share/dia/shapes/Contact/l_outr.shape
 share/dia/shapes/Contact/l_outr.xpm
-share/dia/shapes/Contact/l_outs.shape
-share/dia/shapes/Contact/l_outs.xpm
-share/dia/shapes/Contact/l_outj.shape
-share/dia/shapes/Contact/l_outj.xpm
 share/dia/shapes/Contact/l_outrcep.shape
 share/dia/shapes/Contact/l_outrcep.xpm
+share/dia/shapes/Contact/l_outs.shape
+share/dia/shapes/Contact/l_outs.xpm
 share/dia/shapes/Contact/l_sout.shape
 share/dia/shapes/Contact/l_sout.xpm
 share/dia/shapes/Contact/l_soutnot.shape
@@ -204,22 +231,132 @@ share/dia/shapes/Contact/l_soutr.shape
 share/dia/shapes/Contact/l_soutr.xpm
 share/dia/shapes/Contact/l_souts.shape
 share/dia/shapes/Contact/l_souts.xpm
-share/dia/shapes/Network/nwcloud.shape
-share/dia/shapes/Network/nwcloud.xpm
-share/dia/shapes/Network/router-symbol.shape
-share/dia/shapes/Network/router-symbol.xpm
-share/dia/shapes/Network/switch-atm-symbol.shape
-share/dia/shapes/Network/switch-atm-symbol.xpm
-share/dia/shapes/Network/switch-symbol.shape
-share/dia/shapes/Network/switch-symbol.xpm
+share/dia/shapes/Electric/cnx.shape
+share/dia/shapes/Electric/cnx.xpm
+share/dia/shapes/Electric/command.shape
+share/dia/shapes/Electric/command.xpm
+share/dia/shapes/Electric/contact_f.shape
+share/dia/shapes/Electric/contact_f.xpm
+share/dia/shapes/Electric/contact_o.shape
+share/dia/shapes/Electric/contact_o.xpm
+share/dia/shapes/Electric/intpos_f.shape
+share/dia/shapes/Electric/intpos_f.xpm
+share/dia/shapes/Electric/intpos_o.shape
+share/dia/shapes/Electric/intpos_o.xpm
+share/dia/shapes/Electric/lamp.shape
+share/dia/shapes/Electric/lamp.xpm
+share/dia/shapes/Electric/relay.shape
+share/dia/shapes/Electric/relay.xpm
+share/dia/shapes/Flowchart/collate.shape
+share/dia/shapes/Flowchart/collate.xpm
+share/dia/shapes/Flowchart/delay.shape
+share/dia/shapes/Flowchart/delay.xpm
+share/dia/shapes/Flowchart/display.shape
+share/dia/shapes/Flowchart/display.xpm
+share/dia/shapes/Flowchart/document.shape
+share/dia/shapes/Flowchart/document.xpm
+share/dia/shapes/Flowchart/extract.shape
+share/dia/shapes/Flowchart/extract.xpm
+share/dia/shapes/Flowchart/intstorage.shape
+share/dia/shapes/Flowchart/intstorage.xpm
+share/dia/shapes/Flowchart/magdisk.shape
+share/dia/shapes/Flowchart/magdisk.xpm
+share/dia/shapes/Flowchart/magdrum.shape
+share/dia/shapes/Flowchart/magdrum.xpm
+share/dia/shapes/Flowchart/magtape.shape
+share/dia/shapes/Flowchart/magtape.xpm
+share/dia/shapes/Flowchart/manualinput.shape
+share/dia/shapes/Flowchart/manualinput.xpm
+share/dia/shapes/Flowchart/manualop.shape
+share/dia/shapes/Flowchart/manualop.xpm
+share/dia/shapes/Flowchart/merge.shape
+share/dia/shapes/Flowchart/merge.xpm
+share/dia/shapes/Flowchart/offlinestore.shape
+share/dia/shapes/Flowchart/offlinestore.xpm
+share/dia/shapes/Flowchart/offpageconn.shape
+share/dia/shapes/Flowchart/offpageconn.xpm
+share/dia/shapes/Flowchart/or.shape
+share/dia/shapes/Flowchart/or.xpm
+share/dia/shapes/Flowchart/predefdproc.shape
+share/dia/shapes/Flowchart/predefdproc.xpm
+share/dia/shapes/Flowchart/preparation.shape
+share/dia/shapes/Flowchart/preparation.xpm
+share/dia/shapes/Flowchart/punchedcard.shape
+share/dia/shapes/Flowchart/punchedcard.xpm
+share/dia/shapes/Flowchart/punchedtape.shape
+share/dia/shapes/Flowchart/punchedtape.xpm
+share/dia/shapes/Flowchart/sort.shape
+share/dia/shapes/Flowchart/sort.xpm
+share/dia/shapes/Flowchart/sumjunction.shape
+share/dia/shapes/Flowchart/sumjunction.xpm
+share/dia/shapes/Flowchart/terminal.shape
+share/dia/shapes/Flowchart/terminal.xpm
+share/dia/shapes/Flowchart/transaction.shape
+share/dia/shapes/Flowchart/transaction.xpm
+share/dia/shapes/Flowchart/transmittape.shape
+share/dia/shapes/Flowchart/transmittape.xpm
+share/dia/shapes/Logic/and.png
+share/dia/shapes/Logic/and.shape
+share/dia/shapes/Logic/buffer.png
+share/dia/shapes/Logic/buffer.shape
+share/dia/shapes/Logic/connector.png
+share/dia/shapes/Logic/connector.shape
+share/dia/shapes/Logic/inverter.png
+share/dia/shapes/Logic/inverter.shape
+share/dia/shapes/Logic/nand.png
+share/dia/shapes/Logic/nand.shape
+share/dia/shapes/Logic/nor.png
+share/dia/shapes/Logic/nor.shape
+share/dia/shapes/Logic/not.png
+share/dia/shapes/Logic/not.shape
+share/dia/shapes/Logic/or.png
+share/dia/shapes/Logic/or.shape
+share/dia/shapes/Logic/xor.png
+share/dia/shapes/Logic/xor.shape
+share/dia/shapes/MSE/demultiplexer.shape
+share/dia/shapes/MSE/demultiplexer.xpm
+share/dia/shapes/MSE/large_extension_node.shape
+share/dia/shapes/MSE/large_extension_node.xpm
+share/dia/shapes/MSE/multiplexer.shape
+share/dia/shapes/MSE/multiplexer.xpm
+share/dia/shapes/MSE/node_center.shape
+share/dia/shapes/MSE/node_center.xpm
+share/dia/shapes/MSE/small_extension_node.shape
+share/dia/shapes/MSE/small_extension_node.xpm
+share/dia/shapes/MSE/tacsat.shape
+share/dia/shapes/MSE/tacsat.xpm
+share/dia/shapes/Misc/file.png
+share/dia/shapes/Misc/file.shape
+share/dia/shapes/Misc/folder.png
+share/dia/shapes/Misc/folder.shape
+share/dia/shapes/Network/antenna.shape
+share/dia/shapes/Network/antenna.xpm
+share/dia/shapes/Network/computer.shape
+share/dia/shapes/Network/computer.xpm
 share/dia/shapes/Network/dat_external.shape
 share/dia/shapes/Network/dat_external.xpm
+share/dia/shapes/Network/disc.shape
+share/dia/shapes/Network/disc.xpm
 share/dia/shapes/Network/diskette.shape
 share/dia/shapes/Network/diskette.xpm
+share/dia/shapes/Network/firewall.shape
+share/dia/shapes/Network/firewall.xpm
+share/dia/shapes/Network/flash.shape
+share/dia/shapes/Network/flash.xpm
+share/dia/shapes/Network/genmonitor.shape
+share/dia/shapes/Network/genmonitor.xpm
+share/dia/shapes/Network/hub.shape
+share/dia/shapes/Network/hub.xpm
 share/dia/shapes/Network/mobile_phone.shape
 share/dia/shapes/Network/mobile_phone.xpm
+share/dia/shapes/Network/modem.shape
+share/dia/shapes/Network/modem.xpm
+share/dia/shapes/Network/modularswitch.shape
+share/dia/shapes/Network/modularswitch.xpm
 share/dia/shapes/Network/monitor.shape
 share/dia/shapes/Network/monitor.xpm
+share/dia/shapes/Network/nwcloud.shape
+share/dia/shapes/Network/nwcloud.xpm
 share/dia/shapes/Network/pc_bigtower.shape
 share/dia/shapes/Network/pc_bigtower.xpm
 share/dia/shapes/Network/pc_desktop.shape
@@ -228,16 +365,30 @@ share/dia/shapes/Network/pc_miditower.shape
 share/dia/shapes/Network/pc_miditower.xpm
 share/dia/shapes/Network/pc_minitower.shape
 share/dia/shapes/Network/pc_minitower.xpm
+share/dia/shapes/Network/printer.shape
+share/dia/shapes/Network/printer.xpm
+share/dia/shapes/Network/rj45plug.shape
+share/dia/shapes/Network/rj45plug.xpm
+share/dia/shapes/Network/router-symbol.shape
+share/dia/shapes/Network/router-symbol.xpm
+share/dia/shapes/Network/sceadplug.shape
+share/dia/shapes/Network/sceadplug.xpm
 share/dia/shapes/Network/speaker.shape
 share/dia/shapes/Network/speaker.xpm
 share/dia/shapes/Network/speaker_amp.shape
 share/dia/shapes/Network/speaker_amp.xpm
+share/dia/shapes/Network/switch-atm-symbol.shape
+share/dia/shapes/Network/switch-atm-symbol.xpm
+share/dia/shapes/Network/switch-symbol.shape
+share/dia/shapes/Network/switch-symbol.xpm
+share/dia/shapes/Network/telephone.png
+share/dia/shapes/Network/telephone.shape
 share/dia/shapes/Network/workstation.shape
 share/dia/shapes/Network/workstation.xpm
 share/dia/shapes/Network/zip-disk.shape
 share/dia/shapes/Network/zip-disk.xpm
-share/dia/shapes/Pneumatic/dejack.shape
-share/dia/shapes/Pneumatic/dejack.xpm
+share/dia/shapes/Pneumatic/cnx.shape
+share/dia/shapes/Pneumatic/cnx.xpm
 share/dia/shapes/Pneumatic/comelec1.shape
 share/dia/shapes/Pneumatic/comelec1.xpm
 share/dia/shapes/Pneumatic/comelec2.shape
@@ -250,8 +401,12 @@ share/dia/shapes/Pneumatic/compilh.shape
 share/dia/shapes/Pneumatic/compilh.xpm
 share/dia/shapes/Pneumatic/compilp.shape
 share/dia/shapes/Pneumatic/compilp.xpm
+share/dia/shapes/Pneumatic/compush.shape
+share/dia/shapes/Pneumatic/compush.xpm
 share/dia/shapes/Pneumatic/comspr.shape
 share/dia/shapes/Pneumatic/comspr.xpm
+share/dia/shapes/Pneumatic/dejack.shape
+share/dia/shapes/Pneumatic/dejack.xpm
 share/dia/shapes/Pneumatic/dist22.shape
 share/dia/shapes/Pneumatic/dist22.xpm
 share/dia/shapes/Pneumatic/dist32.shape
@@ -272,120 +427,6 @@ share/dia/shapes/Pneumatic/seijack.shape
 share/dia/shapes/Pneumatic/seijack.xpm
 share/dia/shapes/Pneumatic/seojack.shape
 share/dia/shapes/Pneumatic/seojack.xpm
-share/dia/shapes/Pneumatic/cnx.shape
-share/dia/shapes/Pneumatic/cnx.xpm
-share/dia/shapes/Electric/contact_o.shape
-share/dia/shapes/Electric/contact_o.xpm
-share/dia/shapes/Electric/contact_f.shape
-share/dia/shapes/Electric/contact_f.xpm
-share/dia/shapes/Electric/relay.shape
-share/dia/shapes/Electric/relay.xpm
-share/dia/shapes/Electric/lamp.shape
-share/dia/shapes/Electric/lamp.xpm
-share/dia/shapes/Electric/intpos_o.shape
-share/dia/shapes/Electric/intpos_o.xpm
-share/dia/shapes/Electric/intpos_f.shape
-share/dia/shapes/Electric/intpos_f.xpm
-share/dia/shapes/Electric/command.shape
-share/dia/shapes/Electric/command.xpm
-share/dia/shapes/Electric/cnx.shape
-share/dia/shapes/Electric/cnx.xpm
-share/dia/shapes/Civil/bvrest.shape
-share/dia/shapes/Civil/bvrest.xpm
-share/dia/shapes/Civil/civil_aerator.shape
-share/dia/shapes/Civil/civil_aerator.xpm
-share/dia/shapes/Civil/civil_arrow_right.shape
-share/dia/shapes/Civil/civil_arrow_right.xpm
-share/dia/shapes/Civil/civil_arrow_up.shape
-share/dia/shapes/Civil/civil_arrow_up.xpm
-share/dia/shapes/Civil/civil_backflow_preventer.shape
-share/dia/shapes/Civil/civil_backflow_preventer.xpm
-share/dia/shapes/Civil/civil_basin.shape
-share/dia/shapes/Civil/civil_basin.xpm
-share/dia/shapes/Civil/civil_container.shape
-share/dia/shapes/Civil/civil_container.xpm
-share/dia/shapes/Civil/civil_final-settling_basin.shape
-share/dia/shapes/Civil/civil_motor.shape
-share/dia/shapes/Civil/civil_final-settling_basin.xpm
-share/dia/shapes/Civil/civil_frequency_converter.shape
-share/dia/shapes/Civil/civil_frequency_converter.xpm
-share/dia/shapes/Civil/civil_gas_bottle.xpm
-share/dia/shapes/Civil/civil_gas_bottle.shape
-share/dia/shapes/Civil/civil_horizontal_limiting_line.shape
-share/dia/shapes/Civil/civil_horizontal_limiting_line.xpm
-share/dia/shapes/Civil/civil_horizontal_valve.shape
-share/dia/shapes/Civil/civil_horizontal_valve.xpm
-share/dia/shapes/Civil/civil_motor.xpm
-share/dia/shapes/Civil/civil_preliminary_clarification_tank.shape
-share/dia/shapes/Civil/civil_preliminary_clarification_tank.xpm
-share/dia/shapes/Civil/civil_rotor.shape
-share/dia/shapes/Civil/civil_rotor.xpm
-share/dia/shapes/Civil/civil_soil.shape
-share/dia/shapes/Civil/civil_soil.xpm
-share/dia/shapes/Civil/civil_vertical_limiting_line.shape
-share/dia/shapes/Civil/civil_vertical_limiting_line.xpm
-share/dia/shapes/Civil/civil_vertical_propeller.shape
-share/dia/shapes/Civil/civil_vertical_propeller.xpm
-share/dia/shapes/Civil/hcompressor.shape
-share/dia/shapes/Civil/hcompressor.xpm
-share/dia/shapes/Civil/vcompressor.shape
-share/dia/shapes/Civil/vcompressor.xpm
-share/dia/shapes/Civil/hpump.shape
-share/dia/shapes/Civil/hpump.xpm
-share/dia/shapes/Civil/vpump.shape
-share/dia/shapes/Civil/vpump.xpm
-share/dia/shapes/Civil/hrest.shape
-share/dia/shapes/Civil/hrest.xpm
-share/dia/shapes/Civil/vrest.shape
-share/dia/shapes/Civil/vrest.xpm
-share/dia/shapes/Civil/line.shape
-share/dia/shapes/Civil/line.xpm
-share/dia/shapes/Civil/water_level.shape
-share/dia/shapes/Civil/water_level.xpm
-share/dia/shapes/jigsaw/part_iiii.shape
-share/dia/shapes/jigsaw/part_iiii.xpm
-share/dia/shapes/jigsaw/part_iiio.shape
-share/dia/shapes/jigsaw/part_iiio.xpm
-share/dia/shapes/jigsaw/part_iioi.shape
-share/dia/shapes/jigsaw/part_iioi.xpm
-share/dia/shapes/jigsaw/part_iioo.shape
-share/dia/shapes/jigsaw/part_iioo.xpm
-share/dia/shapes/jigsaw/part_ioii.shape
-share/dia/shapes/jigsaw/part_ioii.xpm
-share/dia/shapes/jigsaw/part_ioio.shape
-share/dia/shapes/jigsaw/part_ioio.xpm
-share/dia/shapes/jigsaw/part_iooi.shape
-share/dia/shapes/jigsaw/part_iooi.xpm
-share/dia/shapes/jigsaw/part_iooo.shape
-share/dia/shapes/jigsaw/part_iooo.xpm
-share/dia/shapes/jigsaw/part_oiii.shape
-share/dia/shapes/jigsaw/part_oiii.xpm
-share/dia/shapes/jigsaw/part_oiio.shape
-share/dia/shapes/jigsaw/part_oiio.xpm
-share/dia/shapes/jigsaw/part_oioi.shape
-share/dia/shapes/jigsaw/part_oioi.xpm
-share/dia/shapes/jigsaw/part_oioo.shape
-share/dia/shapes/jigsaw/part_oioo.xpm
-share/dia/shapes/jigsaw/part_ooii.shape
-share/dia/shapes/jigsaw/part_ooii.xpm
-share/dia/shapes/jigsaw/part_ooio.shape
-share/dia/shapes/jigsaw/part_ooio.xpm
-share/dia/shapes/jigsaw/part_oooi.shape
-share/dia/shapes/jigsaw/part_oooi.xpm
-share/dia/shapes/jigsaw/part_oooo.shape
-share/dia/shapes/jigsaw/part_oooo.xpm
-share/dia/shapes/MSE/demultiplexer.shape
-share/dia/shapes/MSE/demultiplexer.xpm
-share/dia/shapes/MSE/large_extension_node.shape
-share/dia/shapes/MSE/large_extension_node.xpm
-share/dia/shapes/MSE/multiplexer.shape
-share/dia/shapes/MSE/multiplexer.xpm
-share/dia/shapes/MSE/node_center.shape
-share/dia/shapes/MSE/node_center.xpm
-share/dia/shapes/MSE/small_extension_node.shape
-share/dia/shapes/MSE/small_extension_node.xpm
-share/dia/shapes/MSE/tacsat.shape
-share/dia/shapes/MSE/tacsat.xpm
 share/dia/shapes/SDL/block.shape
 share/dia/shapes/SDL/block.xpm
 share/dia/shapes/SDL/comment.shape
@@ -420,113 +461,107 @@ share/dia/shapes/SDL/stop.shape
 share/dia/shapes/SDL/stop.xpm
 share/dia/shapes/SDL/task.shape
 share/dia/shapes/SDL/task.xpm
-share/dia/shapes/Logic/and.shape
-share/dia/shapes/Logic/and.png
-share/dia/shapes/Logic/buffer.shape
-share/dia/shapes/Logic/buffer.png
-share/dia/shapes/Logic/connector.shape
-share/dia/shapes/Logic/connector.png
-share/dia/shapes/Logic/inverter.shape
-share/dia/shapes/Logic/inverter.png
-share/dia/shapes/Logic/nand.shape
-share/dia/shapes/Logic/nand.png
-share/dia/shapes/Logic/nor.shape
-share/dia/shapes/Logic/nor.png
-share/dia/shapes/Logic/not.shape
-share/dia/shapes/Logic/not.png
-share/dia/shapes/Logic/or.shape
-share/dia/shapes/Logic/or.png
-share/dia/shapes/Logic/xor.shape
-share/dia/shapes/Logic/xor.png
-share/dia/sheets/UML/umlclass_template.xpm
-share/dia/sheets/UML/aggregation.xpm
+share/dia/shapes/jigsaw/part_iiii.shape
+share/dia/shapes/jigsaw/part_iiii.xpm
+share/dia/shapes/jigsaw/part_iiio.shape
+share/dia/shapes/jigsaw/part_iiio.xpm
+share/dia/shapes/jigsaw/part_iioi.shape
+share/dia/shapes/jigsaw/part_iioi.xpm
+share/dia/shapes/jigsaw/part_iioo.shape
+share/dia/shapes/jigsaw/part_iioo.xpm
+share/dia/shapes/jigsaw/part_ioii.shape
+share/dia/shapes/jigsaw/part_ioii.xpm
+share/dia/shapes/jigsaw/part_ioio.shape
+share/dia/shapes/jigsaw/part_ioio.xpm
+share/dia/shapes/jigsaw/part_iooi.shape
+share/dia/shapes/jigsaw/part_iooi.xpm
+share/dia/shapes/jigsaw/part_iooo.shape
+share/dia/shapes/jigsaw/part_iooo.xpm
+share/dia/shapes/jigsaw/part_oiii.shape
+share/dia/shapes/jigsaw/part_oiii.xpm
+share/dia/shapes/jigsaw/part_oiio.shape
+share/dia/shapes/jigsaw/part_oiio.xpm
+share/dia/shapes/jigsaw/part_oioi.shape
+share/dia/shapes/jigsaw/part_oioi.xpm
+share/dia/shapes/jigsaw/part_oioo.shape
+share/dia/shapes/jigsaw/part_oioo.xpm
+share/dia/shapes/jigsaw/part_ooii.shape
+share/dia/shapes/jigsaw/part_ooii.xpm
+share/dia/shapes/jigsaw/part_ooio.shape
+share/dia/shapes/jigsaw/part_ooio.xpm
+share/dia/shapes/jigsaw/part_oooi.shape
+share/dia/shapes/jigsaw/part_oooi.xpm
+share/dia/shapes/jigsaw/part_oooo.shape
+share/dia/shapes/jigsaw/part_oooo.xpm
+share/dia/shapes/sybase/client.shape
+share/dia/shapes/sybase/client.xpm
+share/dia/shapes/sybase/dataserver.shape
+share/dia/shapes/sybase/dataserver.xpm
+share/dia/shapes/sybase/ltm.shape
+share/dia/shapes/sybase/ltm.xpm
+share/dia/shapes/sybase/repserver.shape
+share/dia/shapes/sybase/repserver.xpm
+share/dia/shapes/sybase/rsm.shape
+share/dia/shapes/sybase/rsm.xpm
+share/dia/shapes/sybase/stableq.shape
+share/dia/shapes/sybase/stableq.xpm
+share/dia/sheets/Circuit.sheet
+share/dia/sheets/Contact.sheet
+share/dia/sheets/EML.sheet
+share/dia/sheets/ER.sheet
 share/dia/sheets/ER/weakentity.xpm
+share/dia/sheets/Electric.sheet
+share/dia/sheets/FS.sheet
+share/dia/sheets/Flowchart.sheet
+share/dia/sheets/GRAFCET.sheet
 share/dia/sheets/GRAFCET/etapei.xpm
-share/dia/sheets/GRAFCET/etapems.xpm
-share/dia/sheets/GRAFCET/etapeme.xpm
 share/dia/sheets/GRAFCET/etapemc.xpm
+share/dia/sheets/GRAFCET/etapeme.xpm
+share/dia/sheets/GRAFCET/etapems.xpm
 share/dia/sheets/GRAFCET/etapesp.xpm
 share/dia/sheets/GRAFCET/vergent_and.xpm
+share/dia/sheets/Logic.sheet
+share/dia/sheets/MSE.sheet
+share/dia/sheets/Pneumatic.sheet
+share/dia/sheets/SADT.sheet
+share/dia/sheets/SDL.sheet
 share/dia/sheets/UML.sheet
-share/dia/sheets/ER.sheet
-share/dia/sheets/sybase.sheet
-share/dia/sheets/FS.sheet
-share/dia/sheets/network.sheet
-share/dia/sheets/Flowchart.sheet
-share/dia/sheets/Circuit.sheet
-share/dia/sheets/Contact.sheet
-share/dia/sheets/GRAFCET.sheet
+share/dia/sheets/UML/aggregation.xpm
+share/dia/sheets/UML/umlclass_template.xpm
 share/dia/sheets/chronogram.sheet
-share/dia/sheets/SADT.sheet
-share/dia/sheets/Pneumatic.sheet
-share/dia/sheets/Electric.sheet
 share/dia/sheets/civil.sheet
 share/dia/sheets/jigsaw.sheet
-share/dia/sheets/MSE.sheet
-share/dia/sheets/SDL.sheet
-share/dia/sheets/Logic.sheet
-share/dia/sheets/EML.sheet
-share/dia/dia_logo.png
-share/gnome/help/dia/en/topic.dat
-share/gnome/help/dia/en/background-color.html
-share/gnome/help/dia/en/canvas-chapter.html
-share/gnome/help/dia/en/colors.html
-share/gnome/help/dia/en/creating-canvas.html
-share/gnome/help/dia/en/gridlines.html
-share/gnome/help/dia/en/index.html
-share/gnome/help/dia/en/ln9.html
-share/gnome/help/dia/en/making-diagram.html
-share/gnome/help/dia/en/object-properties.html
-share/gnome/help/dia/en/objects-chapter.html
-share/gnome/help/dia/en/quickstart-chapter.html
-share/gnome/help/dia/en/quickstart-intro.html
-share/gnome/help/dia/en/rulers.html
-share/gnome/help/dia/en/save-print-diagram.html
-share/gnome/help/dia/en/starting-dia.html
-share/gnome/help/dia/en/using-objects.html
-share/gnome/help/dia/en/who-appeal-too.html
-share/gnome/help/dia/en/zooming.html
-share/gnome/help/dia/en/docbook.css
-share/gnome/help/dia/en/stylesheet-images/caution.gif
-share/gnome/help/dia/en/stylesheet-images/home.gif
-share/gnome/help/dia/en/stylesheet-images/important.gif
-share/gnome/help/dia/en/stylesheet-images/next.gif
-share/gnome/help/dia/en/stylesheet-images/note.gif
-share/gnome/help/dia/en/stylesheet-images/prev.gif
-share/gnome/help/dia/en/stylesheet-images/tip.gif
-share/gnome/help/dia/en/stylesheet-images/toc-blank.gif
-share/gnome/help/dia/en/stylesheet-images/toc-minus.gif
-share/gnome/help/dia/en/stylesheet-images/toc-plus.gif
-share/gnome/help/dia/en/stylesheet-images/up.gif
-share/gnome/help/dia/en/stylesheet-images/warning.gif
-share/gnome/help/dia/en/graphics/greendots.png
-share/gnome/help/dia/en/graphics/home_network.png
-share/gnome/help/dia/en/graphics/line_props.png
-share/gnome/help/dia/C
+share/dia/sheets/network.sheet
+share/dia/sheets/sybase.sheet
+share/dia/sheets/Misc.sheet
 share/gnome/apps/Applications/dia.desktop
-share/mime-info/dia.mime
+share/gnome/help/dia/en/topic.dat
+share/gnome/help/dia/pl/topic.dat
 share/mime-info/dia.keys
-share/pixmaps/dia_gnome_icon.png
+share/mime-info/dia.mime
 share/pixmaps/dia-diagram.png
-@dirrm share/gnome/help/dia/en/stylesheet-images
-@dirrm share/gnome/help/dia/en/graphics
-@dirrm share/gnome/help/dia/en
-@dirrm share/gnome/help/dia
-@dirrm share/dia/sheets/UML
-@dirrm share/dia/sheets/GRAFCET
+share/pixmaps/dia_gnome_icon.png
+@dirrm lib/dia
+@dirrm share/dia/shapes/Circuit
+@dirrm share/dia/shapes/Civil
+@dirrm share/dia/shapes/Contact
+@dirrm share/dia/shapes/Electric
+@dirrm share/dia/shapes/Flowchart
+@dirrm share/dia/shapes/Logic
+@dirrm share/dia/shapes/MSE
+@dirrm share/dia/shapes/Misc
+@dirrm share/dia/shapes/Network
+@dirrm share/dia/shapes/Pneumatic
+@dirrm share/dia/shapes/SDL
+@dirrm share/dia/shapes/jigsaw
+@dirrm share/dia/shapes/sybase
 @dirrm share/dia/sheets/ER
+@dirrm share/dia/sheets/GRAFCET
+@dirrm share/dia/sheets/UML
 @dirrm share/dia/sheets
-@dirrm share/dia/shapes/jigsaw
-@dirrm share/dia/shapes/SDL
-@dirrm share/dia/shapes/Pneumatic
-@dirrm share/dia/shapes/Network
-@dirrm share/dia/shapes/MSE
-@dirrm share/dia/shapes/Logic
-@dirrm share/dia/shapes/Flowchart
-@dirrm share/dia/shapes/Electric
-@dirrm share/dia/shapes/Contact
-@dirrm share/dia/shapes/Civil
-@dirrm share/dia/shapes/Circuit
 @dirrm share/dia/shapes
 @dirrm share/dia
-@dirrm lib/dia
+@dirrm share/gnome/help/dia/en
+@unexec ${RM} %D/share/gnome/help/dia/C
+@dirrm share/gnome/help/dia/pl
+@dirrm share/gnome/help/dia
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 88d28f54e5d..bf9d5c25685 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/08/26 01:27:14 mjl Exp $
+$NetBSD: distinfo,v 1.4 2002/09/01 00:38:08 mjl Exp $
 
-SHA1 (dia-0.88.1.tar.gz) = 0c53f006bd73e166cdedfe3ca0c77b241786ed17
-Size (dia-0.88.1.tar.gz) = 1975480 bytes
+SHA1 (dia-0.90.tar.gz) = 7e9705dbf3f3ce62a58169f531dbc635140a88d8
+Size (dia-0.90.tar.gz) = 2888211 bytes
+SHA1 (patch-aa) = ed5bb19334fcacc772aa1c504fc3c3e4dab933b4
+SHA1 (patch-ab) = 9ec08acce0b9a2fe5f2e6b8b15cf294d961aabe1
diff --git a/graphics/dia/patches/patch-aa b/graphics/dia/patches/patch-aa
new file mode 100644
index 00000000000..92054d1dffb
--- /dev/null
+++ b/graphics/dia/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2002/09/01 00:38:09 mjl Exp $
+
+--- lib/sheet.c.orig	Sat Aug 31 13:17:08 2002
++++ lib/sheet.c	Sat Aug 31 13:17:41 2002
+@@ -33,9 +33,9 @@
+ #include <dirent.h>
+ #endif
+ #include <glib.h>
+-#include <libxml/tree.h>
+-#include <libxml/parser.h>
+-#include <libxml/xmlmemory.h>
++#include <gnome-xml/tree.h>
++#include <gnome-xml/parser.h>
++#include <gnome-xml/xmlmemory.h>
+ #include "dia_xml_libxml.h"
+ #include <string.h>
+ 
diff --git a/graphics/dia/patches/patch-ab b/graphics/dia/patches/patch-ab
new file mode 100644
index 00000000000..c7fc8505ca7
--- /dev/null
+++ b/graphics/dia/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1 2002/09/01 00:38:09 mjl Exp $
+
+--- app/sheets_dialog_callbacks.c.orig	Sat Aug 31 13:42:24 2002
++++ app/sheets_dialog_callbacks.c	Sat Aug 31 13:42:45 2002
+@@ -52,9 +52,9 @@
+ #include <gtk/gtk.h>
+ #endif
+ 
+-#include <libxml/tree.h>
+-#include <libxml/parser.h>
+-#include <libxml/xmlmemory.h>
++#include <gnome-xml/tree.h>
++#include <gnome-xml/parser.h>
++#include <gnome-xml/xmlmemory.h>
+ 
+ #include "gtkwrapbox.h"
+