update to 0.97.2

changes:
-bugfixes
-translation updates
-more colors for SADT

2 files changed, 32 insertions, 23 deletions

diff --git a/graphics/dia/patches/patch-aa b/graphics/dia/patches/patch-aa
index 869713a33ed..dc3a6b2ed7c 100644
--- a/graphics/dia/patches/patch-aa
+++ b/graphics/dia/patches/patch-aa
@@ -1,22 +1,44 @@
-$NetBSD: patch-aa,v 1.7 2010/01/27 19:38:51 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2012/01/18 18:36:51 drochner Exp $
 
---- configure.orig	2010-01-24 18:47:06.000000000 +0000
+--- configure.orig	2011-04-25 13:04:56.000000000 +0000
 +++ configure
-@@ -21819,7 +21819,7 @@ $as_echo_n "checking for $am_display_PYT
- if test "${am_cv_python_pythondir+set}" = set; then
+@@ -18016,7 +18016,7 @@ $as_echo_n "checking for $am_display_PYT
+ if test "${am_cv_python_pythondir+set}" = set; then :
    $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"`
+      echo "$PYTHON_PREFIX/${py_lib}/python$PYTHON_VERSION/site-packages"`
  fi
- { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-@@ -21837,7 +21837,7 @@ $as_echo_n "checking for $am_display_PYT
- if test "${am_cv_python_pyexecdir+set}" = set; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
+@@ -18034,7 +18034,7 @@ $as_echo_n "checking for $am_display_PYT
+ if test "${am_cv_python_pyexecdir+set}" = set; then :
    $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"`
+      echo "${PYTHON_EXEC_PREFIX}/${py_lib}/python${PYTHON_VERSION}/site-packages"`
  fi
- { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
+@@ -18121,18 +18121,18 @@ CPPFLAGS="$save_CPPFLAGS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpython${PYTHON_VERSION}.a" >&5
+ $as_echo_n "checking for libpython${PYTHON_VERSION}.a... " >&6; }
+ 
+-py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config"
++py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
+ 
+ py_makefile="${py_config_dir}/Makefile"
+ if test -f "$py_makefile"; then
+   py_basemodlibs=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $py_makefile`
+   py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile`
+ 
+-  if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then
++  if test -e "$PYTHON_PREFIX/lib/libpython${PYTHON_VERSION}.so"; then
+     PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+ $as_echo "found" >&6; }
+-  elif test -e "${py_prefix}/${py_lib}/libpython${PYTHON_VERSION}.a"; then
++  elif test -e "${py_prefix}/lib/libpython${PYTHON_VERSION}.a"; then
+         PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+ $as_echo "found" >&6; }
diff --git a/graphics/dia/patches/patch-ab b/graphics/dia/patches/patch-ab
deleted file mode 100644
index 9ba3884a935..00000000000
--- a/graphics/dia/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2011/01/16 17:03:06 tnn Exp $
-
---- plug-ins/libart/export_png.c.orig	2009-11-28 12:49:21.000000000 +0000
-+++ plug-ins/libart/export_png.c
-@@ -178,7 +178,7 @@ export_png_ok(GtkButton *button, gpointe
-   }
- 
-   /* set error handling ... */
--  if (setjmp(png->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png))) {
-     fclose(fp);
-     png_destroy_write_struct(&png, &info);
-     message_error(_("Error occurred while writing PNG"));