update to 0.97

changes:
-High quality cross-platform print and pdf output by use of cairo
-Rotated text, but only with the new "Standard - Ouline" object
-Object properties dialog finally does handle multiple objects
-Improved text edit mode for consistent handling of the Delete key
-A new integrated user interface mode with diagrams in tabs
-Almost 200 bugs and feature requests resolved

pkgsrc note: the printing problem mentioned in TODO is resolved
 (some outdated nonsense in options.mk disabled use of "cairo")

12 files changed, 307 insertions, 103 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 30366595453..d77c5fe8841 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2009/10/29 23:32:22 drochner Exp $
+# $NetBSD: Makefile,v 1.55 2009/12/09 10:22:04 drochner Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	4
-
 .include "options.mk"
 
 # just to convert the manpage
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index d87982b53cf..ff9f07ed476 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.22 2009/03/08 15:56:45 wiz Exp $
+# $NetBSD: Makefile.common,v 1.23 2009/12/09 10:22:04 drochner Exp $
 #
 
-DISTNAME=	dia-0.96.1
+DISTNAME=	dia-0.97
 PKGNAME=	${DISTNAME:S/dia-/dia${DIA_SUBPKG}-/}
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.96/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.97/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/dia/
diff --git a/graphics/dia/PLIST b/graphics/dia/PLIST
index a9b897911f5..838be46bd8b 100644
--- a/graphics/dia/PLIST
+++ b/graphics/dia/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.16 2009/06/14 20:05:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/12/09 10:22:04 drochner Exp $
 bin/dia
 lib/dia/libaadl_objects.la
-lib/dia/libbondgraph_objects.la
+lib/dia/libart_filter.la
 lib/dia/libcairo_filter.la
 lib/dia/libcgm_filter.la
 lib/dia/libchronogram_objects.la
+lib/dia/libcustom_lines_objects.la
 lib/dia/libcustom_objects.la
+lib/dia/libdb_objects.la
 lib/dia/libdia.la
 lib/dia/libdxf_filter.la
 lib/dia/liber_objects.la
@@ -21,6 +23,7 @@ lib/dia/libmisc_objects.la
 lib/dia/libnetwork_objects.la
 lib/dia/libpgf_filter.la
 lib/dia/libpixbuf_filter.la
+lib/dia/libpostscript_filter.la
 lib/dia/libpstricks_filter.la
 lib/dia/libsadt_objects.la
 lib/dia/libshape_filter.la
@@ -33,7 +36,7 @@ lib/dia/libxfig_filter.la
 lib/dia/libxslt_filter.la
 man/man1/dia.1
 share/applications/dia.desktop
-share/dia/dia_logo.png
+share/dia/dia-splash.png
 share/dia/shapes/Assorted/arrow-chevron.png
 share/dia/shapes/Assorted/arrow-chevron.shape
 share/dia/shapes/Assorted/arrow-down.png
@@ -1268,6 +1271,32 @@ share/dia/shapes/Gane_and_Sarson/entity.png
 share/dia/shapes/Gane_and_Sarson/entity.shape
 share/dia/shapes/Gane_and_Sarson/process.png
 share/dia/shapes/Gane_and_Sarson/process.shape
+share/dia/shapes/Lights/ACL.png
+share/dia/shapes/Lights/ACL.shape
+share/dia/shapes/Lights/Blacklight.png
+share/dia/shapes/Lights/Blacklight.shape
+share/dia/shapes/Lights/Blinders.png
+share/dia/shapes/Lights/Blinders.shape
+share/dia/shapes/Lights/ERS.png
+share/dia/shapes/Lights/ERS.shape
+share/dia/shapes/Lights/Fresnel.png
+share/dia/shapes/Lights/Fresnel.shape
+share/dia/shapes/Lights/Moving_head.png
+share/dia/shapes/Lights/Moving_head.shape
+share/dia/shapes/Lights/PAR.png
+share/dia/shapes/Lights/PAR.shape
+share/dia/shapes/Lights/PAR_floor.png
+share/dia/shapes/Lights/PAR_floor.shape
+share/dia/shapes/Lights/PC.png
+share/dia/shapes/Lights/PC.shape
+share/dia/shapes/Lights/Scanner.png
+share/dia/shapes/Lights/Scanner.shape
+share/dia/shapes/Lights/Striplight.png
+share/dia/shapes/Lights/Striplight.shape
+share/dia/shapes/Lights/Stroboscope.png
+share/dia/shapes/Lights/Stroboscope.shape
+share/dia/shapes/Lights/Structure.png
+share/dia/shapes/Lights/Structure.shape
 share/dia/shapes/Logic/and.png
 share/dia/shapes/Logic/and.shape
 share/dia/shapes/Logic/buffer.png
@@ -1348,6 +1377,10 @@ share/dia/shapes/Map/Isometric/Train2.png
 share/dia/shapes/Map/Isometric/Train2.shape
 share/dia/shapes/Map/Isometric/Tree1.png
 share/dia/shapes/Map/Isometric/Tree1.shape
+share/dia/shapes/Misc/expended-node.png
+share/dia/shapes/Misc/expended-node.shape
+share/dia/shapes/Misc/expensible-node.png
+share/dia/shapes/Misc/expensible-node.shape
 share/dia/shapes/Misc/file.png
 share/dia/shapes/Misc/file.shape
 share/dia/shapes/Misc/folder.png
@@ -1456,8 +1489,6 @@ share/dia/shapes/Pneumatic/seijack.png
 share/dia/shapes/Pneumatic/seijack.shape
 share/dia/shapes/Pneumatic/seojack.png
 share/dia/shapes/Pneumatic/seojack.shape
-share/dia/shapes/RDP/arc.png
-share/dia/shapes/RDP/arc_inhibiteur.png
 share/dia/shapes/RDP/place.png
 share/dia/shapes/RDP/place.shape
 share/dia/shapes/RDP/place_marquee.png
@@ -1551,6 +1582,7 @@ share/dia/sheets/ChemEng.sheet
 share/dia/sheets/Circuit.sheet
 share/dia/sheets/Contact.sheet
 share/dia/sheets/Cybernetics.sheet
+share/dia/sheets/Database.sheet
 share/dia/sheets/ER.sheet
 share/dia/sheets/ER/weakentity.png
 share/dia/sheets/Electric.sheet
@@ -1599,6 +1631,7 @@ share/dia/sheets/KAOS/performs.png
 share/dia/sheets/KAOS/requirement.png
 share/dia/sheets/KAOS/responsibility.png
 share/dia/sheets/KAOS/softgoal.png
+share/dia/sheets/Lights.sheet
 share/dia/sheets/Logic.sheet
 share/dia/sheets/MSE.sheet
 share/dia/sheets/Misc.sheet
@@ -1622,7 +1655,9 @@ share/dia/sheets/jigsaw.sheet
 share/dia/sheets/network.sheet
 share/dia/sheets/sybase.sheet
 share/dia/ui/display-ui.xml
+share/dia/ui/integrated-ui.xml
 share/dia/ui/popup-ui.xml
+share/dia/ui/toolbar-ui.xml
 share/dia/ui/toolbox-ui.xml
 share/dia/xslt/dia-uml.xsl
 share/dia/xslt/dia-uml2c++.xsl
@@ -1632,14 +1667,109 @@ share/dia/xslt/dia-uml2java.xsl
 share/dia/xslt/dia-uml2owl.xsl
 share/dia/xslt/dia-uml2python.xsl
 share/dia/xslt/stylesheets.xml
+share/doc/dia/en/examples/diagram.dtd
+share/doc/dia/en/examples/shape.dtd
+share/doc/dia/en/examples/sheet.dtd
+share/doc/dia/eu/examples/diagram.dtd
+share/doc/dia/eu/examples/shape.dtd
+share/doc/dia/eu/examples/sheet.dtd
+share/doc/dia/fr/examples/diagram.dtd
+share/doc/dia/fr/examples/shape.dtd
+share/doc/dia/fr/examples/sheet.dtd
+share/doc/dia/pl/examples/diagram.dtd
+share/doc/dia/pl/examples/shape.dtd
+share/doc/dia/pl/examples/sheet.dtd
 ${DIA_HELPDIR}/C
 ${DIA_HELPDIR}/en/authors.xml
+${DIA_HELPDIR}/en/custom-shapes.xml
+${DIA_HELPDIR}/en/dia-1.xml
+${DIA_HELPDIR}/en/dia-cmdline.xml
 ${DIA_HELPDIR}/en/dia.xml
 ${DIA_HELPDIR}/en/entities.xml
+${DIA_HELPDIR}/en/graphics/adjacent.png
+${DIA_HELPDIR}/en/graphics/after-hor-spread.png
+${DIA_HELPDIR}/en/graphics/after-vert-spread.png
+${DIA_HELPDIR}/en/graphics/align-bottom.png
+${DIA_HELPDIR}/en/graphics/align-center.png
+${DIA_HELPDIR}/en/graphics/align-left.png
+${DIA_HELPDIR}/en/graphics/align-menu.png
+${DIA_HELPDIR}/en/graphics/align-middle.png
+${DIA_HELPDIR}/en/graphics/align-right.png
+${DIA_HELPDIR}/en/graphics/align-top.png
+${DIA_HELPDIR}/en/graphics/arrow-style.png
+${DIA_HELPDIR}/en/graphics/assorted-shapes.png
+${DIA_HELPDIR}/en/graphics/before-hor-spread.png
+${DIA_HELPDIR}/en/graphics/before-left.png
+${DIA_HELPDIR}/en/graphics/before-top.png
+${DIA_HELPDIR}/en/graphics/before-vert-spread.png
+${DIA_HELPDIR}/en/graphics/bezierline-rightclick.png
+${DIA_HELPDIR}/en/graphics/canvas-zoom.png
+${DIA_HELPDIR}/en/graphics/cisco-computer-shapes.png
+${DIA_HELPDIR}/en/graphics/cisco-misc-shapes.png
+${DIA_HELPDIR}/en/graphics/cisco-network-shapes.png
+${DIA_HELPDIR}/en/graphics/cisco-switch-shapes.png
+${DIA_HELPDIR}/en/graphics/cisco-telephony-shapes.png
+${DIA_HELPDIR}/en/graphics/color-dropdown.png
+${DIA_HELPDIR}/en/graphics/color-selector1.png
+${DIA_HELPDIR}/en/graphics/color_selector.png
+${DIA_HELPDIR}/en/graphics/connect-fixed.png
+${DIA_HELPDIR}/en/graphics/connect-middle.png
+${DIA_HELPDIR}/en/graphics/default-colors.png
+${DIA_HELPDIR}/en/graphics/defaults-box.png
+${DIA_HELPDIR}/en/graphics/defaults-text.png
+${DIA_HELPDIR}/en/graphics/delete-text.png
+${DIA_HELPDIR}/en/graphics/dia-startup.png
+${DIA_HELPDIR}/en/graphics/diagram-properties-grid.png
+${DIA_HELPDIR}/en/graphics/diagram-properties.png
+${DIA_HELPDIR}/en/graphics/diagram-tree-sort.png
+${DIA_HELPDIR}/en/graphics/diagram-tree.png
+${DIA_HELPDIR}/en/graphics/edit-text.png
+${DIA_HELPDIR}/en/graphics/file-preferences-diagram.png
+${DIA_HELPDIR}/en/graphics/file-preferences-favorites.png
+${DIA_HELPDIR}/en/graphics/file-preferences-tree.png
+${DIA_HELPDIR}/en/graphics/file-preferences-ui.png
+${DIA_HELPDIR}/en/graphics/file-preferences-view.png
+${DIA_HELPDIR}/en/graphics/flowchart-shapes.png
 ${DIA_HELPDIR}/en/graphics/greendots.png
 ${DIA_HELPDIR}/en/graphics/home_network.png
+${DIA_HELPDIR}/en/graphics/line-arrows.png
+${DIA_HELPDIR}/en/graphics/line-buttons.png
+${DIA_HELPDIR}/en/graphics/line-colors.png
+${DIA_HELPDIR}/en/graphics/line-connect.png
+${DIA_HELPDIR}/en/graphics/line-handles.png
+${DIA_HELPDIR}/en/graphics/line-styles.png
+${DIA_HELPDIR}/en/graphics/line-width.png
 ${DIA_HELPDIR}/en/graphics/line_icon.png
 ${DIA_HELPDIR}/en/graphics/line_props.png
+${DIA_HELPDIR}/en/graphics/misc-shapes.png
+${DIA_HELPDIR}/en/graphics/network-shapes.png
+${DIA_HELPDIR}/en/graphics/object-group.png
+${DIA_HELPDIR}/en/graphics/polyline-rightclick.png
+${DIA_HELPDIR}/en/graphics/preferences-gridlines.png
+${DIA_HELPDIR}/en/graphics/preferences_fig.png
+${DIA_HELPDIR}/en/graphics/properties-uml-class1.png
+${DIA_HELPDIR}/en/graphics/reverse-colors.png
+${DIA_HELPDIR}/en/graphics/ruler-arrows.png
+${DIA_HELPDIR}/en/graphics/sample-flowchart.png
+${DIA_HELPDIR}/en/graphics/select-area.png
+${DIA_HELPDIR}/en/graphics/select-menu.png
+${DIA_HELPDIR}/en/graphics/selected-object.png
+${DIA_HELPDIR}/en/graphics/sheets-objects.png
+${DIA_HELPDIR}/en/graphics/snaptogrid-button.png
+${DIA_HELPDIR}/en/graphics/stacked.png
+${DIA_HELPDIR}/en/graphics/standard-line-properties.png
+${DIA_HELPDIR}/en/graphics/toolbox-basic.png
+${DIA_HELPDIR}/en/graphics/toolbox-image.png
+${DIA_HELPDIR}/en/graphics/toolbox-lower.png
+${DIA_HELPDIR}/en/graphics/toolbox-magnify.png
+${DIA_HELPDIR}/en/graphics/toolbox-modify.png
+${DIA_HELPDIR}/en/graphics/toolbox-scroll.png
+${DIA_HELPDIR}/en/graphics/toolbox-special.png
+${DIA_HELPDIR}/en/graphics/toolbox.png
+${DIA_HELPDIR}/en/graphics/uml-shapes.png
+${DIA_HELPDIR}/en/graphics/view-menu.png
+${DIA_HELPDIR}/en/graphics/view-zoom.png
+${DIA_HELPDIR}/en/graphics/zigzagline-rightclick.png
 ${DIA_HELPDIR}/en/intro.xml
 ${DIA_HELPDIR}/en/license.xml
 ${DIA_HELPDIR}/en/usage-canvas.xml
@@ -1651,15 +1781,68 @@ ${DIA_HELPDIR}/en/usage-objects-selecting.xml
 ${DIA_HELPDIR}/en/usage-objects-special.xml
 ${DIA_HELPDIR}/en/usage-objects.xml
 ${DIA_HELPDIR}/en/usage-quickstart.xml
+${DIA_HELPDIR}/eu/authors.xml
 ${DIA_HELPDIR}/eu/dia.xml
+${DIA_HELPDIR}/eu/entities.xml
 ${DIA_HELPDIR}/eu/graphics/greendots.png
 ${DIA_HELPDIR}/eu/graphics/home_network.png
 ${DIA_HELPDIR}/eu/graphics/line_icon.png
 ${DIA_HELPDIR}/eu/graphics/line_props.png
+${DIA_HELPDIR}/eu/intro.xml
+${DIA_HELPDIR}/eu/license.xml
+${DIA_HELPDIR}/eu/usage-canvas.xml
+${DIA_HELPDIR}/eu/usage-customization.xml
+${DIA_HELPDIR}/eu/usage-layers.xml
+${DIA_HELPDIR}/eu/usage-loadsave.xml
+${DIA_HELPDIR}/eu/usage-objects-basic.xml
+${DIA_HELPDIR}/eu/usage-objects-selecting.xml
+${DIA_HELPDIR}/eu/usage-objects-special.xml
+${DIA_HELPDIR}/eu/usage-objects.xml
+${DIA_HELPDIR}/eu/usage-quickstart.xml
+${DIA_HELPDIR}/fr/authors.xml
+${DIA_HELPDIR}/fr/custom-shapes.xml
+${DIA_HELPDIR}/fr/dia-1.xml
+${DIA_HELPDIR}/fr/dia-cmdline.xml
+${DIA_HELPDIR}/fr/dia.xml
+${DIA_HELPDIR}/fr/entities.xml
+${DIA_HELPDIR}/fr/graphics/color_selector.png
+${DIA_HELPDIR}/fr/graphics/greendots.png
+${DIA_HELPDIR}/fr/graphics/home_network.png
+${DIA_HELPDIR}/fr/graphics/line_icon.png
+${DIA_HELPDIR}/fr/graphics/line_props.png
+${DIA_HELPDIR}/fr/graphics/preferences_fig.png
+${DIA_HELPDIR}/fr/intro.xml
+${DIA_HELPDIR}/fr/license.xml
+${DIA_HELPDIR}/fr/usage-canvas.xml
+${DIA_HELPDIR}/fr/usage-customization.xml
+${DIA_HELPDIR}/fr/usage-layers.xml
+${DIA_HELPDIR}/fr/usage-loadsave.xml
+${DIA_HELPDIR}/fr/usage-objects-basic.xml
+${DIA_HELPDIR}/fr/usage-objects-selecting.xml
+${DIA_HELPDIR}/fr/usage-objects-special.xml
+${DIA_HELPDIR}/fr/usage-objects.xml
+${DIA_HELPDIR}/fr/usage-quickstart.xml
+${DIA_HELPDIR}/pl/authors.xml
 ${DIA_HELPDIR}/pl/dia.xml
 ${DIA_HELPDIR}/pl/graphics/greendots.png
 ${DIA_HELPDIR}/pl/graphics/home_network.png
 ${DIA_HELPDIR}/pl/graphics/line_props.png
+${DIA_HELPDIR}/pl/intro.xml
+${DIA_HELPDIR}/pl/license.xml
+${DIA_HELPDIR}/pl/usage-canvas.xml
+${DIA_HELPDIR}/pl/usage-customization.xml
+${DIA_HELPDIR}/pl/usage-layers.xml
+${DIA_HELPDIR}/pl/usage-loadsave.xml
+${DIA_HELPDIR}/pl/usage-objects-selecting.xml
+${DIA_HELPDIR}/pl/usage-objects-special.xml
+${DIA_HELPDIR}/pl/usage-objects.xml
+${DIA_HELPDIR}/pl/usage-quickstart.xml
+share/icons/hicolor/16x16/apps/dia.png
+share/icons/hicolor/22x22/apps/dia.png
+share/icons/hicolor/24x24/apps/dia.png
+share/icons/hicolor/32x32/apps/dia.png
+share/icons/hicolor/48x48/apps/dia.png
+share/icons/hicolor/scalable/apps/dia.svg
 share/locale/am/LC_MESSAGES/dia.mo
 share/locale/ar/LC_MESSAGES/dia.mo
 share/locale/az/LC_MESSAGES/dia.mo
@@ -1670,6 +1853,7 @@ share/locale/ca/LC_MESSAGES/dia.mo
 share/locale/cs/LC_MESSAGES/dia.mo
 share/locale/da/LC_MESSAGES/dia.mo
 share/locale/de/LC_MESSAGES/dia.mo
+share/locale/dz/LC_MESSAGES/dia.mo
 share/locale/el/LC_MESSAGES/dia.mo
 share/locale/en_CA/LC_MESSAGES/dia.mo
 share/locale/en_GB/LC_MESSAGES/dia.mo
@@ -1686,17 +1870,21 @@ share/locale/id/LC_MESSAGES/dia.mo
 share/locale/is/LC_MESSAGES/dia.mo
 share/locale/it/LC_MESSAGES/dia.mo
 share/locale/ja/LC_MESSAGES/dia.mo
+share/locale/kn/LC_MESSAGES/dia.mo
 share/locale/ko/LC_MESSAGES/dia.mo
 share/locale/lt/LC_MESSAGES/dia.mo
 share/locale/lv/LC_MESSAGES/dia.mo
 share/locale/mk/LC_MESSAGES/dia.mo
 share/locale/ml/LC_MESSAGES/dia.mo
 share/locale/mn/LC_MESSAGES/dia.mo
+share/locale/mr/LC_MESSAGES/dia.mo
 share/locale/ms/LC_MESSAGES/dia.mo
 share/locale/nb/LC_MESSAGES/dia.mo
 share/locale/ne/LC_MESSAGES/dia.mo
 share/locale/nl/LC_MESSAGES/dia.mo
 share/locale/nn/LC_MESSAGES/dia.mo
+share/locale/oc/LC_MESSAGES/dia.mo
+share/locale/pa/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
@@ -1714,8 +1902,13 @@ share/locale/tr/LC_MESSAGES/dia.mo
 share/locale/uk/LC_MESSAGES/dia.mo
 share/locale/vi/LC_MESSAGES/dia.mo
 share/locale/zh_CN/LC_MESSAGES/dia.mo
+share/locale/zh_HK/LC_MESSAGES/dia.mo
 share/locale/zh_TW/LC_MESSAGES/dia.mo
 share/mime-info/dia.keys
 share/mime-info/dia.mime
-share/pixmaps/dia-diagram.png
-share/pixmaps/dia_gnome_icon.png
+share/omf/dia/dia-C.omf
+share/omf/dia/dia-eu.omf
+share/omf/dia/dia-fr.omf
+share/omf/dia/dia-pl.omf
+@pkgdir share/oaf
+@pkgdir share/dia/sheets/SISSI
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index d845d660bea..53734a45908 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.22 2007/11/17 14:14:01 rillig Exp $
+$NetBSD: distinfo,v 1.23 2009/12/09 10:22:04 drochner Exp $
 
-SHA1 (dia-0.96.1.tar.gz) = 25efddb44cf78e94555ce31e9b36645a9aa7c8b9
-RMD160 (dia-0.96.1.tar.gz) = b876a9e3760be1774bc0e69ab35d9a7f02a03ae0
-Size (dia-0.96.1.tar.gz) = 6463296 bytes
-SHA1 (patch-aa) = 42d92644e11e49d7c70d6468768a275f4bd64c2d
-SHA1 (patch-ab) = 01b09f193de697207c473940de3e9ffb695c0d70
+SHA1 (dia-0.97.tar.gz) = b3c48e83052f20df0213828a1ae4df7a12f5c70c
+RMD160 (dia-0.97.tar.gz) = dc88b6673acf3afd30e95f770942471bd01a9857
+Size (dia-0.97.tar.gz) = 8995310 bytes
+SHA1 (patch-aa) = fd7b07c56464f1dd05f3fdcc3f48531619586972
 SHA1 (patch-be) = dab7626daefcd702b31f54d198311d9be921e1ff
-SHA1 (patch-ca) = 48617d334d852253f858176bbe9222f61d379c37
-SHA1 (patch-cb) = fab6a63d25781fa9ab7c6a4f6e5ff43ff29aec6e
-SHA1 (patch-cc) = f2c58551d31ec577d25f9dfc62f48f28845d2dd7
-SHA1 (patch-da) = e61d7adeec3b1e5edffa422904551f686d9c7b8b
+SHA1 (patch-ca) = 8737f3ff19244e2f87ffb571da21159bc2248648
+SHA1 (patch-cb) = 02210139cbf38e91a61ad1e090f63f5635bb26ef
+SHA1 (patch-cc) = 2dd4c822d8771e48ff1ac67946d765e5d8b85d50
+SHA1 (patch-cd) = b7dd72a359fe6f36a56d2c16f94427c6977b0477
+SHA1 (patch-da) = 4ed80c2a7eaa2dbbebd8265c8b74faac20c4f6c2
diff --git a/graphics/dia/options.mk b/graphics/dia/options.mk
index 9f3ce070a87..3b0ab73c704 100644
--- a/graphics/dia/options.mk
+++ b/graphics/dia/options.mk
@@ -1,9 +1,8 @@
-# $NetBSD: options.mk,v 1.7 2009/07/22 09:01:31 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2009/12/09 10:22:04 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dia
-#PKG_SUPPORTED_OPTIONS=	gnome cairo
-PKG_SUPPORTED_OPTIONS=	gnome
-PKG_SUGGESTED_OPTIONS=	gnome
+PKG_SUPPORTED_OPTIONS=	gnome cairo
+PKG_SUGGESTED_OPTIONS=	gnome cairo
 
 .include "../../mk/bsd.options.mk"
 
@@ -20,7 +19,6 @@ CONFIGURE_ARGS+=	--disable-gnome
 PLIST_SUBST+=		DIA_HELPDIR=share/dia/help
 .endif
 
-# Disabled, freedesktop is down.
 .if !empty(PKG_OPTIONS:Mcairo)
 CONFIGURE_ARGS+=	--with-cairo
 .  include "../../graphics/cairo/buildlink3.mk"
diff --git a/graphics/dia/patches/patch-aa b/graphics/dia/patches/patch-aa
index 3022b37bed2..443a63eb14f 100644
--- a/graphics/dia/patches/patch-aa
+++ b/graphics/dia/patches/patch-aa
@@ -1,50 +1,67 @@
-$NetBSD: patch-aa,v 1.5 2007/04/19 20:14:59 drochner Exp $
+$NetBSD: patch-aa,v 1.6 2009/12/09 10:22:04 drochner Exp $
 
---- configure.orig	2007-03-29 08:11:17.000000000 +0200
+--- configure.orig	2009-05-03 20:09:51.000000000 +0200
 +++ configure
-@@ -20515,7 +20515,7 @@ if test "${with_freetype+set}" = set; th
- else
+@@ -22005,7 +22005,7 @@ else
    with_freetype=yes
- fi;
+ fi
+ 
 -if test "x$with_freetype" == "xyes"; then
 +if test "x$with_freetype" = "xyes"; then
  
  pkg_failed=no
- echo "$as_me:$LINENO: checking for PANGOFT2" >&5
-@@ -20989,7 +20989,8 @@ if test "${with_gnomeprint+set}" = set; 
- else
-   with_gnomeprint=no
- fi;
--if test "x$with_gnomeprint" == "xyes"; then
-+if 
-+test "x$with_gnomeprint" = "xyes"; then
+ { $as_echo "$as_me:$LINENO: checking for PANGOFT2" >&5
+@@ -22692,7 +22692,7 @@ else
+ $as_echo "yes" >&6; }
+ 	pangocairo_ok=yes
+ fi
+-if test "x$pangocairo_ok" == "xyes"; then
++if test "x$pangocairo_ok" = "xyes"; then
  
- pkg_failed=no
- echo "$as_me:$LINENO: checking for GNOMEPRINT" >&5
-@@ -21927,7 +21928,7 @@ else
- echo "${ECHO_T}no" >&6
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PANGOCAIRO_H 1
+@@ -23393,7 +23393,7 @@ $as_echo "no" >&6; }
  fi
  
+ 
 -if test "$XGETTEXT" == none ; then
 +if test "$XGETTEXT" = none ; then
-    { { echo "$as_me:$LINENO: error: xgettext program not found: $XGETTEXT." >&5
- echo "$as_me: error: xgettext program not found: $XGETTEXT." >&2;}
+    { { $as_echo "$as_me:$LINENO: error: xgettext program not found: $XGETTEXT." >&5
+ $as_echo "$as_me: error: xgettext program not found: $XGETTEXT." >&2;}
     { (exit 1); exit 1; }; }
-@@ -25023,7 +25024,7 @@ echo $ECHO_N "checking for $am_display_P
+@@ -26631,7 +26631,7 @@ $as_echo_n "checking for $am_display_PYT
  if test "${am_cv_python_pythondir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
 -  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
 +  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0)" 2>/dev/null ||
       echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
  fi
- echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-@@ -25041,7 +25042,7 @@ echo $ECHO_N "checking for $am_display_P
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+@@ -26649,7 +26649,7 @@ $as_echo_n "checking for $am_display_PYT
  if test "${am_cv_python_pyexecdir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
 -  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
 +  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0)" 2>/dev/null ||
       echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
  fi
- echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+@@ -27022,7 +27022,7 @@ $as_echo "no" >&6; }
+ fi
+ 
+ 
+-if  test "x$dblatex" == "xno"; then
++if  test "x$dblatex" = "xno"; then
+   if test "x$jw" != "xno"; then
+   WITH_JW_TRUE=
+   WITH_JW_FALSE='#'
+@@ -27043,7 +27043,7 @@ fi
+ fi
+ hardbook_ok=no
+ xsltproc_ok=no
+-if test "x$with_hardbooks" == "xno"; then
++if test "x$with_hardbooks" = "xno"; then
+    if test "xno" != "xno"; then
+   WITH_JW_TRUE=
+   WITH_JW_FALSE='#'
diff --git a/graphics/dia/patches/patch-ab b/graphics/dia/patches/patch-ab
deleted file mode 100644
index ae5b41d44fc..00000000000
--- a/graphics/dia/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2007/04/19 20:14:59 drochner Exp $
-
---- doc/en/usage-layers.xml.orig	2007-04-19 21:35:56.000000000 +0200
-+++ doc/en/usage-layers.xml
-@@ -26,7 +26,7 @@
-       </para>
-     </tip>
-     <para>
--      Each new diagram comes with the default layer labelled “Background”. Of course you can change its name and settings to customize it to your needs as you can do with any other layer.
-+      Each new diagram comes with the default layer labelled "Background". Of course you can change its name and settings to customize it to your needs as you can do with any other layer.
-     </para>
-     <para>
-       You can use layers to create overlay slide show by drawing each incremental slide in a
diff --git a/graphics/dia/patches/patch-ca b/graphics/dia/patches/patch-ca
index 1fc28f07955..b6fe980c2b2 100644
--- a/graphics/dia/patches/patch-ca
+++ b/graphics/dia/patches/patch-ca
@@ -1,13 +1,13 @@
-$NetBSD: patch-ca,v 1.1 2006/06/11 16:55:35 drochner Exp $
+$NetBSD: patch-ca,v 1.2 2009/12/09 10:22:04 drochner Exp $
 
---- doc/en/Makefile.in.orig	2006-06-11 17:34:55.000000000 +0200
+--- doc/en/Makefile.in.orig	2009-05-03 20:12:41.000000000 +0200
 +++ doc/en/Makefile.in
-@@ -326,7 +326,7 @@ docname = dia
- lang = en
- omffile = 
- entities = 
--@HAVE_GNOME_FALSE@docdir = $(datadir)/help/$(docname)/$(lang)
-+@HAVE_GNOME_FALSE@docdir = $(datadir)/dia/help/$(lang)
+@@ -332,7 +332,7 @@ RESOLUTION = 600
+ ENCODING = utf8
+ UNICODE = 1
+ LATEX_CLASS_OPTIONS = -P 'latex.class.options=oneside'
+-@HAVE_GNOME_FALSE@helpdocdir = $(datadir)/$(docname)/help/$(lang)
++@HAVE_GNOME_FALSE@helpdocdir = $(datadir)/dia/help/$(lang)
  
  # **********  Begin of section some packagers may need to modify  **********
- # This variable (docdir) specifies where the documents should be installed.
+ # This variable (helpdocdir) specifies where the documents should be installed.
diff --git a/graphics/dia/patches/patch-cb b/graphics/dia/patches/patch-cb
index 5ffe4c94d62..9866fec6f17 100644
--- a/graphics/dia/patches/patch-cb
+++ b/graphics/dia/patches/patch-cb
@@ -1,13 +1,13 @@
-$NetBSD: patch-cb,v 1.1 2006/06/11 16:55:35 drochner Exp $
+$NetBSD: patch-cb,v 1.2 2009/12/09 10:22:04 drochner Exp $
 
---- doc/eu/Makefile.in.orig	2006-06-11 17:35:09.000000000 +0200
+--- doc/eu/Makefile.in.orig	2009-05-03 20:12:41.000000000 +0200
 +++ doc/eu/Makefile.in
-@@ -326,7 +326,7 @@ docname = dia
- lang = eu
- omffile = 
- entities = 
--@HAVE_GNOME_FALSE@docdir = $(datadir)/help/$(docname)/$(lang)
-+@HAVE_GNOME_FALSE@docdir = $(datadir)/dia/help/$(lang)
+@@ -331,7 +331,7 @@ RESOLUTION = 600
+ ENCODING = utf8
+ UNICODE = 1
+ LATEX_CLASS_OPTIONS = -P 'latex.class.options=oneside'
+-@HAVE_GNOME_FALSE@helpdocdir = $(datadir)/$(docname)/help/$(lang)
++@HAVE_GNOME_FALSE@helpdocdir = $(datadir)/dia/help/$(lang)
  
  # **********  Begin of section some packagers may need to modify  **********
- # This variable (docdir) specifies where the documents should be installed.
+ # This variable (helpdocdir) specifies where the documents should be installed.
diff --git a/graphics/dia/patches/patch-cc b/graphics/dia/patches/patch-cc
index 0c2184fa56d..7e06536b815 100644
--- a/graphics/dia/patches/patch-cc
+++ b/graphics/dia/patches/patch-cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-cc,v 1.1 2006/06/11 16:55:35 drochner Exp $
+$NetBSD: patch-cc,v 1.2 2009/12/09 10:22:04 drochner Exp $
 
---- doc/pl/Makefile.in.orig	2006-06-11 17:35:25.000000000 +0200
+--- doc/pl/Makefile.in.orig	2009-05-03 20:12:41.000000000 +0200
 +++ doc/pl/Makefile.in
-@@ -322,7 +322,7 @@ docname = dia
- lang = pl
- omffile = 
- entities = 
--@HAVE_GNOME_FALSE@docdir = $(datadir)/help/$(docname)/$(lang)
-+@HAVE_GNOME_FALSE@docdir = $(datadir)/dia/help/$(lang)
+@@ -326,7 +326,7 @@ DOCUMENT_ENCODING = ISO-8859-2
+ ENCODING = utf8
+ UNICODE = 1
+ LATEX_CLASS_OPTIONS = -P 'latex.class.options=oneside' -P 'latex.babel.use=0'
+-@HAVE_GNOME_FALSE@helpdocdir = $(datadir)/$(docname)/help/$(lang)
++@HAVE_GNOME_FALSE@helpdocdir = $(datadir)/dia/help/$(lang)
  
  # **********  Begin of section some packagers may need to modify  **********
- # This variable (docdir) specifies where the documents should be installed.
+ # This variable (helpdocdir) specifies where the documents should be installed.
diff --git a/graphics/dia/patches/patch-cd b/graphics/dia/patches/patch-cd
new file mode 100644
index 00000000000..289a32e0b31
--- /dev/null
+++ b/graphics/dia/patches/patch-cd
@@ -0,0 +1,13 @@
+$NetBSD: patch-cd,v 1.1 2009/12/09 10:22:04 drochner Exp $
+
+--- doc/fr/Makefile.in.orig	2009-05-03 20:12:41.000000000 +0200
++++ doc/fr/Makefile.in
+@@ -571,7 +571,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-man
++install-data-am: install-data-local
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ 
diff --git a/graphics/dia/patches/patch-da b/graphics/dia/patches/patch-da
index 0c2ba3ecccb..091ad398fb6 100644
--- a/graphics/dia/patches/patch-da
+++ b/graphics/dia/patches/patch-da
@@ -1,21 +1,19 @@
-$NetBSD: patch-da,v 1.2 2007/11/17 14:14:01 rillig Exp $
+$NetBSD: patch-da,v 1.3 2009/12/09 10:22:04 drochner Exp $
 
-Some shells don't like syntactically empty "for" loops.
-
---- omf.make.orig	2007-01-06 23:39:36.000000000 +0100
-+++ omf.make	2007-11-17 15:12:01.000000000 +0100
+--- omf.make.orig	2009-04-17 10:25:24.000000000 +0200
++++ omf.make
 @@ -44,11 +44,10 @@ omf_timestamp: $(omffile)
  
  install-data-hook-omf:
- 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
--	if test "$(omffile)"; then \
+ 	$(mkinstalldirs) $(omf_dest_dir)
+-	-if test -n "$(omffile)"; then \
 -	  for file in $(omffile); do \
 +	omffile="$(omffile)"; \
 +	  for file in $$omffile; do \
- 	    $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+ 	    $(INSTALL_DATA) $$file.out $(omf_dest_dir)/$$file; \
 -	  done; \
 -	fi
-+	  done
- 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
++	  done;
+ 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(omf_dest_dir)
  
  uninstall-local-omf: