update to 0.92.2

many changes / fixes (see NEWS for details)
including:

* Autorouting of orthconn lines.  Still fairly primitive, doesn't avoid
  objects, but at least goes the right way out of connectionpoints (when
  connectionpoints have their dirs set).
* Parenting.  Objects can now be set to be parents of others (so far, only
  the UML Large Package is set so by default).  Objects created into these
  or explicitly added are moved with the parent and cannot be moved
  outside.
* Dynamic grid that changes with zoom scale.
* Grid now has thicker line every n lines (default 5).  Stippled grid
  option removed.
* Mouse wheel(s) can be used to scroll and zoom.
* More diagram properties can be set for existing diagrams, and are loaded
  and saved.
* UML Component features:  Event sources and sinks.
* Improved undo of grouping and ungrouping.
* Updates of the Python plugin:
  - groups, rgb, and images can be manipulated
  - better svg parsing
* Gnome and Gnome HIG conformance better.
* Better text alignment in flowchart objects.
* Better SVG export.
* Better arrow head calculations.
* More tooltips.

This also fixes a gcc3 build problem.

ok'ed by wiz@

6 files changed, 493 insertions, 49 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index a62de3e12bd..c2c2090ce32 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: Makefile,v 1.20 2003/12/02 22:32:48 recht Exp $
 
-DISTNAME=	dia-0.91
-PKGREVISION=	3
+DISTNAME=	dia-0.92.2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.91/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.92/}
 
 MAINTAINER=	jmcneill@invisible.yi.org
 HOMEPAGE=	http://www.lysator.liu.se/~alla/dia/
@@ -21,16 +20,20 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN}
 CONFIGURE_ARGS+=	--enable-gnome
+CONFIGURE_ARGS+=	--enable-bonobo
 CONFIGURE_ARGS+=	--with-python
 
-PYTHON_PATCH_SCRIPTS=	plug-ins/python/gtkcons.py
+PYTHON_PATCH_SCRIPTS=	po-checktrans.py
+PYTHON_PATCH_SCRIPTS+=	plug-ins/python/gtkcons.py
+PYTHON_PATCH_SCRIPTS+=	sheets/checktrans.py
 
-XSLT_FILE=	${WRKSRC}/plug-ins/xslt/xslt.c
+INTL_FILE=     ${WRKSRC}/lib/intl.c
 post-patch:
-	${MV} ${XSLT_FILE} ${XSLT_FILE}.pre
-	${SED}  -e "s,%%PREFIX%%,${PREFIX},g" ${XSLT_FILE}.pre > ${XSLT_FILE}
+	${MV} ${INTL_FILE} ${INTL_FILE}.pre
+	${SED}  -e "s,%%PREFIX%%,${PREFIX},g" ${INTL_FILE}.pre > ${INTL_FILE}
 
 .include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../x11/py-gtk2/buildlink2.mk"
 .include "../../lang/python/application.mk"
+.include "../../textproc/intltool/buildlink2.mk"
+.include "../../x11/py-gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dia/PLIST b/graphics/dia/PLIST
index b08752df7d6..6f651b2ccb4 100644
--- a/graphics/dia/PLIST
+++ b/graphics/dia/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/05/30 16:19:59 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/02 22:32:48 recht Exp $
 bin/dia
 lib/dia/libbondgraph_objects.a
 lib/dia/libbondgraph_objects.la
@@ -50,6 +50,7 @@ lib/dia/libpstricks_filter.la
 lib/dia/libpstricks_filter.so
 lib/dia/libpython_plugin.a
 lib/dia/libpython_plugin.la
+lib/dia/libpython_plugin.so
 lib/dia/libsadt_objects.a
 lib/dia/libsadt_objects.la
 lib/dia/libsadt_objects.so
@@ -75,12 +76,8 @@ lib/dia/libxslt_filter.a
 lib/dia/libxslt_filter.la
 lib/dia/libxslt_filter.so
 man/man1/dia.1
+share/applications/dia.desktop
 share/dia/dia_logo.png
-share/dia/plugins/xslt/dia-uml.xsl
-share/dia/plugins/xslt/dia-uml2c++.xsl
-share/dia/plugins/xslt/dia-uml2idl.xsl
-share/dia/plugins/xslt/dia-uml2java.xsl
-share/dia/plugins/xslt/stylesheets.xml
 share/dia/python-startup.py
 share/dia/python/diasvg.py
 share/dia/python/group_props.py
@@ -227,6 +224,448 @@ 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/Cisco/1000.png
+share/dia/shapes/Cisco/1000.shape
+share/dia/shapes/Cisco/100baset_hub.png
+share/dia/shapes/Cisco/100baset_hub.shape
+share/dia/shapes/Cisco/10700.png
+share/dia/shapes/Cisco/10700.shape
+share/dia/shapes/Cisco/15200.png
+share/dia/shapes/Cisco/15200.shape
+share/dia/shapes/Cisco/3174.png
+share/dia/shapes/Cisco/3174.shape
+share/dia/shapes/Cisco/3x74.png
+share/dia/shapes/Cisco/3x74.shape
+share/dia/shapes/Cisco/5000.png
+share/dia/shapes/Cisco/5000.shape
+share/dia/shapes/Cisco/5002.png
+share/dia/shapes/Cisco/5002.shape
+share/dia/shapes/Cisco/5500.png
+share/dia/shapes/Cisco/5500.shape
+share/dia/shapes/Cisco/6701.png
+share/dia/shapes/Cisco/6701.shape
+share/dia/shapes/Cisco/6705.png
+share/dia/shapes/Cisco/6705.shape
+share/dia/shapes/Cisco/6732.png
+share/dia/shapes/Cisco/6732.shape
+share/dia/shapes/Cisco/7500ars.png
+share/dia/shapes/Cisco/7500ars.shape
+share/dia/shapes/Cisco/7505.png
+share/dia/shapes/Cisco/7505.shape
+share/dia/shapes/Cisco/7507.png
+share/dia/shapes/Cisco/7507.shape
+share/dia/shapes/Cisco/accesspoint.png
+share/dia/shapes/Cisco/accesspoint.shape
+share/dia/shapes/Cisco/adm.png
+share/dia/shapes/Cisco/adm.shape
+share/dia/shapes/Cisco/asic.png
+share/dia/shapes/Cisco/asic.shape
+share/dia/shapes/Cisco/ata.png
+share/dia/shapes/Cisco/ata.shape
+share/dia/shapes/Cisco/atm3800.png
+share/dia/shapes/Cisco/atm3800.shape
+share/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.png
+share/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.shape
+share/dia/shapes/Cisco/atm_router.png
+share/dia/shapes/Cisco/atm_router.shape
+share/dia/shapes/Cisco/atm_switch.png
+share/dia/shapes/Cisco/atm_switch.shape
+share/dia/shapes/Cisco/atm_tag_sw_gigabit_router.png
+share/dia/shapes/Cisco/atm_tag_sw_gigabit_router.shape
+share/dia/shapes/Cisco/atm_tag_switch_router.png
+share/dia/shapes/Cisco/atm_tag_switch_router.shape
+share/dia/shapes/Cisco/bbfw.png
+share/dia/shapes/Cisco/bbfw.shape
+share/dia/shapes/Cisco/bbfw_media.png
+share/dia/shapes/Cisco/bbfw_media.shape
+share/dia/shapes/Cisco/bbsm.png
+share/dia/shapes/Cisco/bbsm.shape
+share/dia/shapes/Cisco/branch_office.png
+share/dia/shapes/Cisco/branch_office.shape
+share/dia/shapes/Cisco/breakout_box.png
+share/dia/shapes/Cisco/breakout_box.shape
+share/dia/shapes/Cisco/bridge.png
+share/dia/shapes/Cisco/bridge.shape
+share/dia/shapes/Cisco/broadband_router.png
+share/dia/shapes/Cisco/broadband_router.shape
+share/dia/shapes/Cisco/bts10200.png
+share/dia/shapes/Cisco/bts10200.shape
+share/dia/shapes/Cisco/ca.png
+share/dia/shapes/Cisco/ca.shape
+share/dia/shapes/Cisco/cable_modem.png
+share/dia/shapes/Cisco/cable_modem.shape
+share/dia/shapes/Cisco/callmanager.png
+share/dia/shapes/Cisco/callmanager.shape
+share/dia/shapes/Cisco/car.png
+share/dia/shapes/Cisco/car.shape
+share/dia/shapes/Cisco/catalyst_access_gateway.png
+share/dia/shapes/Cisco/catalyst_access_gateway.shape
+share/dia/shapes/Cisco/cddi_fddi.png
+share/dia/shapes/Cisco/cddi_fddi.shape
+share/dia/shapes/Cisco/cdm.png
+share/dia/shapes/Cisco/cdm.shape
+share/dia/shapes/Cisco/cellular_phone.png
+share/dia/shapes/Cisco/cellular_phone.shape
+share/dia/shapes/Cisco/centri.png
+share/dia/shapes/Cisco/centri.shape
+share/dia/shapes/Cisco/cisco_hub.png
+share/dia/shapes/Cisco/cisco_hub.shape
+share/dia/shapes/Cisco/ciscosecurity.png
+share/dia/shapes/Cisco/ciscosecurity.shape
+share/dia/shapes/Cisco/ciscoworks.png
+share/dia/shapes/Cisco/ciscoworks.shape
+share/dia/shapes/Cisco/class45_switch.png
+share/dia/shapes/Cisco/class45_switch.shape
+share/dia/shapes/Cisco/cloud.png
+share/dia/shapes/Cisco/cloud.shape
+share/dia/shapes/Cisco/communications_server.png
+share/dia/shapes/Cisco/communications_server.shape
+share/dia/shapes/Cisco/content_engine.png
+share/dia/shapes/Cisco/content_engine.shape
+share/dia/shapes/Cisco/content_service_router.png
+share/dia/shapes/Cisco/content_service_router.shape
+share/dia/shapes/Cisco/content_switch.png
+share/dia/shapes/Cisco/content_switch.shape
+share/dia/shapes/Cisco/content_switch_module.png
+share/dia/shapes/Cisco/content_switch_module.shape
+share/dia/shapes/Cisco/css1100.png
+share/dia/shapes/Cisco/css1100.shape
+share/dia/shapes/Cisco/csu_dsu.png
+share/dia/shapes/Cisco/csu_dsu.shape
+share/dia/shapes/Cisco/cte.png
+share/dia/shapes/Cisco/cte.shape
+share/dia/shapes/Cisco/directory_server.png
+share/dia/shapes/Cisco/directory_server.shape
+share/dia/shapes/Cisco/diskette.png
+share/dia/shapes/Cisco/diskette.shape
+share/dia/shapes/Cisco/distributed_director.png
+share/dia/shapes/Cisco/distributed_director.shape
+share/dia/shapes/Cisco/dot_dot.png
+share/dia/shapes/Cisco/dot_dot.shape
+share/dia/shapes/Cisco/dpt.png
+share/dia/shapes/Cisco/dpt.shape
+share/dia/shapes/Cisco/dslam.png
+share/dia/shapes/Cisco/dslam.shape
+share/dia/shapes/Cisco/dwdm_filter.png
+share/dia/shapes/Cisco/dwdm_filter.shape
+share/dia/shapes/Cisco/end_office.png
+share/dia/shapes/Cisco/end_office.shape
+share/dia/shapes/Cisco/fax.png
+share/dia/shapes/Cisco/fax.shape
+share/dia/shapes/Cisco/fc_storage.png
+share/dia/shapes/Cisco/fc_storage.shape
+share/dia/shapes/Cisco/fddi_ring.png
+share/dia/shapes/Cisco/fddi_ring.shape
+share/dia/shapes/Cisco/file_cabinet.png
+share/dia/shapes/Cisco/file_cabinet.shape
+share/dia/shapes/Cisco/file_server.png
+share/dia/shapes/Cisco/file_server.shape
+share/dia/shapes/Cisco/firewall.png
+share/dia/shapes/Cisco/firewall.shape
+share/dia/shapes/Cisco/front_end_processor.png
+share/dia/shapes/Cisco/front_end_processor.shape
+share/dia/shapes/Cisco/general_appliance.png
+share/dia/shapes/Cisco/general_appliance.shape
+share/dia/shapes/Cisco/generic_building.png
+share/dia/shapes/Cisco/generic_building.shape
+share/dia/shapes/Cisco/generic_gateway.png
+share/dia/shapes/Cisco/generic_gateway.shape
+share/dia/shapes/Cisco/generic_processor.png
+share/dia/shapes/Cisco/generic_processor.shape
+share/dia/shapes/Cisco/generic_softswitch.png
+share/dia/shapes/Cisco/generic_softswitch.shape
+share/dia/shapes/Cisco/gigabit_switch_router_atm_tag.png
+share/dia/shapes/Cisco/gigabit_switch_router_atm_tag.shape
+share/dia/shapes/Cisco/government_building.png
+share/dia/shapes/Cisco/government_building.shape
+share/dia/shapes/Cisco/h323.png
+share/dia/shapes/Cisco/h323.shape
+share/dia/shapes/Cisco/handheld.png
+share/dia/shapes/Cisco/handheld.shape
+share/dia/shapes/Cisco/hootphone.png
+share/dia/shapes/Cisco/hootphone.shape
+share/dia/shapes/Cisco/host.png
+share/dia/shapes/Cisco/host.shape
+share/dia/shapes/Cisco/hp_mini.png
+share/dia/shapes/Cisco/hp_mini.shape
+share/dia/shapes/Cisco/hub.png
+share/dia/shapes/Cisco/hub.shape
+share/dia/shapes/Cisco/iad_router.png
+share/dia/shapes/Cisco/iad_router.shape
+share/dia/shapes/Cisco/ibm_mainframe.png
+share/dia/shapes/Cisco/ibm_mainframe.shape
+share/dia/shapes/Cisco/ibm_mini.png
+share/dia/shapes/Cisco/ibm_mini.shape
+share/dia/shapes/Cisco/ibm_tower.png
+share/dia/shapes/Cisco/ibm_tower.shape
+share/dia/shapes/Cisco/icm.png
+share/dia/shapes/Cisco/icm.shape
+share/dia/shapes/Cisco/ics.png
+share/dia/shapes/Cisco/ics.shape
+share/dia/shapes/Cisco/ios_firewall.png
+share/dia/shapes/Cisco/ios_firewall.shape
+share/dia/shapes/Cisco/ip.png
+share/dia/shapes/Cisco/ip.shape
+share/dia/shapes/Cisco/ip_dsl.png
+share/dia/shapes/Cisco/ip_dsl.shape
+share/dia/shapes/Cisco/ip_phone.png
+share/dia/shapes/Cisco/ip_phone.shape
+share/dia/shapes/Cisco/ip_softphone.png
+share/dia/shapes/Cisco/ip_softphone.shape
+share/dia/shapes/Cisco/ip_telephony_router.png
+share/dia/shapes/Cisco/ip_telephony_router.shape
+share/dia/shapes/Cisco/iptc.png
+share/dia/shapes/Cisco/iptc.shape
+share/dia/shapes/Cisco/iptv_broadcast_server.png
+share/dia/shapes/Cisco/iptv_broadcast_server.shape
+share/dia/shapes/Cisco/iptv_content_manager.png
+share/dia/shapes/Cisco/iptv_content_manager.shape
+share/dia/shapes/Cisco/isdn_switch.png
+share/dia/shapes/Cisco/isdn_switch.shape
+share/dia/shapes/Cisco/itp.png
+share/dia/shapes/Cisco/itp.shape
+share/dia/shapes/Cisco/key.png
+share/dia/shapes/Cisco/key.shape
+share/dia/shapes/Cisco/lan_to_lan.png
+share/dia/shapes/Cisco/lan_to_lan.shape
+share/dia/shapes/Cisco/laptop.png
+share/dia/shapes/Cisco/laptop.shape
+share/dia/shapes/Cisco/layer3_switch.png
+share/dia/shapes/Cisco/layer3_switch.shape
+share/dia/shapes/Cisco/localdirector.png
+share/dia/shapes/Cisco/localdirector.shape
+share/dia/shapes/Cisco/lock.png
+share/dia/shapes/Cisco/lock.shape
+share/dia/shapes/Cisco/longreach_cpe.png
+share/dia/shapes/Cisco/longreach_cpe.shape
+share/dia/shapes/Cisco/mac_woman.png
+share/dia/shapes/Cisco/mac_woman.shape
+share/dia/shapes/Cisco/macintosh.png
+share/dia/shapes/Cisco/macintosh.shape
+share/dia/shapes/Cisco/man_woman.png
+share/dia/shapes/Cisco/man_woman.shape
+share/dia/shapes/Cisco/mas_gateway.png
+share/dia/shapes/Cisco/mas_gateway.shape
+share/dia/shapes/Cisco/mau.png
+share/dia/shapes/Cisco/mau.shape
+share/dia/shapes/Cisco/mdu.png
+share/dia/shapes/Cisco/mdu.shape
+share/dia/shapes/Cisco/me1100.png
+share/dia/shapes/Cisco/me1100.shape
+share/dia/shapes/Cisco/metro1500.png
+share/dia/shapes/Cisco/metro1500.shape
+share/dia/shapes/Cisco/mgx8220.png
+share/dia/shapes/Cisco/mgx8220.shape
+share/dia/shapes/Cisco/mgx8240.png
+share/dia/shapes/Cisco/mgx8240.shape
+share/dia/shapes/Cisco/mgx8260.png
+share/dia/shapes/Cisco/mgx8260.shape
+share/dia/shapes/Cisco/microphone.png
+share/dia/shapes/Cisco/microphone.shape
+share/dia/shapes/Cisco/microwebserver.png
+share/dia/shapes/Cisco/microwebserver.shape
+share/dia/shapes/Cisco/mini_vax.png
+share/dia/shapes/Cisco/mini_vax.shape
+share/dia/shapes/Cisco/modem.png
+share/dia/shapes/Cisco/modem.shape
+share/dia/shapes/Cisco/moh_server.png
+share/dia/shapes/Cisco/moh_server.shape
+share/dia/shapes/Cisco/multilayer_switch.png
+share/dia/shapes/Cisco/multilayer_switch.shape
+share/dia/shapes/Cisco/multiswitch_device.png
+share/dia/shapes/Cisco/multiswitch_device.shape
+share/dia/shapes/Cisco/mux.png
+share/dia/shapes/Cisco/mux.shape
+share/dia/shapes/Cisco/netflow_router.png
+share/dia/shapes/Cisco/netflow_router.shape
+share/dia/shapes/Cisco/netranger.png
+share/dia/shapes/Cisco/netranger.shape
+share/dia/shapes/Cisco/netsonar.png
+share/dia/shapes/Cisco/netsonar.shape
+share/dia/shapes/Cisco/network_management.png
+share/dia/shapes/Cisco/network_management.shape
+share/dia/shapes/Cisco/octel.png
+share/dia/shapes/Cisco/octel.shape
+share/dia/shapes/Cisco/ons15500.png
+share/dia/shapes/Cisco/ons15500.shape
+share/dia/shapes/Cisco/optical_amplifier.png
+share/dia/shapes/Cisco/optical_amplifier.shape
+share/dia/shapes/Cisco/optical_services_router.png
+share/dia/shapes/Cisco/optical_services_router.shape
+share/dia/shapes/Cisco/optical_transport.png
+share/dia/shapes/Cisco/optical_transport.shape
+share/dia/shapes/Cisco/pad.png
+share/dia/shapes/Cisco/pad.shape
+share/dia/shapes/Cisco/pad_x28.png
+share/dia/shapes/Cisco/pad_x28.shape
+share/dia/shapes/Cisco/pbx.png
+share/dia/shapes/Cisco/pbx.shape
+share/dia/shapes/Cisco/pbx_switch.png
+share/dia/shapes/Cisco/pbx_switch.shape
+share/dia/shapes/Cisco/pc.png
+share/dia/shapes/Cisco/pc.shape
+share/dia/shapes/Cisco/pc_adapter_card.png
+share/dia/shapes/Cisco/pc_adapter_card.shape
+share/dia/shapes/Cisco/pc_man.png
+share/dia/shapes/Cisco/pc_man.shape
+share/dia/shapes/Cisco/pc_router_card.png
+share/dia/shapes/Cisco/pc_router_card.shape
+share/dia/shapes/Cisco/pc_video.png
+share/dia/shapes/Cisco/pc_video.shape
+share/dia/shapes/Cisco/pda.png
+share/dia/shapes/Cisco/pda.shape
+share/dia/shapes/Cisco/phone.png
+share/dia/shapes/Cisco/phone.shape
+share/dia/shapes/Cisco/phone_fax.png
+share/dia/shapes/Cisco/phone_fax.shape
+share/dia/shapes/Cisco/pix_firewall.png
+share/dia/shapes/Cisco/pix_firewall.shape
+share/dia/shapes/Cisco/printer.png
+share/dia/shapes/Cisco/printer.shape
+share/dia/shapes/Cisco/programmable_switch.png
+share/dia/shapes/Cisco/programmable_switch.shape
+share/dia/shapes/Cisco/protocol_translator.png
+share/dia/shapes/Cisco/protocol_translator.shape
+share/dia/shapes/Cisco/pxf.png
+share/dia/shapes/Cisco/pxf.shape
+share/dia/shapes/Cisco/radio_tower.png
+share/dia/shapes/Cisco/radio_tower.shape
+share/dia/shapes/Cisco/ratemux.png
+share/dia/shapes/Cisco/ratemux.shape
+share/dia/shapes/Cisco/relational_database.png
+share/dia/shapes/Cisco/relational_database.shape
+share/dia/shapes/Cisco/repeater.png
+share/dia/shapes/Cisco/repeater.shape
+share/dia/shapes/Cisco/route_switch_processor.png
+share/dia/shapes/Cisco/route_switch_processor.shape
+share/dia/shapes/Cisco/router.png
+share/dia/shapes/Cisco/router.shape
+share/dia/shapes/Cisco/router_in_building.png
+share/dia/shapes/Cisco/router_in_building.shape
+share/dia/shapes/Cisco/router_with_firewall.png
+share/dia/shapes/Cisco/router_with_firewall.shape
+share/dia/shapes/Cisco/router_with_silicon_switch.png
+share/dia/shapes/Cisco/router_with_silicon_switch.shape
+share/dia/shapes/Cisco/rps.png
+share/dia/shapes/Cisco/rps.shape
+share/dia/shapes/Cisco/running_man.png
+share/dia/shapes/Cisco/running_man.shape
+share/dia/shapes/Cisco/satellite.png
+share/dia/shapes/Cisco/satellite.shape
+share/dia/shapes/Cisco/satellite_dish.png
+share/dia/shapes/Cisco/satellite_dish.shape
+share/dia/shapes/Cisco/sc2200.png
+share/dia/shapes/Cisco/sc2200.shape
+share/dia/shapes/Cisco/sc2200_vsc3000_host.png
+share/dia/shapes/Cisco/sc2200_vsc3000_host.shape
+share/dia/shapes/Cisco/scanner.png
+share/dia/shapes/Cisco/scanner.shape
+share/dia/shapes/Cisco/server_with_pc_router.png
+share/dia/shapes/Cisco/server_with_pc_router.shape
+share/dia/shapes/Cisco/sip_proxy_server.png
+share/dia/shapes/Cisco/sip_proxy_server.shape
+share/dia/shapes/Cisco/sitting_woman.png
+share/dia/shapes/Cisco/sitting_woman.shape
+share/dia/shapes/Cisco/small_business.png
+share/dia/shapes/Cisco/small_business.shape
+share/dia/shapes/Cisco/small_hub.png
+share/dia/shapes/Cisco/small_hub.shape
+share/dia/shapes/Cisco/softphone.png
+share/dia/shapes/Cisco/softphone.shape
+share/dia/shapes/Cisco/software_based_server.png
+share/dia/shapes/Cisco/software_based_server.shape
+share/dia/shapes/Cisco/speaker.png
+share/dia/shapes/Cisco/speaker.shape
+share/dia/shapes/Cisco/standing_man.png
+share/dia/shapes/Cisco/standing_man.shape
+share/dia/shapes/Cisco/stb.png
+share/dia/shapes/Cisco/stb.shape
+share/dia/shapes/Cisco/storage_array.png
+share/dia/shapes/Cisco/storage_array.shape
+share/dia/shapes/Cisco/storage_router.png
+share/dia/shapes/Cisco/storage_router.shape
+share/dia/shapes/Cisco/stp.png
+share/dia/shapes/Cisco/stp.shape
+share/dia/shapes/Cisco/sun_workstation.png
+share/dia/shapes/Cisco/sun_workstation.shape
+share/dia/shapes/Cisco/supercomputer.png
+share/dia/shapes/Cisco/supercomputer.shape
+share/dia/shapes/Cisco/svx.png
+share/dia/shapes/Cisco/svx.shape
+share/dia/shapes/Cisco/system_controller.png
+share/dia/shapes/Cisco/system_controller.shape
+share/dia/shapes/Cisco/tablet.png
+share/dia/shapes/Cisco/tablet.shape
+share/dia/shapes/Cisco/tdm_router.png
+share/dia/shapes/Cisco/tdm_router.shape
+share/dia/shapes/Cisco/telecommuter.png
+share/dia/shapes/Cisco/telecommuter.shape
+share/dia/shapes/Cisco/telecommuter_house.png
+share/dia/shapes/Cisco/telecommuter_house.shape
+share/dia/shapes/Cisco/telecommuter_house_router.png
+share/dia/shapes/Cisco/telecommuter_house_router.shape
+share/dia/shapes/Cisco/terminal.png
+share/dia/shapes/Cisco/terminal.shape
+share/dia/shapes/Cisco/tokenring.png
+share/dia/shapes/Cisco/tokenring.shape
+share/dia/shapes/Cisco/transpath.png
+share/dia/shapes/Cisco/transpath.shape
+share/dia/shapes/Cisco/truck.png
+share/dia/shapes/Cisco/truck.shape
+share/dia/shapes/Cisco/turret.png
+share/dia/shapes/Cisco/turret.shape
+share/dia/shapes/Cisco/tv.png
+share/dia/shapes/Cisco/tv.shape
+share/dia/shapes/Cisco/ubr910.png
+share/dia/shapes/Cisco/ubr910.shape
+share/dia/shapes/Cisco/unity_server.png
+share/dia/shapes/Cisco/unity_server.shape
+share/dia/shapes/Cisco/universal_gateway.png
+share/dia/shapes/Cisco/universal_gateway.shape
+share/dia/shapes/Cisco/university.png
+share/dia/shapes/Cisco/university.shape
+share/dia/shapes/Cisco/ups.png
+share/dia/shapes/Cisco/ups.shape
+share/dia/shapes/Cisco/video_camera.png
+share/dia/shapes/Cisco/video_camera.shape
+share/dia/shapes/Cisco/vip.png
+share/dia/shapes/Cisco/vip.shape
+share/dia/shapes/Cisco/voice_atm_switch.png
+share/dia/shapes/Cisco/voice_atm_switch.shape
+share/dia/shapes/Cisco/voice_commserver.png
+share/dia/shapes/Cisco/voice_commserver.shape
+share/dia/shapes/Cisco/voice_router.png
+share/dia/shapes/Cisco/voice_router.shape
+share/dia/shapes/Cisco/voice_switch.png
+share/dia/shapes/Cisco/voice_switch.shape
+share/dia/shapes/Cisco/voice_switch2.png
+share/dia/shapes/Cisco/voice_switch2.shape
+share/dia/shapes/Cisco/vpn_concentrator.png
+share/dia/shapes/Cisco/vpn_concentrator.shape
+share/dia/shapes/Cisco/vpn_gateway.png
+share/dia/shapes/Cisco/vpn_gateway.shape
+share/dia/shapes/Cisco/vsc3000.png
+share/dia/shapes/Cisco/vsc3000.shape
+share/dia/shapes/Cisco/wavelength_router.png
+share/dia/shapes/Cisco/wavelength_router.shape
+share/dia/shapes/Cisco/web_browser.png
+share/dia/shapes/Cisco/web_browser.shape
+share/dia/shapes/Cisco/web_cluster.png
+share/dia/shapes/Cisco/web_cluster.shape
+share/dia/shapes/Cisco/wireless.png
+share/dia/shapes/Cisco/wireless.shape
+share/dia/shapes/Cisco/wireless_bridge.png
+share/dia/shapes/Cisco/wireless_bridge.shape
+share/dia/shapes/Cisco/wireless_transport.png
+share/dia/shapes/Cisco/wireless_transport.shape
+share/dia/shapes/Cisco/workgroup_director.png
+share/dia/shapes/Cisco/workgroup_director.shape
+share/dia/shapes/Cisco/workgroup_switch.png
+share/dia/shapes/Cisco/workgroup_switch.shape
+share/dia/shapes/Cisco/workstation.png
+share/dia/shapes/Cisco/workstation.shape
+share/dia/shapes/Cisco/www_server.png
+share/dia/shapes/Cisco/www_server.shape
 share/dia/shapes/Civil/bvrest.shape
 share/dia/shapes/Civil/bvrest.xpm
 share/dia/shapes/Civil/civil_aerator.shape
@@ -613,6 +1052,9 @@ share/dia/sheets/SADT.sheet
 share/dia/sheets/SDL.sheet
 share/dia/sheets/UML.sheet
 share/dia/sheets/UML/aggregation.xpm
+share/dia/sheets/UML/eventsink.xpm
+share/dia/sheets/UML/eventsource.xpm
+share/dia/sheets/UML/receptacle.xpm
 share/dia/sheets/UML/umlclass_template.xpm
 share/dia/sheets/chronogram.sheet
 share/dia/sheets/ciscocomputer.sheet
@@ -624,12 +1066,18 @@ share/dia/sheets/civil.sheet
 share/dia/sheets/jigsaw.sheet
 share/dia/sheets/network.sheet
 share/dia/sheets/sybase.sheet
-share/gnome/apps/Applications/dia.desktop
+share/dia/xslt/dia-uml.xsl
+share/dia/xslt/dia-uml2c++.xsl
+share/dia/xslt/dia-uml2componentlist.xsl
+share/dia/xslt/dia-uml2idl.xsl
+share/dia/xslt/dia-uml2java.xsl
+share/dia/xslt/stylesheets.xml
 share/gnome/help/dia/C
 share/gnome/help/dia/en/topic.dat
 share/gnome/help/dia/pl/topic.dat
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/dia.mo
@@ -644,6 +1092,9 @@ ${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/mk/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/dia.mo
@@ -654,6 +1105,8 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/sr@Latn/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
@@ -668,6 +1121,8 @@ share/pixmaps/dia_gnome_icon.png
 @dirrm share/gnome/help/dia/pl
 @dirrm share/gnome/help/dia/en
 @dirrm share/gnome/help/dia
+@comment in gnome-dirs: @dirrm share/gnome/help
+@dirrm share/dia/xslt
 @dirrm share/dia/sheets/UML
 @dirrm share/dia/sheets/GRAFCET
 @dirrm share/dia/sheets/ER
@@ -684,11 +1139,11 @@ share/pixmaps/dia_gnome_icon.png
 @dirrm share/dia/shapes/Electric
 @dirrm share/dia/shapes/Contact
 @dirrm share/dia/shapes/Civil
+@dirrm share/dia/shapes/Cisco
 @dirrm share/dia/shapes/Circuit
 @dirrm share/dia/shapes/Assorted
 @dirrm share/dia/shapes
 @dirrm share/dia/python
-@dirrm share/dia/plugins/xslt
-@dirrm share/dia/plugins
 @dirrm share/dia
+@comment in gnome2-dirs: @dirrm share/applications
 @dirrm lib/dia
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 7293ce8203b..76bb76a151c 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2003/09/30 09:36:27 mycroft Exp $
+$NetBSD: distinfo,v 1.10 2003/12/02 22:32:48 recht Exp $
 
-SHA1 (dia-0.91.tar.gz) = 4514af1f5685e45480761c6f42e5ecdc2492cd2c
-Size (dia-0.91.tar.gz) = 3409320 bytes
-SHA1 (patch-bc) = 0b868e0b6c1d156eebfffce4c35a003db8e40613
-SHA1 (patch-bd) = c79dffdce3e7b65c1d10e11480f81b76f56a8066
+SHA1 (dia-0.92.2.tar.gz) = cba2fc2f81be55c903b7404617d1619c6a99b9d9
+Size (dia-0.92.2.tar.gz) = 4227714 bytes
+SHA1 (patch-be) = dab7626daefcd702b31f54d198311d9be921e1ff
diff --git a/graphics/dia/patches/patch-bc b/graphics/dia/patches/patch-bc
deleted file mode 100644
index 6cdc7314932..00000000000
--- a/graphics/dia/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2003/05/09 15:21:33 drochner Exp $
-
---- plug-ins/xslt/xslt.c.orig	2003-05-09 17:13:12.000000000 +0200
-+++ plug-ins/xslt/xslt.c	2003-05-09 17:14:09.000000000 +0200
-@@ -291,7 +291,7 @@
- 	path = g_module_build_path("\Windows", "xslt");
- #else
- 	/* FIXME: We should have a --with-xslt-prefix and use this */
--	path = g_module_build_path("/usr/lib", "xslt");
-+	path = g_module_build_path("%%PREFIX%%/lib", "xslt");
- #endif	
- 	xslt_module = g_module_open(path, 0);
- 	if(xslt_module == NULL) {
diff --git a/graphics/dia/patches/patch-bd b/graphics/dia/patches/patch-bd
deleted file mode 100644
index 6724ab3043c..00000000000
--- a/graphics/dia/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2003/09/30 09:36:27 mycroft Exp $
-
---- plug-ins/python/pydia-geometry.c.orig	2003-01-19 16:38:22.000000000 +0000
-+++ plug-ins/python/pydia-geometry.c	2003-09-30 09:30:54.000000000 +0000
-@@ -211,7 +211,7 @@
- {
- #define I_OR_F(v) \
-   (self->is_int ? \
--   PyInt_FromLong(self->r.ri.##v) : PyFloat_FromDouble(self->r.rf.##v))
-+   PyInt_FromLong(self->r.ri.v) : PyFloat_FromDouble(self->r.rf.v))
- 
-   if (!strcmp(attr, "__members__"))
-     return Py_BuildValue("[ssss]", "top", "left", "right", "bottom" );
diff --git a/graphics/dia/patches/patch-be b/graphics/dia/patches/patch-be
new file mode 100644
index 00000000000..17cfb5b0840
--- /dev/null
+++ b/graphics/dia/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.1 2003/12/02 22:32:48 recht Exp $
+
+--- lib/intl.c.orig	2002-09-23 21:27:44.000000000 +0200
++++ lib/intl.c	2003-11-10 22:54:10.000000000 +0100
+@@ -65,6 +65,8 @@
+     read_aliases ("/usr/share/locale/locale.alias");
+     read_aliases ("/usr/local/share/locale/locale.alias");
+     read_aliases ("/usr/lib/X11/locale/locale.alias");
++    read_aliases ("/usr/X11R6/lib/X11/locale/locale.alias");
++    read_aliases ("%%PREFIX%%/share/locale/locale.alias");
+     read_aliases ("/usr/openwin/lib/locale/locale.alias");
+   }
+   while((p=g_hash_table_lookup(alias_table,lang)) && strcmp(p, lang))