Update to 0.7.3. Derived from patches mailed to me privately by the

MAINTAINER based on the PR below.

PR:		ports/56303
Submitted by:	Pav Lucistnik <pav@oook.cz>

5 files changed, 18 insertions, 60 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 89e2df33ce5c..36df7e9c6797 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	conglomerate
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index e9657c9d4a35..cfa5a043f009 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1 +1 @@
-MD5 (conglomerate-0.7.0.tar.gz) = f76ac1451593f7e92f8713bfc83205de
+MD5 (conglomerate-0.7.3.tar.gz) = 4911faca4c2fd87b7f4b4f953b2fe18d
diff --git a/editors/conglomerate/files/patch-src-cong-location.c b/editors/conglomerate/files/patch-src-cong-location.c
deleted file mode 100644
index fea5ba7a5981..000000000000
--- a/editors/conglomerate/files/patch-src-cong-location.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/cong-location.c.orig	Thu Aug 14 17:24:36 2003
-+++ src/cong-location.c	Sat Aug 30 18:50:41 2003
-@@ -4,6 +4,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include "cong-document.h"
-+#include "cong-dispspec.h"
- #include "cong-error-dialog.h"
-
- gboolean
-@@ -328,7 +329,7 @@
- 			else if (cong_node_type(n) == CONG_NODE_TYPE_ELEMENT)
- 			{
- 				if (!strcmp(cong_node_name(n), "table")) break;
--				if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n)))
-+				if (cong_dispspec_element_structural(dispspec, cong_node_get_xmlns(n), xml_frag_name_nice(n)))
- 				{
- 					n = n0 = 0;
- 					break;
-@@ -352,7 +353,7 @@
-
- 		while (n)
- 		{
--			if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n))) { n = 0; break; }
-+			if (cong_dispspec_element_structural(dispspec, cong_node_get_xmlns(n), xml_frag_name_nice(n))) { n = 0; break; }
- 			if (!cong_node_prev(n)) n = n0 = cong_node_parent(n);
- 			else break;
- 		}
-@@ -417,7 +418,7 @@
- 			else if (cong_node_type(n) == CONG_NODE_TYPE_ELEMENT)
- 			{
- 				if (!strcmp(cong_node_name(n), "table")) break;
--				if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n)))
-+				if (cong_dispspec_element_structural(dispspec, cong_node_get_xmlns(n), xml_frag_name_nice(n)))
- 				{
- 					n = n0 = 0;
- 					break;
-@@ -441,7 +442,7 @@
-
- 		while (n)
- 		{
--			if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n))) { n = 0; break; }
-+			if (cong_dispspec_element_structural(dispspec, cong_node_get_xmlns(n), xml_frag_name_nice(n))) { n = 0; break; }
- 			if (!cong_node_next(n)) n = n0 = cong_node_parent(n);
- 			else break;
- 		}
diff --git a/editors/conglomerate/files/patch-src-xmlview.c b/editors/conglomerate/files/patch-src-xmlview.c
deleted file mode 100644
index f21a32b0bd6d..000000000000
--- a/editors/conglomerate/files/patch-src-xmlview.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xmlview.c.orig	Tue Jun 10 16:07:16 2003
-+++ src/xmlview.c	Sat Aug 30 18:57:56 2003
-@@ -877,7 +877,7 @@
- 		enum CongNodeType node_type = cong_node_type(x);
- 		const char *name = xml_frag_name_nice(x);
-
--		if (node_type == CONG_NODE_TYPE_ELEMENT && cong_dispspec_element_structural(ds, name))
-+		if (node_type == CONG_NODE_TYPE_ELEMENT && cong_dispspec_element_structural(ds, cong_node_get_xmlns(x), name))
- 		{
- 			return(cong_node_prev(x));
- 		}
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index 429db5b88a23..dbb4cd878b3f 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -1,16 +1,26 @@
 bin/conglomerate
 share/gnome/applications/conglomerate.desktop
 share/gnome/conglomerate/dispspecs/cnxml.xds
+share/gnome/conglomerate/dispspecs/dispspec.xds
 share/gnome/conglomerate/dispspecs/docbook.xds
 share/gnome/conglomerate/dispspecs/kernel-traffic-newsletter.xds
 share/gnome/conglomerate/dispspecs/readme.xds
+share/gnome/conglomerate/dispspecs/relax-ng.xds
 share/gnome/conglomerate/dispspecs/website-layout.xds
 share/gnome/conglomerate/dispspecs/website-webpage.xds
-share/gnome/conglomerate/dispspecs/xsl.xds
+share/gnome/conglomerate/dispspecs/xhtml1-strict.xds
+share/gnome/conglomerate/dtd/xds.dtd
 share/gnome/conglomerate/examples/cnxml.xml
+share/gnome/conglomerate/examples/error-proposal.xml
+share/gnome/conglomerate/examples/file-roller.xml
+share/gnome/conglomerate/examples/i18n.xml
 share/gnome/conglomerate/examples/readme.xml
 share/gnome/conglomerate/examples/test-docbook.xml
+share/gnome/conglomerate/examples/test-entities.xml
+share/gnome/conglomerate/examples/test-table.xml
+share/gnome/conglomerate/glade/cong-file-import.glade
 share/gnome/conglomerate/glade/docbook-common-properties.glade
+share/gnome/conglomerate/glade/docbook-orderedlist-properties.glade
 share/gnome/help/conglomerate/C/conglomerate.xml
 share/gnome/help/conglomerate/C/figures/conglomerate_logo.png
 share/gnome/help/conglomerate/C/figures/intro.png
@@ -50,9 +60,13 @@ share/gnome/pixmaps/cong-title-16.png
 share/gnome/pixmaps/cong-wrapper-16.png
 share/gnome/pixmaps/conglomerate-icon-16.png
 share/locale/da/LC_MESSAGES/conglomerate.mo
+share/locale/de/LC_MESSAGES/conglomerate.mo
 share/locale/es/LC_MESSAGES/conglomerate.mo
 share/locale/nl/LC_MESSAGES/conglomerate.mo
 share/locale/ru/LC_MESSAGES/conglomerate.mo
+share/locale/sr/LC_MESSAGES/conglomerate.mo
+share/locale/sr@Latn/LC_MESSAGES/conglomerate.mo
+share/locale/sv/LC_MESSAGES/conglomerate.mo
 @exec scrollkeeper-install -q %D/share/gnome/omf/conglomerate/conglomerate-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/conglomerate/conglomerate-C.omf 2>/dev/null || /usr/bin/true
 @dirrm share/gnome/omf/conglomerate
@@ -60,6 +74,7 @@ share/locale/ru/LC_MESSAGES/conglomerate.mo
 @dirrm share/gnome/help/conglomerate/C
 @dirrm share/gnome/help/conglomerate
 @dirrm share/gnome/conglomerate/dispspecs
+@dirrm share/gnome/conglomerate/dtd
 @dirrm share/gnome/conglomerate/examples
 @dirrm share/gnome/conglomerate/glade
 @dirrm share/gnome/conglomerate