update to 0.97.1

changes: misc bugfixes

5 files changed, 17 insertions, 59 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index b5091bb8880..fe4815ed2c1 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2009/12/24 11:12:08 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2010/01/27 19:38:51 drochner Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=	1
 
 .include "options.mk"
 
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index 600ba290e14..c2a426d485b 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.24 2009/12/11 05:00:11 obache Exp $
+# $NetBSD: Makefile.common,v 1.25 2010/01/27 19:38:51 drochner Exp $
 #
 # used by graphics/dia-python/Makefile
 
-DISTNAME=	dia-0.97
+DISTNAME=	dia-0.97.1
 PKGNAME=	${DISTNAME:S/dia-/dia${DIA_SUBPKG}-/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.97/}
@@ -22,6 +22,7 @@ USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
 
+CONFIGURE_ARGS+=	--disable-emf
 CONFIGURE_ARGS+=	--without-python
 
 SUBST_CLASSES+=		intl
diff --git a/graphics/dia/PLIST b/graphics/dia/PLIST
index 838be46bd8b..d0d236590fe 100644
--- a/graphics/dia/PLIST
+++ b/graphics/dia/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/12/09 10:22:04 drochner Exp $
+@comment $NetBSD: PLIST,v 1.18 2010/01/27 19:38:51 drochner Exp $
 bin/dia
 lib/dia/libaadl_objects.la
 lib/dia/libart_filter.la
@@ -1850,6 +1850,7 @@ share/locale/be/LC_MESSAGES/dia.mo
 share/locale/bg/LC_MESSAGES/dia.mo
 share/locale/bs/LC_MESSAGES/dia.mo
 share/locale/ca/LC_MESSAGES/dia.mo
+share/locale/ca@valencia/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
@@ -1884,6 +1885,7 @@ 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/or/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
@@ -1897,6 +1899,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/ta/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
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 53734a45908..c4db49a3a74 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2009/12/09 10:22:04 drochner Exp $
+$NetBSD: distinfo,v 1.24 2010/01/27 19:38:51 drochner Exp $
 
-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 (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-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 443a63eb14f..869713a33ed 100644
--- a/graphics/dia/patches/patch-aa
+++ b/graphics/dia/patches/patch-aa
@@ -1,35 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2009/12/09 10:22:04 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2010/01/27 19:38:51 drochner Exp $
 
---- configure.orig	2009-05-03 20:09:51.000000000 +0200
+--- configure.orig	2010-01-24 18:47:06.000000000 +0000
 +++ configure
-@@ -22005,7 +22005,7 @@ else
-   with_freetype=yes
- fi
- 
--if test "x$with_freetype" == "xyes"; then
-+if test "x$with_freetype" = "xyes"; then
- 
- pkg_failed=no
- { $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
- 
- 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
-    { { $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; }; }
-@@ -26631,7 +26631,7 @@ $as_echo_n "checking for $am_display_PYT
+@@ -21819,7 +21819,7 @@ $as_echo_n "checking for $am_display_PYT
  if test "${am_cv_python_pythondir+set}" = set; then
    $as_echo_n "(cached) " >&6
  else
@@ -38,7 +11,7 @@ $NetBSD: patch-aa,v 1.6 2009/12/09 10:22:04 drochner Exp $
       echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
  fi
  { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-@@ -26649,7 +26649,7 @@ $as_echo_n "checking for $am_display_PYT
+@@ -21837,7 +21837,7 @@ $as_echo_n "checking for $am_display_PYT
  if test "${am_cv_python_pyexecdir+set}" = set; then
    $as_echo_n "(cached) " >&6
  else
@@ -47,21 +20,3 @@ $NetBSD: patch-aa,v 1.6 2009/12/09 10:22:04 drochner Exp $
       echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
  fi
  { $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='#'