Update to 0.7.0.

PR:		56186
Submitted by:	maintainer

7 files changed, 78 insertions, 43 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 5ec1f81653fd..89e2df33ce5c 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	conglomerate
-PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTVERSION=	0.7.0
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index 836f34ba6b3a..e9657c9d4a35 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1 +1 @@
-MD5 (conglomerate-0.5.4.tar.gz) = 43e9a1c29fc4a096a03a0496db25a0c6
+MD5 (conglomerate-0.7.0.tar.gz) = f76ac1451593f7e92f8713bfc83205de
diff --git a/editors/conglomerate/files/patch-src-cong-location.c b/editors/conglomerate/files/patch-src-cong-location.c
new file mode 100644
index 000000000000..fea5ba7a5981
--- /dev/null
+++ b/editors/conglomerate/files/patch-src-cong-location.c
@@ -0,0 +1,46 @@
+--- 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-cong-menus.c b/editors/conglomerate/files/patch-src-cong-menus.c
deleted file mode 100644
index d46e8cc7888e..000000000000
--- a/editors/conglomerate/files/patch-src-cong-menus.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/cong-menus.c.orig	Tue Jun 24 19:33:54 2003
-+++ src/cong-menus.c	Thu Jun 26 10:37:40 2003
-@@ -261,6 +261,9 @@
- 	CongDialogCategory *dtd_category;
- 	gchar *filename, *path;
- 
-+	struct _xmlDtd  *extSubset;	/* the document external subset */
-+	struct _xmlDtd  *intSubset;	/* the document internal subset */
-+
- 	g_return_val_if_fail(doc, NULL);
- 
- 	xml_doc = cong_document_get_xml(doc);
-@@ -327,9 +330,6 @@
- 	if (xml_doc->intSubset) {
- 	} else {
- 	}
--
--	struct _xmlDtd  *extSubset;	/* the document external subset */
--	struct _xmlDtd  *intSubset;	/* the document internal subset */
- 
- #if 1
- 	notebook = GTK_NOTEBOOK(gtk_notebook_new());
diff --git a/editors/conglomerate/files/patch-src-plugin-website.c b/editors/conglomerate/files/patch-src-plugin-website.c
deleted file mode 100644
index 6d207f4dfb92..000000000000
--- a/editors/conglomerate/files/patch-src-plugin-website.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/plugin-website.c.orig	Sun May 25 11:59:33 2003
-+++ src/plugin-website.c	Mon Jun 30 16:28:24 2003
-@@ -390,12 +390,12 @@
- {
- 	const CongXMLChar* dtd_public_id = cong_document_get_dtd_public_identifier(doc);
- 	
--	g_message(dtd_public_id);
--
- 	if (NULL==dtd_public_id) {
- 		return FALSE;
- 	}
- 	
-+	g_message(dtd_public_id);
-+
- 	/* Only relevant for Doctype with public ID = "" */
- 	if (0==strcmp(dtd_public_id,"-//Norman Walsh//DTD Website Layout V2.4.0//EN")) {
- 		return TRUE;
diff --git a/editors/conglomerate/files/patch-src-xmlview.c b/editors/conglomerate/files/patch-src-xmlview.c
new file mode 100644
index 000000000000..f21a32b0bd6d
--- /dev/null
+++ b/editors/conglomerate/files/patch-src-xmlview.c
@@ -0,0 +1,11 @@
+--- 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 8fac78571f0b..429db5b88a23 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -2,6 +2,7 @@ bin/conglomerate
 share/gnome/applications/conglomerate.desktop
 share/gnome/conglomerate/dispspecs/cnxml.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/website-layout.xds
 share/gnome/conglomerate/dispspecs/website-webpage.xds
@@ -10,7 +11,15 @@ share/gnome/conglomerate/examples/cnxml.xml
 share/gnome/conglomerate/examples/readme.xml
 share/gnome/conglomerate/examples/test-docbook.xml
 share/gnome/conglomerate/glade/docbook-common-properties.glade
-share/gnome/pixmaps/ChangeLog
+share/gnome/help/conglomerate/C/conglomerate.xml
+share/gnome/help/conglomerate/C/figures/conglomerate_logo.png
+share/gnome/help/conglomerate/C/figures/intro.png
+share/gnome/help/conglomerate/C/figures/menu-properties.png
+share/gnome/help/conglomerate/C/figures/new-doc-wizard.png
+share/gnome/help/conglomerate/C/figures/new.png
+share/gnome/help/conglomerate/C/figures/properties-dialog.png
+share/gnome/help/conglomerate/C/figures/quote.png
+share/gnome/omf/conglomerate/conglomerate-C.omf
 share/gnome/pixmaps/cong-address-16.png
 share/gnome/pixmaps/cong-answer-16.png
 share/gnome/pixmaps/cong-author-16.png
@@ -39,8 +48,17 @@ share/gnome/pixmaps/cong-subsection-16.png
 share/gnome/pixmaps/cong-summary-16.png
 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/es/LC_MESSAGES/conglomerate.mo
+share/locale/nl/LC_MESSAGES/conglomerate.mo
 share/locale/ru/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
+@dirrm share/gnome/help/conglomerate/C/figures
+@dirrm share/gnome/help/conglomerate/C
+@dirrm share/gnome/help/conglomerate
 @dirrm share/gnome/conglomerate/dispspecs
 @dirrm share/gnome/conglomerate/examples
 @dirrm share/gnome/conglomerate/glade