update to 0.96.1

changes:
* Text rendering is now based on the TextLine objects, each of which
  contain one line of text along with font and font height.  This has
  allowed proper control of text width and speedier rendering.
* Visio VXD files can now be imported and exported, thanks to Ian
  Redfern.
-internal API changes
* A number of new keyboard shortcuts.
* Layer visibility is now undoable.
* New sheets for Business Process Modelling
-bugfixes

7 files changed, 144 insertions, 22 deletions

diff --git a/graphics/dia-python/PLIST b/graphics/dia-python/PLIST
index 14bc59f4feb..3a78e59874f 100644
--- a/graphics/dia-python/PLIST
+++ b/graphics/dia-python/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2006/05/02 16:23:30 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/04/19 20:14:59 drochner Exp $
 lib/dia/libpython_plugin.la
 share/dia/python-startup.py
 share/dia/python-startup.pyc
+share/dia/python/aobjects.py
+share/dia/python/aobjects.pyc
 share/dia/python/codegen.py
 share/dia/python/codegen.pyc
 share/dia/python/diasvg.py
@@ -10,6 +12,8 @@ share/dia/python/diasvg_import.py
 share/dia/python/diasvg_import.pyc
 share/dia/python/dot.py
 share/dia/python/dot.pyc
+share/dia/python/doxrev.py
+share/dia/python/doxrev.pyc
 share/dia/python/group_props.py
 share/dia/python/group_props.pyc
 share/dia/python/gtkcons.py
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 78667e3271e..893cc351156 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2007/03/21 12:05:46 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2007/04/19 20:14:58 drochner Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=	1
 
 USE_DIRS+=	xdg-1.1
 
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index 55a744d2380..dbbea6850a1 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile.common,v 1.16 2006/11/14 14:09:50 joerg Exp $
+# $NetBSD: Makefile.common,v 1.17 2007/04/19 20:14:58 drochner Exp $
 #
 
-DISTNAME=	dia-0.95-1
-DIAPKGNAME=	dia-0.95.1
-PKGNAME=	${DIAPKGNAME:S/dia-/dia${DIA_SUBPKG}-/}
+DISTNAME=	dia-0.96.1
+PKGNAME=	${DISTNAME:S/dia-/dia${DIA_SUBPKG}-/}
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.95/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.96/}
 
 MAINTAINER=	jmcneill@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/dia/
diff --git a/graphics/dia/PLIST b/graphics/dia/PLIST
index fe945b8f596..92262bd9314 100644
--- a/graphics/dia/PLIST
+++ b/graphics/dia/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/06/11 16:55:35 drochner Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/04/19 20:14:59 drochner Exp $
 bin/dia
 lib/dia/libaadl_objects.la
 lib/dia/libbondgraph_objects.la
@@ -27,6 +27,7 @@ lib/dia/libshape_filter.la
 lib/dia/libstandard_objects.la
 lib/dia/libsvg_filter.la
 lib/dia/libuml_objects.la
+lib/dia/libvdx_filter.la
 lib/dia/libwpg_filter.la
 lib/dia/libxfig_filter.la
 lib/dia/libxslt_filter.la
@@ -115,6 +116,90 @@ share/dia/shapes/Assorted/triangle-isoceles.png
 share/dia/shapes/Assorted/triangle-isoceles.shape
 share/dia/shapes/Assorted/triangle-rightangle.png
 share/dia/shapes/Assorted/triangle-rightangle.shape
+share/dia/shapes/BPMN/Activity-Looping.png
+share/dia/shapes/BPMN/Activity-Looping.shape
+share/dia/shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.png
+share/dia/shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.shape
+share/dia/shapes/BPMN/Collapsed-Sub-Process.png
+share/dia/shapes/BPMN/Collapsed-Sub-Process.shape
+share/dia/shapes/BPMN/Compensation-Collapsed-Sub-Process.png
+share/dia/shapes/BPMN/Compensation-Collapsed-Sub-Process.shape
+share/dia/shapes/BPMN/Compensation.png
+share/dia/shapes/BPMN/Compensation.shape
+share/dia/shapes/BPMN/Data-Object.png
+share/dia/shapes/BPMN/Data-Object.shape
+share/dia/shapes/BPMN/End-Event-Cancel.png
+share/dia/shapes/BPMN/End-Event-Cancel.shape
+share/dia/shapes/BPMN/End-Event-Compensation.png
+share/dia/shapes/BPMN/End-Event-Compensation.shape
+share/dia/shapes/BPMN/End-Event-Error.png
+share/dia/shapes/BPMN/End-Event-Error.shape
+share/dia/shapes/BPMN/End-Event-Link.png
+share/dia/shapes/BPMN/End-Event-Link.shape
+share/dia/shapes/BPMN/End-Event-Message.png
+share/dia/shapes/BPMN/End-Event-Message.shape
+share/dia/shapes/BPMN/End-Event-Multiple.png
+share/dia/shapes/BPMN/End-Event-Multiple.shape
+share/dia/shapes/BPMN/End-Event-Terminate.png
+share/dia/shapes/BPMN/End-Event-Terminate.shape
+share/dia/shapes/BPMN/End-Event.png
+share/dia/shapes/BPMN/End-Event.shape
+share/dia/shapes/BPMN/Gateway-Complex.png
+share/dia/shapes/BPMN/Gateway-Complex.shape
+share/dia/shapes/BPMN/Gateway-Exclusive-XOR-Data-Based.png
+share/dia/shapes/BPMN/Gateway-Exclusive-XOR-Data-Based.shape
+share/dia/shapes/BPMN/Gateway-Exclusive-XOR-Event-Based.png
+share/dia/shapes/BPMN/Gateway-Exclusive-XOR-Event-Based.shape
+share/dia/shapes/BPMN/Gateway-Inclusive-OR.png
+share/dia/shapes/BPMN/Gateway-Inclusive-OR.shape
+share/dia/shapes/BPMN/Gateway-Parallel-AND.png
+share/dia/shapes/BPMN/Gateway-Parallel-AND.shape
+share/dia/shapes/BPMN/Gateway.png
+share/dia/shapes/BPMN/Gateway.shape
+share/dia/shapes/BPMN/Group.png
+share/dia/shapes/BPMN/Group.shape
+share/dia/shapes/BPMN/Intermediate-Event-Cancel.png
+share/dia/shapes/BPMN/Intermediate-Event-Cancel.shape
+share/dia/shapes/BPMN/Intermediate-Event-Compensation.png
+share/dia/shapes/BPMN/Intermediate-Event-Compensation.shape
+share/dia/shapes/BPMN/Intermediate-Event-Error.png
+share/dia/shapes/BPMN/Intermediate-Event-Error.shape
+share/dia/shapes/BPMN/Intermediate-Event-Link.png
+share/dia/shapes/BPMN/Intermediate-Event-Link.shape
+share/dia/shapes/BPMN/Intermediate-Event-Message.png
+share/dia/shapes/BPMN/Intermediate-Event-Message.shape
+share/dia/shapes/BPMN/Intermediate-Event-Multiple.png
+share/dia/shapes/BPMN/Intermediate-Event-Multiple.shape
+share/dia/shapes/BPMN/Intermediate-Event-Rule.png
+share/dia/shapes/BPMN/Intermediate-Event-Rule.shape
+share/dia/shapes/BPMN/Intermediate-Event-Timer.png
+share/dia/shapes/BPMN/Intermediate-Event-Timer.shape
+share/dia/shapes/BPMN/Intermediate-Event.png
+share/dia/shapes/BPMN/Intermediate-Event.shape
+share/dia/shapes/BPMN/Looping-Collapsed-Sub-Process.png
+share/dia/shapes/BPMN/Looping-Collapsed-Sub-Process.shape
+share/dia/shapes/BPMN/Multiple-Instance-Collapsed-Sub-Process.png
+share/dia/shapes/BPMN/Multiple-Instance-Collapsed-Sub-Process.shape
+share/dia/shapes/BPMN/Multiple-Instance-Task.png
+share/dia/shapes/BPMN/Multiple-Instance-Task.shape
+share/dia/shapes/BPMN/Start-Event-Link.png
+share/dia/shapes/BPMN/Start-Event-Link.shape
+share/dia/shapes/BPMN/Start-Event-Message.png
+share/dia/shapes/BPMN/Start-Event-Message.shape
+share/dia/shapes/BPMN/Start-Event-Multiple.png
+share/dia/shapes/BPMN/Start-Event-Multiple.shape
+share/dia/shapes/BPMN/Start-Event-Rule.png
+share/dia/shapes/BPMN/Start-Event-Rule.shape
+share/dia/shapes/BPMN/Start-Event-Timer.png
+share/dia/shapes/BPMN/Start-Event-Timer.shape
+share/dia/shapes/BPMN/Start-Event.png
+share/dia/shapes/BPMN/Start-Event.shape
+share/dia/shapes/BPMN/Task.png
+share/dia/shapes/BPMN/Task.shape
+share/dia/shapes/BPMN/Text-Annotation.png
+share/dia/shapes/BPMN/Text-Annotation.shape
+share/dia/shapes/BPMN/Transaction.png
+share/dia/shapes/BPMN/Transaction.shape
 share/dia/shapes/ChemEng/ACgen.png
 share/dia/shapes/ChemEng/ACgen.shape
 share/dia/shapes/ChemEng/SaT-fixedtube.png
@@ -1127,6 +1212,8 @@ share/dia/shapes/Electric/vrelay.png
 share/dia/shapes/Electric/vrelay.shape
 share/dia/shapes/Flowchart/collate.png
 share/dia/shapes/Flowchart/collate.shape
+share/dia/shapes/Flowchart/datasource.png
+share/dia/shapes/Flowchart/datasource.shape
 share/dia/shapes/Flowchart/delay.png
 share/dia/shapes/Flowchart/delay.shape
 share/dia/shapes/Flowchart/display.png
@@ -1459,11 +1546,11 @@ share/dia/shapes/sybase/stableq.png
 share/dia/shapes/sybase/stableq.shape
 share/dia/sheets/AADL.sheet
 share/dia/sheets/Assorted.sheet
+share/dia/sheets/BPMN.sheet
 share/dia/sheets/ChemEng.sheet
 share/dia/sheets/Circuit.sheet
 share/dia/sheets/Contact.sheet
 share/dia/sheets/Cybernetics.sheet
-share/dia/sheets/EML.sheet
 share/dia/sheets/ER.sheet
 share/dia/sheets/ER/weakentity.png
 share/dia/sheets/Electric.sheet
@@ -1534,6 +1621,9 @@ share/dia/sheets/civil.sheet
 share/dia/sheets/jigsaw.sheet
 share/dia/sheets/network.sheet
 share/dia/sheets/sybase.sheet
+share/dia/ui/display-ui.xml
+share/dia/ui/popup-ui.xml
+share/dia/ui/toolbox-ui.xml
 share/dia/xslt/dia-uml.xsl
 share/dia/xslt/dia-uml2c++.xsl
 share/dia/xslt/dia-uml2componentlist.xsl
@@ -1571,6 +1661,7 @@ ${DIA_HELPDIR}/pl/graphics/greendots.png
 ${DIA_HELPDIR}/pl/graphics/home_network.png
 ${DIA_HELPDIR}/pl/graphics/line_props.png
 share/locale/am/LC_MESSAGES/dia.mo
+share/locale/ar/LC_MESSAGES/dia.mo
 share/locale/az/LC_MESSAGES/dia.mo
 share/locale/be/LC_MESSAGES/dia.mo
 share/locale/bg/LC_MESSAGES/dia.mo
@@ -1587,6 +1678,7 @@ share/locale/eu/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/gl/LC_MESSAGES/dia.mo
 share/locale/gu/LC_MESSAGES/dia.mo
 share/locale/hr/LC_MESSAGES/dia.mo
 share/locale/hu/LC_MESSAGES/dia.mo
@@ -1595,6 +1687,8 @@ share/locale/is/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/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
@@ -1615,6 +1709,7 @@ share/locale/sq/LC_MESSAGES/dia.mo
 share/locale/sr/LC_MESSAGES/dia.mo
 share/locale/sr@Latn/LC_MESSAGES/dia.mo
 share/locale/sv/LC_MESSAGES/dia.mo
+share/locale/th/LC_MESSAGES/dia.mo
 share/locale/tr/LC_MESSAGES/dia.mo
 share/locale/uk/LC_MESSAGES/dia.mo
 share/locale/vi/LC_MESSAGES/dia.mo
@@ -1640,6 +1735,7 @@ share/pixmaps/dia_gnome_icon.png
 @dirrm ${DIA_HELPDIR}
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/dia/xslt
+@dirrm share/dia/ui
 @dirrm share/dia/sheets/UML
 @dirrm share/dia/sheets/KAOS
 @dirrm share/dia/sheets/Jackson
@@ -1667,6 +1763,7 @@ share/pixmaps/dia_gnome_icon.png
 @dirrm share/dia/shapes/Cisco
 @dirrm share/dia/shapes/Circuit
 @dirrm share/dia/shapes/ChemEng
+@dirrm share/dia/shapes/BPMN
 @dirrm share/dia/shapes/Assorted
 @dirrm share/dia/shapes
 @dirrm share/dia
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 8003fb44435..39804f7cdb9 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.19 2006/10/10 19:48:52 rillig Exp $
+$NetBSD: distinfo,v 1.20 2007/04/19 20:14:59 drochner Exp $
 
-SHA1 (dia-0.95-1.tar.gz) = eb00a1a2a2b7b3dd966e4375557b770cf75ffb34
-RMD160 (dia-0.95-1.tar.gz) = c903b34fa4f7f2e2ff7e9ec8497608d92c76d7b1
-Size (dia-0.95-1.tar.gz) = 6035584 bytes
-SHA1 (patch-aa) = 0da43227dcb6f3c1aeae188667bc751841a75bbb
+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 (patch-be) = dab7626daefcd702b31f54d198311d9be921e1ff
 SHA1 (patch-ca) = 48617d334d852253f858176bbe9222f61d379c37
 SHA1 (patch-cb) = fab6a63d25781fa9ab7c6a4f6e5ff43ff29aec6e
diff --git a/graphics/dia/patches/patch-aa b/graphics/dia/patches/patch-aa
index 7f1ca367360..3022b37bed2 100644
--- a/graphics/dia/patches/patch-aa
+++ b/graphics/dia/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2006/10/10 19:48:52 rillig Exp $
+$NetBSD: patch-aa,v 1.5 2007/04/19 20:14:59 drochner Exp $
 
---- configure.orig	2006-05-25 22:49:43.000000000 +0200
-+++ configure	2006-10-10 21:45:38.000000000 +0200
-@@ -21854,7 +21854,8 @@ if test "${with_gnomeprint+set}" = set; 
+--- configure.orig	2007-03-29 08:11:17.000000000 +0200
++++ configure
+@@ -20515,7 +20515,7 @@ if test "${with_freetype+set}" = set; th
+ else
+   with_freetype=yes
+ 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;
@@ -12,7 +21,7 @@ $NetBSD: patch-aa,v 1.4 2006/10/10 19:48:52 rillig Exp $
  
  pkg_failed=no
  echo "$as_me:$LINENO: checking for GNOMEPRINT" >&5
-@@ -22717,7 +22718,7 @@ else
+@@ -21927,7 +21928,7 @@ else
  echo "${ECHO_T}no" >&6
  fi
  
@@ -21,7 +30,7 @@ $NetBSD: patch-aa,v 1.4 2006/10/10 19:48:52 rillig Exp $
     { { echo "$as_me:$LINENO: error: xgettext program not found: $XGETTEXT." >&5
  echo "$as_me: error: xgettext program not found: $XGETTEXT." >&2;}
     { (exit 1); exit 1; }; }
-@@ -25828,7 +25829,7 @@ echo $ECHO_N "checking for $am_display_P
+@@ -25023,7 +25024,7 @@ echo $ECHO_N "checking for $am_display_P
  if test "${am_cv_python_pythondir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -30,7 +39,7 @@ $NetBSD: patch-aa,v 1.4 2006/10/10 19:48:52 rillig Exp $
       echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
  fi
  echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-@@ -25846,7 +25847,7 @@ echo $ECHO_N "checking for $am_display_P
+@@ -25041,7 +25042,7 @@ echo $ECHO_N "checking for $am_display_P
  if test "${am_cv_python_pyexecdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
diff --git a/graphics/dia/patches/patch-ab b/graphics/dia/patches/patch-ab
new file mode 100644
index 00000000000..ae5b41d44fc
--- /dev/null
+++ b/graphics/dia/patches/patch-ab
@@ -0,0 +1,13 @@
+$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