Update to 0.6.2.

PR:		65233
Submitted by:	maintainer

6 files changed, 9 insertions, 63 deletions

diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index cb147fc9aeac..3a4c2f176fb0 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mlview
-PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTVERSION=	0.6.2
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
diff --git a/editors/mlview/distinfo b/editors/mlview/distinfo
index 18c8ec6ea263..ef22282aa279 100644
--- a/editors/mlview/distinfo
+++ b/editors/mlview/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/mlview-0.6.1.tar.bz2) = a2f3b78faafc9dc8644c6c7e632de716
-SIZE (gnome2/mlview-0.6.1.tar.bz2) = 437705
+MD5 (gnome2/mlview-0.6.2.tar.bz2) = 0cbdd1b55f8ad7aa1769ddac38ffea9d
+SIZE (gnome2/mlview-0.6.2.tar.bz2) = 451900
diff --git a/editors/mlview/files/patch-src-mlview-icon-tree.c b/editors/mlview/files/patch-src-mlview-icon-tree.c
deleted file mode 100644
index 468d902bb951..000000000000
--- a/editors/mlview/files/patch-src-mlview-icon-tree.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/mlview-icon-tree.c.orig	Thu Nov 20 21:07:14 2003
-+++ src/mlview-icon-tree.c	Sat Dec  6 20:52:53 2003
-@@ -388,9 +388,11 @@
-         guchar *result = NULL,
-                 *content = NULL;
-   
-+        const gchar *colour_str;
-+
-         g_return_val_if_fail (a_node != NULL, NULL);
-   
--        const gchar *colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
-+        colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
-   
-         if (a_node->type == XML_ELEMENT_NODE) {
-                 guchar *ns_prefix = NULL,
diff --git a/editors/mlview/files/patch-src-mlview-ns-editor.c b/editors/mlview/files/patch-src-mlview-ns-editor.c
deleted file mode 100644
index 91b4c887bad4..000000000000
--- a/editors/mlview/files/patch-src-mlview-ns-editor.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/mlview-ns-editor.c.orig	Thu Nov 13 01:06:36 2003
-+++ src/mlview-ns-editor.c	Sat Dec  6 20:51:10 2003
-@@ -1063,12 +1063,6 @@
-                             xmlNode *a_node,
-                             xmlNs *a_ns)
- {
--        g_return_val_if_fail (a_this 
--                              && MLVIEW_IS_NS_EDITOR (a_this)
--                              && a_node
--                              && a_ns,
--                              MLVIEW_BAD_PARAM_ERROR) ;
--
-         GtkTreeRowReference *row_ref = NULL ;
-         GtkTreePath *tree_path = NULL ;
-         GtkTreeIter iter = {0} ;
-@@ -1076,6 +1070,12 @@
-         gboolean is_ok = FALSE ;
-         xmlNs *ns = NULL ;
-         enum MlViewStatus status = MLVIEW_OK ;
-+
-+        g_return_val_if_fail (a_this 
-+                              && MLVIEW_IS_NS_EDITOR (a_this)
-+                              && a_node
-+                              && a_ns,
-+                              MLVIEW_BAD_PARAM_ERROR) ;
- 
-         if (PRIVATE (a_this)->cur_xml_node != a_node) {
-                 return MLVIEW_OK ;                
diff --git a/editors/mlview/files/patch-src-mlview-tree-editor2.c b/editors/mlview/files/patch-src-mlview-tree-editor2.c
deleted file mode 100644
index ccc1f2a30b23..000000000000
--- a/editors/mlview/files/patch-src-mlview-tree-editor2.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/mlview-tree-editor2.c.orig	Thu Nov 20 09:11:34 2003
-+++ src/mlview-tree-editor2.c	Sat Dec  6 20:48:30 2003
-@@ -760,9 +760,11 @@
-         guchar *result = NULL,
-                 *content = NULL;
- 
-+        const gchar *colour_str;
-+	
-         g_return_val_if_fail (a_node != NULL, NULL);
- 
--        const gchar *colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
-+        colour_str = mlview_tree_editor2_get_colour_string (a_node->type);
- 
-         if (a_node->type == XML_ELEMENT_NODE) {
-                 guchar *ns_prefix = NULL,
diff --git a/editors/mlview/pkg-plist b/editors/mlview/pkg-plist
index a867f329805b..b6265f8dc816 100644
--- a/editors/mlview/pkg-plist
+++ b/editors/mlview/pkg-plist
@@ -1,10 +1,12 @@
 bin/mlv
+etc/gconf/gconf.xml.defaults/apps/mlview/colours/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/mlview/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/mlview/colours/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mlview/%gconf.xml
 etc/gconf/schemas/mlview.schemas
 lib/libmlview.a
 lib/libmlview.so
-lib/libmlview.so.3
+lib/libmlview.so.4
 share/gnome/applications/mlview.desktop
 share/gnome/mlview/mlview-dtd-choice.glade
 share/gnome/mlview/mlview-dtd-choice-dtd-not-resolved.glade
@@ -22,6 +24,7 @@ share/gnome/pixmaps/xml-text-node.png
 share/locale/az/LC_MESSAGES/mlview.mo
 share/locale/ca/LC_MESSAGES/mlview.mo
 share/locale/cs/LC_MESSAGES/mlview.mo
+share/locale/de/LC_MESSAGES/mlview.mo
 share/locale/es/LC_MESSAGES/mlview.mo
 share/locale/fr/LC_MESSAGES/mlview.mo
 share/locale/ja/LC_MESSAGES/mlview.mo
@@ -36,5 +39,7 @@ share/locale/sr/LC_MESSAGES/mlview.mo
 share/locale/sr@Latn/LC_MESSAGES/mlview.mo
 share/locale/sv/LC_MESSAGES/mlview.mo
 @dirrm share/gnome/mlview
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mlview/colours
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mlview
+@dirrm etc/gconf/gconf.xml.defaults/apps/mlview/colours
 @dirrm etc/gconf/gconf.xml.defaults/apps/mlview