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")

7 files changed, 90 insertions, 75 deletions

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: