Update to version 0.90;

--
Proeminent changes:
- Full UTF-8 support internally;
- Diagram tree dialog;
- Sheets Editor;
- New shapes and export filters.

I'm taking over this port as agreed by
the previous MAINTAINER.

brad@ ok

graphics/dia/Makefile

@@ -1,19 +1,15 @@
-# $OpenBSD: Makefile,v 1.18 2002/12/09 15:37:23 brad Exp $
+# $OpenBSD: Makefile,v 1.19 2002/12/19 01:30:37 margarida Exp $
 
 COMMENT=	visio-like technical drawing
 
-DISTNAME=	dia-0.88.1
+DISTNAME=	dia-0.90
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.88/}
 
 HOMEPAGE=	http://www.lysator.liu.se/~alla/dia/
 
-LIB_DEPENDS=	gdk_pixbuf.2::graphics/gdk-pixbuf \
-		art_lgpl_2.5::graphics/libart \
-		popt::devel/popt \
-		xml2.6::textproc/libxml
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.90/}
 
-MAINTAINER=	Mark Grimes <mark@stateful.net>
+MAINTAINER=	Margarida Sequeira <margarida@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM=   Yes
@@ -21,11 +17,20 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
+LIB_DEPENDS=	gdk_pixbuf.2::graphics/gdk-pixbuf \
+		art_lgpl_2.5::graphics/libart \
+		popt::devel/popt \
+		xml2.6::textproc/libxml \
+		unicode.0::devel/libunicode
+
 USE_GMAKE=		Yes
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=	autoconf
+AUTOCONF_NEW=		Yes
+
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+=	--enable-static --disable-gnome
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/libpng \
+			-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ENV+=		XML_CONFIG=xml2-config
 

graphics/dia/distinfo

@@ -1,3 +1,3 @@
-MD5 (dia-0.88.1.tar.gz) = 66a8017a9a93efe08c658f0a29838724
-RMD160 (dia-0.88.1.tar.gz) = e4b9e472fe0f8e93e96551ee757249bd7e113cf9
-SHA1 (dia-0.88.1.tar.gz) = 0c53f006bd73e166cdedfe3ca0c77b241786ed17
+MD5 (dia-0.90.tar.gz) = 62c80b2492e2b7d92bfbe360f46c157a
+RMD160 (dia-0.90.tar.gz) = 7036ce699bf66e03dca5687b095cb55937cb7b84
+SHA1 (dia-0.90.tar.gz) = 7e9705dbf3f3ce62a58169f531dbc635140a88d8

graphics/dia/patches/patch-aclocal_m4

@@ -0,0 +1,21 @@
+$OpenBSD: patch-aclocal_m4,v 1.1 2002/12/19 01:30:37 margarida Exp $
+--- aclocal.m4.orig	Wed Dec 18 03:41:42 2002
++++ aclocal.m4	Wed Dec 18 03:51:05 2002
+@@ -2155,7 +2155,7 @@ else
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
+     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
++      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+       export_dynamic_flag_spec='${wl}-E'
+     else
+@@ -2165,7 +2165,7 @@ else
+ 	hardcode_libdir_flag_spec='-R$libdir'
+         ;;
+       *)
+-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
++        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+         ;;
+       esac

graphics/dia/patches/patch-lib_charconv_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-lib_charconv_c,v 1.1 2002/12/19 01:30:37 margarida Exp $
+--- lib/charconv.c.orig	Mon Dec 16 23:03:37 2002
++++ lib/charconv.c	Mon Dec 16 23:05:55 2002
+@@ -98,7 +98,8 @@ int get_local_charset(char **charset) 
+ 
+       if ((*charset == NULL) ||
+           (0==strcmp(*charset,"US-ASCII")) ||
+-          (0==strcmp(*charset,"ANSI_X3.4-1968"))) {
++          (0==strcmp(*charset,"ANSI_X3.4-1968")) ||
++	  (**charset == '\0')) {
+               /* we got basic stupid ASCII here. We use its sane
+                  superset instead. Especially since libxml2 doesn't like
+                  the pedantic name of ASCII. */

graphics/dia/patches/patch-lib_font_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-lib_font_c,v 1.1 2002/12/19 01:30:37 margarida Exp $
+--- lib/font.c.orig	Mon Dec 16 23:07:09 2002
++++ lib/font.c	Mon Dec 16 23:10:58 2002
+@@ -467,7 +467,8 @@ GHashTable *fonts_hash = NULL;
+ 
+ char *last_resort_fonts[] = {
+   "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+-#ifndef G_OS_WIN32
++  "-*-courier-medium-r-normal-*-&d-*-*-*-*-*-*-*",
++#ifdef G_OS_WIN32
+   "system" /* Must be last. This is guaranteed to exist on a MS-Windows 
+               system. */
+ #else

graphics/dia/patches/patch-lib_plug_ins_c

@@ -1,29 +0,0 @@
---- lib/plug-ins.c.orig	Fri Jun  1 02:01:37 2001
-+++ lib/plug-ins.c	Fri Jun  1 02:01:50 2001
-@@ -435,7 +435,7 @@ plugin_load_inhibited(const gchar *filen
- 
-   ensure_pluginrc();
-   for (node = pluginrc->root->childs; node != NULL; node = node->next) {
--    CHAR *node_filename;
-+    xmlChar *node_filename;
- 
-     if (node->type != XML_ELEMENT_NODE || strcmp(node->name, "plugin") != 0)
-       continue;
-@@ -472,7 +472,7 @@ info_fill_from_pluginrc(PluginInfo *info
- 
-   ensure_pluginrc();
-   for (node = pluginrc->root->childs; node != NULL; node = node->next) {
--    CHAR *node_filename;
-+    xmlChar *node_filename;
- 
-     if (node->type != XML_ELEMENT_NODE || strcmp(node->name, "plugin") != 0)
-       continue;
-@@ -524,7 +524,7 @@ dia_pluginrc_write(void)
-       datanode = xmlNewChild(pluginnode, NULL, "inhibit-load", NULL);
- 
-     for (node = pluginrc->root->childs; node != NULL; node = node->next) {
--      CHAR *node_filename;
-+      xmlChar *node_filename;
- 
-       if (node->type != XML_ELEMENT_NODE || strcmp(node->name, "plugin") != 0)
- 	continue;

graphics/dia/patches/patch-ltmain.sh

@@ -1,47 +1,6 @@
---- ltmain.sh.orig	Fri Jun  1 00:07:10 2001
-+++ ltmain.sh	Fri Jun  1 00:20:32 2001
-@@ -1027,15 +1027,30 @@ compiler."
- 	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
-+
- 	  *-*-mingw* | *-*-os2*)
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-+	  *-*-openbsd*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    continue
-+	    ;;
-+	  esac
-+	elif test "$arg" = "-lc_r"; then
-+	  case "$host" in
-+	  *-*-openbsd*)
-+      # Do not include libc_r directly, use -pthread flag.
-+	    continue
-+	    ;;
- 	  esac
- 	fi
- 	deplibs="$deplibs $arg"
- 	continue
- 	;;
-+	-?thread)
-+	  deplibs="$deplibs $arg"
-+	  ;;
- 
-       -module)
- 	module=yes
-@@ -2408,6 +2423,9 @@ compiler."
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-openbsd*)
-+	    # Do not include libc due to us having libc/libc_r
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4412,40 +4430,6 @@ relink_command=\"$relink_command\""
+--- ltmain.sh.orig	Mon Dec 16 00:18:19 2002
++++ ltmain.sh	Mon Dec 16 00:25:16 2002
+@@ -4491,40 +4491,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
      test "$show" = ":" && exit 0
  

graphics/dia/patches/patch-objects_custom_shape_info_c

@@ -1,29 +0,0 @@
---- objects/custom/shape_info.c.orig	Fri Jun  1 02:15:40 2001
-+++ objects/custom/shape_info.c	Fri Jun  1 02:16:13 2001
-@@ -501,7 +501,7 @@ static void
- parse_svg_node(ShapeInfo *info, xmlNodePtr node, xmlNsPtr svg_ns,
- 	       GraphicStyle *style)
- {
--  CHAR *str;
-+  char *str;
-   char *old_locale;
- 
-   /* walk SVG node ... */
-@@ -868,7 +868,7 @@ load_shape_info(const gchar *filename)
-       for (pt_node = node->childs; pt_node != NULL; pt_node = pt_node->next) {
- 	if (pt_node->ns == shape_ns && !strcmp(pt_node->name, "point")) {
- 	  Point pt = { 0.0, 0.0 };
--	  CHAR *str;
-+	  char *str;
- 
- 	  str = xmlGetProp(pt_node, "x");
- 	  if (str) {
-@@ -891,7 +891,7 @@ load_shape_info(const gchar *filename)
-       info->connections = (Point *)arr->data;
-       g_array_free(arr, FALSE);
-     } else if (node->ns == shape_ns && !strcmp(node->name, "textbox")) {
--      CHAR *str;
-+      char *str;
-       
-       str = xmlGetProp(node, "x1");
-       if (str) {

graphics/dia/patches/patch-plug_ins_shape_shape_export_c

@@ -1,11 +0,0 @@
---- plug-ins/shape/shape-export.c.orig	Fri Jun  1 13:38:55 2001
-+++ plug-ins/shape/shape-export.c	Fri Jun  1 13:39:17 2001
-@@ -836,7 +836,7 @@ draw_string(RendererShape *renderer,
- 	    Point *pos, Alignment alignment,
- 	    Color *colour)
- {
--  CHAR *enc;
-+  xmlChar *enc;
-   xmlNodePtr node;
-   char buf[512], *style, *tmp;
-   real saved_width;

graphics/dia/patches/patch-plug_ins_svg_render_svg_c

@@ -1,11 +0,0 @@
---- plug-ins/svg/render_svg.c.orig	Fri Jun  1 13:24:34 2001
-+++ plug-ins/svg/render_svg.c	Fri Jun  1 13:24:48 2001
-@@ -743,7 +743,7 @@ draw_string(RendererSVG *renderer,
- 	    Point *pos, Alignment alignment,
- 	    Color *colour)
- {
--  CHAR *enc;
-+  xmlChar *enc;
-   xmlNodePtr node;
-   char buf[512], *style, *tmp;
-   real saved_width;

graphics/dia/pkg/PFRAG.shared

@@ -1,22 +1,20 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2001/06/02 10:55:47 obecian Exp $
-lib/dia/libcgm_filter.so.0.0
-lib/dia/libchronogram_objects.so.0.0
-lib/dia/libcustom_objects.so.0.0
-lib/dia/libdxf_filter.so.0.0
-lib/dia/libeml_objects.so.0.0
-lib/dia/liber_objects.so.0.0
-lib/dia/libflowchart_objects.so.0.0
-lib/dia/libfs_objects.so.0.0
-lib/dia/libgrafcet_objects.so.0.0
-lib/dia/libhpgl_filter.so.0.0
-lib/dia/libnetwork_objects.so.0.0
-lib/dia/libpstricks_filter.so.0.0
-lib/dia/libsadt_objects.so.0.0
-lib/dia/libshape_filter.so.0.0
-lib/dia/libstandard_objects.so.0.0
-lib/dia/libsvg_filter.so.0.0
-lib/dia/libsybase_objects.so.0.0
-lib/dia/libuml_objects.so.0.0
-lib/dia/libwpg_filter.so.0.0
-lib/dia/libxfig_filter.so.0.0
-NEWDYNLIBDIR(%B)
+@comment $OpenBSD: PFRAG.shared,v 1.3 2002/12/19 01:30:37 margarida Exp $
+lib/dia/libcgm_filter.so
+lib/dia/libchronogram_objects.so
+lib/dia/libcustom_objects.so
+lib/dia/libdxf_filter.so
+lib/dia/liber_objects.so
+lib/dia/libflowchart_objects.so
+lib/dia/libfs_objects.so
+lib/dia/libgrafcet_objects.so
+lib/dia/libhpgl_filter.so
+lib/dia/libmetapost_filter.so
+lib/dia/libnetwork_objects.so
+lib/dia/libpstricks_filter.so
+lib/dia/libsadt_objects.so
+lib/dia/libshape_filter.so
+lib/dia/libstandard_objects.so
+lib/dia/libsvg_filter.so
+lib/dia/libuml_objects.so
+lib/dia/libwpg_filter.so
+lib/dia/libxfig_filter.so

graphics/dia/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/02/24 01:00:23 mark Exp $
+@comment $OpenBSD: PLIST,v 1.4 2002/12/19 01:30:37 margarida Exp $
 bin/dia
 lib/dia/libcgm_filter.a
 lib/dia/libcgm_filter.la
@@ -8,8 +8,6 @@ lib/dia/libcustom_objects.a
 lib/dia/libcustom_objects.la
 lib/dia/libdxf_filter.a
 lib/dia/libdxf_filter.la
-lib/dia/libeml_objects.a
-lib/dia/libeml_objects.la
 lib/dia/liber_objects.a
 lib/dia/liber_objects.la
 lib/dia/libflowchart_objects.a
@@ -20,6 +18,8 @@ lib/dia/libgrafcet_objects.a
 lib/dia/libgrafcet_objects.la
 lib/dia/libhpgl_filter.a
 lib/dia/libhpgl_filter.la
+lib/dia/libmetapost_filter.a
+lib/dia/libmetapost_filter.la
 lib/dia/libnetwork_objects.a
 lib/dia/libnetwork_objects.la
 lib/dia/libpstricks_filter.a
@@ -32,8 +32,6 @@ lib/dia/libstandard_objects.a
 lib/dia/libstandard_objects.la
 lib/dia/libsvg_filter.a
 lib/dia/libsvg_filter.la
-lib/dia/libsybase_objects.a
-lib/dia/libsybase_objects.la
 lib/dia/libuml_objects.a
 lib/dia/libuml_objects.la
 lib/dia/libwpg_filter.a
@@ -43,41 +41,8 @@ lib/dia/libxfig_filter.la
 man/man1/dia.1
 share/dia/dia_logo.png
 share/dia/help/C
-share/dia/help/en/background-color.html
-share/dia/help/en/canvas-chapter.html
-share/dia/help/en/colors.html
-share/dia/help/en/creating-canvas.html
-share/dia/help/en/docbook.css
-share/dia/help/en/graphics/greendots.png
-share/dia/help/en/graphics/home_network.png
-share/dia/help/en/graphics/line_props.png
-share/dia/help/en/gridlines.html
-share/dia/help/en/index.html
-share/dia/help/en/ln9.html
-share/dia/help/en/making-diagram.html
-share/dia/help/en/object-properties.html
-share/dia/help/en/objects-chapter.html
-share/dia/help/en/quickstart-chapter.html
-share/dia/help/en/quickstart-intro.html
-share/dia/help/en/rulers.html
-share/dia/help/en/save-print-diagram.html
-share/dia/help/en/starting-dia.html
-share/dia/help/en/stylesheet-images/caution.gif
-share/dia/help/en/stylesheet-images/home.gif
-share/dia/help/en/stylesheet-images/important.gif
-share/dia/help/en/stylesheet-images/next.gif
-share/dia/help/en/stylesheet-images/note.gif
-share/dia/help/en/stylesheet-images/prev.gif
-share/dia/help/en/stylesheet-images/tip.gif
-share/dia/help/en/stylesheet-images/toc-blank.gif
-share/dia/help/en/stylesheet-images/toc-minus.gif
-share/dia/help/en/stylesheet-images/toc-plus.gif
-share/dia/help/en/stylesheet-images/up.gif
-share/dia/help/en/stylesheet-images/warning.gif
 share/dia/help/en/topic.dat
-share/dia/help/en/using-objects.html
-share/dia/help/en/who-appeal-too.html
-share/dia/help/en/zooming.html
+share/dia/help/pl/topic.dat
 share/dia/shapes/Circuit/ground.shape
 share/dia/shapes/Circuit/ground.xpm
 share/dia/shapes/Circuit/hcapacitor.shape
@@ -103,6 +68,8 @@ share/dia/shapes/Circuit/hzener.shape
 share/dia/shapes/Circuit/hzener.xpm
 share/dia/shapes/Circuit/lamp_de.shape
 share/dia/shapes/Circuit/lamp_de.xpm
+share/dia/shapes/Circuit/microphone_de.shape
+share/dia/shapes/Circuit/microphone_de.xpm
 share/dia/shapes/Circuit/nmos_de.shape
 share/dia/shapes/Circuit/nmos_de.xpm
 share/dia/shapes/Circuit/npn.shape
@@ -313,12 +280,34 @@ share/dia/shapes/MSE/small_extension_node.shape
 share/dia/shapes/MSE/small_extension_node.xpm
 share/dia/shapes/MSE/tacsat.shape
 share/dia/shapes/MSE/tacsat.xpm
+share/dia/shapes/Misc/file.png
+share/dia/shapes/Misc/file.shape
+share/dia/shapes/Misc/folder.png
+share/dia/shapes/Misc/folder.shape
+share/dia/shapes/Network/antenna.shape
+share/dia/shapes/Network/antenna.xpm
+share/dia/shapes/Network/computer.shape
+share/dia/shapes/Network/computer.xpm
 share/dia/shapes/Network/dat_external.shape
 share/dia/shapes/Network/dat_external.xpm
+share/dia/shapes/Network/disc.shape
+share/dia/shapes/Network/disc.xpm
 share/dia/shapes/Network/diskette.shape
 share/dia/shapes/Network/diskette.xpm
+share/dia/shapes/Network/firewall.shape
+share/dia/shapes/Network/firewall.xpm
+share/dia/shapes/Network/flash.shape
+share/dia/shapes/Network/flash.xpm
+share/dia/shapes/Network/genmonitor.shape
+share/dia/shapes/Network/genmonitor.xpm
+share/dia/shapes/Network/hub.shape
+share/dia/shapes/Network/hub.xpm
 share/dia/shapes/Network/mobile_phone.shape
 share/dia/shapes/Network/mobile_phone.xpm
+share/dia/shapes/Network/modem.shape
+share/dia/shapes/Network/modem.xpm
+share/dia/shapes/Network/modularswitch.shape
+share/dia/shapes/Network/modularswitch.xpm
 share/dia/shapes/Network/monitor.shape
 share/dia/shapes/Network/monitor.xpm
 share/dia/shapes/Network/nwcloud.shape
@@ -331,8 +320,14 @@ share/dia/shapes/Network/pc_miditower.shape
 share/dia/shapes/Network/pc_miditower.xpm
 share/dia/shapes/Network/pc_minitower.shape
 share/dia/shapes/Network/pc_minitower.xpm
+share/dia/shapes/Network/printer.shape
+share/dia/shapes/Network/printer.xpm
+share/dia/shapes/Network/rj45plug.shape
+share/dia/shapes/Network/rj45plug.xpm
 share/dia/shapes/Network/router-symbol.shape
 share/dia/shapes/Network/router-symbol.xpm
+share/dia/shapes/Network/sceadplug.shape
+share/dia/shapes/Network/sceadplug.xpm
 share/dia/shapes/Network/speaker.shape
 share/dia/shapes/Network/speaker.xpm
 share/dia/shapes/Network/speaker_amp.shape
@@ -341,6 +336,8 @@ share/dia/shapes/Network/switch-atm-symbol.shape
 share/dia/shapes/Network/switch-atm-symbol.xpm
 share/dia/shapes/Network/switch-symbol.shape
 share/dia/shapes/Network/switch-symbol.xpm
+share/dia/shapes/Network/telephone.png
+share/dia/shapes/Network/telephone.shape
 share/dia/shapes/Network/workstation.shape
 share/dia/shapes/Network/workstation.xpm
 share/dia/shapes/Network/zip-disk.shape
@@ -359,6 +356,8 @@ share/dia/shapes/Pneumatic/compilh.shape
 share/dia/shapes/Pneumatic/compilh.xpm
 share/dia/shapes/Pneumatic/compilp.shape
 share/dia/shapes/Pneumatic/compilp.xpm
+share/dia/shapes/Pneumatic/compush.shape
+share/dia/shapes/Pneumatic/compush.xpm
 share/dia/shapes/Pneumatic/comspr.shape
 share/dia/shapes/Pneumatic/comspr.xpm
 share/dia/shapes/Pneumatic/dejack.shape
@@ -449,6 +448,18 @@ share/dia/shapes/jigsaw/part_oooi.shape
 share/dia/shapes/jigsaw/part_oooi.xpm
 share/dia/shapes/jigsaw/part_oooo.shape
 share/dia/shapes/jigsaw/part_oooo.xpm
+share/dia/shapes/sybase/client.shape
+share/dia/shapes/sybase/client.xpm
+share/dia/shapes/sybase/dataserver.shape
+share/dia/shapes/sybase/dataserver.xpm
+share/dia/shapes/sybase/ltm.shape
+share/dia/shapes/sybase/ltm.xpm
+share/dia/shapes/sybase/repserver.shape
+share/dia/shapes/sybase/repserver.xpm
+share/dia/shapes/sybase/rsm.shape
+share/dia/shapes/sybase/rsm.xpm
+share/dia/shapes/sybase/stableq.shape
+share/dia/shapes/sybase/stableq.xpm
 share/dia/sheets/Circuit.sheet
 share/dia/sheets/Contact.sheet
 share/dia/sheets/EML.sheet
@@ -466,6 +477,7 @@ share/dia/sheets/GRAFCET/etapesp.xpm
 share/dia/sheets/GRAFCET/vergent_and.xpm
 share/dia/sheets/Logic.sheet
 share/dia/sheets/MSE.sheet
+share/dia/sheets/Misc.sheet
 share/dia/sheets/Pneumatic.sheet
 share/dia/sheets/SADT.sheet
 share/dia/sheets/SDL.sheet
@@ -493,17 +505,20 @@ share/locale/it/LC_MESSAGES/dia.mo
 share/locale/ja/LC_MESSAGES/dia.mo
 share/locale/ko/LC_MESSAGES/dia.mo
 share/locale/nl/LC_MESSAGES/dia.mo
+share/locale/nn/LC_MESSAGES/dia.mo
 share/locale/no/LC_MESSAGES/dia.mo
 share/locale/pl/LC_MESSAGES/dia.mo
 share/locale/pt/LC_MESSAGES/dia.mo
 share/locale/pt_BR/LC_MESSAGES/dia.mo
 share/locale/ru/LC_MESSAGES/dia.mo
+share/locale/sk/LC_MESSAGES/dia.mo
 share/locale/sl/LC_MESSAGES/dia.mo
 share/locale/sv/LC_MESSAGES/dia.mo
 share/locale/tr/LC_MESSAGES/dia.mo
 share/locale/uk/LC_MESSAGES/dia.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/dia.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/dia.mo
+share/locale/vi/LC_MESSAGES/dia.mo
+share/locale/zh_CN/LC_MESSAGES/dia.mo
+share/locale/zh_TW/LC_MESSAGES/dia.mo
 share/mime-info/dia.keys
 share/mime-info/dia.mime
 share/pixmaps/dia-diagram.png
@@ -513,10 +528,12 @@ share/pixmaps/dia_gnome_icon.png
 @dirrm share/dia/sheets/GRAFCET
 @dirrm share/dia/sheets/ER
 @dirrm share/dia/sheets
+@dirrm share/dia/shapes/sybase
 @dirrm share/dia/shapes/jigsaw
 @dirrm share/dia/shapes/SDL
 @dirrm share/dia/shapes/Pneumatic
 @dirrm share/dia/shapes/Network
+@dirrm share/dia/shapes/Misc
 @dirrm share/dia/shapes/MSE
 @dirrm share/dia/shapes/Logic
 @dirrm share/dia/shapes/Flowchart
@@ -525,8 +542,7 @@ share/pixmaps/dia_gnome_icon.png
 @dirrm share/dia/shapes/Civil
 @dirrm share/dia/shapes/Circuit
 @dirrm share/dia/shapes
-@dirrm share/dia/help/en/stylesheet-images
-@dirrm share/dia/help/en/graphics
+@dirrm share/dia/help/pl
 @dirrm share/dia/help/en
 @dirrm share/dia/help
 @dirrm share/dia