update to 0.97.2

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

6 files changed, 47 insertions, 35 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index daa1c82a677..cbd9191831c 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2012/01/13 10:55:10 obache Exp $
+# $NetBSD: Makefile,v 1.67 2012/01/18 18:36:51 drochner Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=		8
 
 .include "options.mk"
 
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index c2a426d485b..f32ff8f5e5a 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile.common,v 1.25 2010/01/27 19:38:51 drochner Exp $
+# $NetBSD: Makefile.common,v 1.26 2012/01/18 18:36:51 drochner Exp $
 #
 # used by graphics/dia-python/Makefile
 
-DISTNAME=	dia-0.97.1
+DISTNAME=	dia-0.97.2
 PKGNAME=	${DISTNAME:S/dia-/dia${DIA_SUBPKG}-/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.97/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/dia/
@@ -22,6 +23,8 @@ USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
 
+CHECK_PORTABILITY_SKIP+= installer/macosx/dia
+
 CONFIGURE_ARGS+=	--disable-emf
 CONFIGURE_ARGS+=	--without-python
 
diff --git a/graphics/dia/PLIST b/graphics/dia/PLIST
index 687600ea687..54fa1ecfb0f 100644
--- a/graphics/dia/PLIST
+++ b/graphics/dia/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2010/08/31 18:25:29 drochner Exp $
+@comment $NetBSD: PLIST,v 1.20 2012/01/18 18:36:51 drochner Exp $
 bin/dia
 lib/dia/libaadl_objects.la
 lib/dia/libart_filter.la
@@ -1717,7 +1717,6 @@ ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/connect-middle.png
 ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/default-colors.png
 ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/defaults-box.png
 ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/defaults-text.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/delete-text.png
 ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/dia-startup.png
 ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/diagram-properties-grid.png
 ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/diagram-properties.png
@@ -1765,6 +1764,7 @@ ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-magnify.png
 ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-modify.png
 ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-scroll.png
 ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-special.png
+${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-textedit.png
 ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox.png
 ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/uml-shapes.png
 ${PLIST.gnome}${DIA_HELPDIR}/en/graphics/view-menu.png
@@ -1845,6 +1845,7 @@ 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/ast/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
@@ -1858,6 +1859,7 @@ 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
+share/locale/eo/LC_MESSAGES/dia.mo
 share/locale/es/LC_MESSAGES/dia.mo
 share/locale/eu/LC_MESSAGES/dia.mo
 share/locale/fi/LC_MESSAGES/dia.mo
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 4628ae9cbd5..132c2af2ef8 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.25 2011/01/16 17:03:06 tnn Exp $
+$NetBSD: distinfo,v 1.26 2012/01/18 18:36:51 drochner Exp $
 
-SHA1 (dia-0.97.1.tar.gz) = eefeb10634a6a478ed5aa01297f3011eb183b9ca
-RMD160 (dia-0.97.1.tar.gz) = b191c91b7fa56802d5f5501818d5e24bde1539f7
-Size (dia-0.97.1.tar.gz) = 9136499 bytes
-SHA1 (patch-aa) = 110f2d4c12df73a0dbae31d5c82ecf8937ba11fa
-SHA1 (patch-ab) = 0843d7337627d2c30e5e78ccf79524de8fd283b9
+SHA1 (dia-0.97.2.tar.xz) = dc7ed6f8cd83acc8f421d28f30e4042fe370e9ba
+RMD160 (dia-0.97.2.tar.xz) = f9270f1f2cb6ad505219463827d02e3759693796
+Size (dia-0.97.2.tar.xz) = 5507004 bytes
+SHA1 (patch-aa) = ab5acd47ba4557aa8cc4a5abb3ce1f41ea5e2574
 SHA1 (patch-be) = dab7626daefcd702b31f54d198311d9be921e1ff
 SHA1 (patch-ca) = 8737f3ff19244e2f87ffb571da21159bc2248648
 SHA1 (patch-cb) = 02210139cbf38e91a61ad1e090f63f5635bb26ef
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"));