Update to 0.7.6.

4 files changed, 61 insertions, 136 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index d6d27fd0382d..81cbfff5761d 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	conglomerate
-PORTVERSION=	0.7.5
+PORTVERSION=	0.7.6
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index 44e05fb0a4e3..d945edb62eda 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1 +1 @@
-MD5 (conglomerate-0.7.5.tar.gz) = 7b2bb48fc04f978bfb44b97a39eb0687
+MD5 (conglomerate-0.7.6.tar.gz) = 6333b54dbe3222fd71ff8917355adc94
diff --git a/editors/conglomerate/files/patch-src-plugin-templates.c b/editors/conglomerate/files/patch-src-plugin-templates.c
new file mode 100644
index 000000000000..c0f6816f9bda
--- /dev/null
+++ b/editors/conglomerate/files/patch-src-plugin-templates.c
@@ -0,0 +1,16 @@
+--- src/plugin-templates.c.orig	Mon Oct 27 23:37:32 2003
++++ src/plugin-templates.c	Thu Oct 30 18:50:50 2003
+@@ -169,12 +169,12 @@
+ {
+ 	int i;
+ 	GSList* template_paths;
++	CongTemplate* template;
+ 
+ 	g_return_val_if_fail(plugin, FALSE);
+ 
+ 	template_paths = get_template_paths(plugin);
+ 
+-	CongTemplate* template;
+ 	template = g_new0(CongTemplate, sizeof(template));
+ 	template->plugin = plugin;
+ 
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index 513be2f6650c..491ed00ca602 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -1,113 +1,9 @@
 bin/conglomerate
-share/doc/conglomerate/conglomerate-cong-app.html
-share/doc/conglomerate/conglomerate-cong-attribute-editor.html
-share/doc/conglomerate/conglomerate-cong-attribute-editor-cdata.html
-share/doc/conglomerate/conglomerate-cong-attribute-editor-enumeration.html
-share/doc/conglomerate/conglomerate-cong-attribute-wrapper.html
-share/doc/conglomerate/conglomerate-cong-attribute-wrapper-check-button.html
-share/doc/conglomerate/conglomerate-cong-attribute-wrapper-radio-button.html
-share/doc/conglomerate/conglomerate-cong-command.html
-share/doc/conglomerate/conglomerate-cong-command-history.html
-share/doc/conglomerate/conglomerate-cong-dialog.html
-share/doc/conglomerate/conglomerate-cong-dispspec.html
-share/doc/conglomerate/conglomerate-cong-dispspec-registry.html
-share/doc/conglomerate/conglomerate-cong-document.html
-share/doc/conglomerate/conglomerate-cong-dtd.html
-share/doc/conglomerate/conglomerate-cong-editor-area.html
-share/doc/conglomerate/conglomerate-cong-editor-area-bin.html
-share/doc/conglomerate/conglomerate-cong-editor-area-border.html
-share/doc/conglomerate/conglomerate-cong-editor-area-composer.html
-share/doc/conglomerate/conglomerate-cong-editor-area-container.html
-share/doc/conglomerate/conglomerate-cong-editor-area-entity-decl.html
-share/doc/conglomerate/conglomerate-cong-editor-area-entity-ref.html
-share/doc/conglomerate/conglomerate-cong-editor-area-flow-holder.html
-share/doc/conglomerate/conglomerate-cong-editor-area-flow-holder-blocks.html
-share/doc/conglomerate/conglomerate-cong-editor-area-flow-holder-inlines.html
-share/doc/conglomerate/conglomerate-cong-editor-area-flow-holder-single.html
-share/doc/conglomerate/conglomerate-cong-editor-area-line.html
-share/doc/conglomerate/conglomerate-cong-editor-area-pixbuf.html
-share/doc/conglomerate/conglomerate-cong-editor-area-spacer.html
-share/doc/conglomerate/conglomerate-cong-editor-area-span-tag.html
-share/doc/conglomerate/conglomerate-cong-editor-area-structural.html
-share/doc/conglomerate/conglomerate-cong-editor-area-structural-tag.html
-share/doc/conglomerate/conglomerate-cong-editor-area-text.html
-share/doc/conglomerate/conglomerate-cong-editor-area-text-comment.html
-share/doc/conglomerate/conglomerate-cong-editor-area-text-fragment.html
-share/doc/conglomerate/conglomerate-cong-editor-area-underline.html
-share/doc/conglomerate/conglomerate-cong-editor-area-unknown-tag.html
-share/doc/conglomerate/conglomerate-cong-editor-child-policy.html
-share/doc/conglomerate/conglomerate-cong-editor-child-policy-flow-holder.html
-share/doc/conglomerate/conglomerate-cong-editor-child-policy-inline.html
-share/doc/conglomerate/conglomerate-cong-editor-line-fragments.html
-share/doc/conglomerate/conglomerate-cong-editor-node.html
-share/doc/conglomerate/conglomerate-cong-editor-node-comment.html
-share/doc/conglomerate/conglomerate-cong-editor-node-document.html
-share/doc/conglomerate/conglomerate-cong-editor-node-dtd.html
-share/doc/conglomerate/conglomerate-cong-editor-node-element.html
-share/doc/conglomerate/conglomerate-cong-editor-node-element-span.html
-share/doc/conglomerate/conglomerate-cong-editor-node-element-structural.html
-share/doc/conglomerate/conglomerate-cong-editor-node-element-unknown.html
-share/doc/conglomerate/conglomerate-cong-editor-node-entity-decl.html
-share/doc/conglomerate/conglomerate-cong-editor-node-entity-ref.html
-share/doc/conglomerate/conglomerate-cong-editor-node-text.html
-share/doc/conglomerate/conglomerate-cong-editor-node-unimplemented.html
-share/doc/conglomerate/conglomerate-cong-editor-widget3-impl.html
-share/doc/conglomerate/conglomerate-cong-editor-widget.html
-share/doc/conglomerate/conglomerate-cong-eel.html
-share/doc/conglomerate/conglomerate-cong-enum-mapping.html
-share/doc/conglomerate/conglomerate-cong-error-dialog.html
-share/doc/conglomerate/conglomerate-cong-fake-plugin-hooks.html
-share/doc/conglomerate/conglomerate-cong-font.html
-share/doc/conglomerate/conglomerate-cong-graph.html
-share/doc/conglomerate/conglomerate-cong-location.html
-share/doc/conglomerate/conglomerate-cong-marshal.html
-share/doc/conglomerate/conglomerate-cong-modification.html
-share/doc/conglomerate/conglomerate-cong-modification-cursor-change.html
-share/doc/conglomerate/conglomerate-cong-modification-selection-change.html
-share/doc/conglomerate/conglomerate-cong-modification-set-dtd-ptr.html
-share/doc/conglomerate/conglomerate-cong-node.html
-share/doc/conglomerate/conglomerate-cong-node-modification.html
-share/doc/conglomerate/conglomerate-cong-node-modification-add-after.html
-share/doc/conglomerate/conglomerate-cong-node-modification-add-before.html
-share/doc/conglomerate/conglomerate-cong-node-modification-make-orphan.html
-share/doc/conglomerate/conglomerate-cong-node-modification-remove-attribute.html
-share/doc/conglomerate/conglomerate-cong-node-modification-set-attribute.html
-share/doc/conglomerate/conglomerate-cong-node-modification-set-parent.html
-share/doc/conglomerate/conglomerate-cong-node-modification-set-text.html
-share/doc/conglomerate/conglomerate-cong-overview-view.html
-share/doc/conglomerate/conglomerate-cong-parser-error.html
-share/doc/conglomerate/conglomerate-cong-plugin.html
-share/doc/conglomerate/conglomerate-cong-primary-window.html
-share/doc/conglomerate/conglomerate-cong-progress-checklist.html
-share/doc/conglomerate/conglomerate-cong-range.html
-share/doc/conglomerate/conglomerate-cong-selection.html
-share/doc/conglomerate/conglomerate-cong-text-cache.html
-share/doc/conglomerate/conglomerate-cong-tree-view.html
-share/doc/conglomerate/conglomerate-cong-util.html
-share/doc/conglomerate/conglomerate-cong-vfs.html
-share/doc/conglomerate/conglomerate-cong-view.html
-share/doc/conglomerate/conglomerate-fo.html
-share/doc/conglomerate/conglomerate-global.html
-share/doc/conglomerate/conglomerate-plugin-lists-area-listitem.html
-share/doc/conglomerate/conglomerate-plugin-lists-node-element-listitem.html
-share/doc/conglomerate/conglomerate-plugin-paragraph-area-paragraph.html
-share/doc/conglomerate/conglomerate-plugin-paragraph-node-element-paragraph.html
-share/doc/conglomerate/ch01.html
-share/doc/conglomerate/ch02.html
-share/doc/conglomerate/ch03.html
-share/doc/conglomerate/ch04s02.html
-share/doc/conglomerate/ch04s03.html
-share/doc/conglomerate/ch04.html
-share/doc/conglomerate/ch05.html
-share/doc/conglomerate/ch06.html
-share/doc/conglomerate/ch07.html
-share/doc/conglomerate/ch08.html
-share/doc/conglomerate/index.html
-share/doc/conglomerate/index.sgml
 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/forrest-document.xds
 share/gnome/conglomerate/dispspecs/kernel-traffic-newsletter.xds
 share/gnome/conglomerate/dispspecs/readme.xds
 share/gnome/conglomerate/dispspecs/relax-ng.xds
@@ -127,7 +23,44 @@ 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/conglomerate/glade/docbook-ulink-properties.glade
 share/gnome/conglomerate/glade/string_selection_dialog.glade
+share/gnome/conglomerate/pixmaps/conglomerate-icon-32.png
+share/gnome/conglomerate/pixmaps/cong-address-16.png
+share/gnome/conglomerate/pixmaps/cong-answer-16.png
+share/gnome/conglomerate/pixmaps/cong-author-16.png
+share/gnome/conglomerate/pixmaps/cong-bibliography-16.png
+share/gnome/conglomerate/pixmaps/cong-bulleted-list-16.png
+share/gnome/conglomerate/pixmaps/cong-caution-48.png
+share/gnome/conglomerate/pixmaps/cong-code-fragment-16.png
+share/gnome/conglomerate/pixmaps/cong-definition-list-16.png
+share/gnome/conglomerate/pixmaps/cong-docbook-article-16.png
+share/gnome/conglomerate/pixmaps/cong-docbook-book-16.png
+share/gnome/conglomerate/pixmaps/cong-docbook-set-16.png
+share/gnome/conglomerate/pixmaps/cong-editor-16.png
+share/gnome/conglomerate/pixmaps/cong-entry-16.png
+share/gnome/conglomerate/pixmaps/cong-faq-16.png
+share/gnome/conglomerate/pixmaps/cong-footnote-16.png
+share/gnome/conglomerate/pixmaps/cong-history-16.png
+share/gnome/conglomerate/pixmaps/cong-important-48.png
+share/gnome/conglomerate/pixmaps/cong-indexterm-16.png
+share/gnome/conglomerate/pixmaps/cong-list-item-16.png
+share/gnome/conglomerate/pixmaps/cong-list-16.png
+share/gnome/conglomerate/pixmaps/cong-metadata-16.png
+share/gnome/conglomerate/pixmaps/cong-name-16.png
+share/gnome/conglomerate/pixmaps/cong-note-48.png
+share/gnome/conglomerate/pixmaps/cong-numbered-list-16.png
+share/gnome/conglomerate/pixmaps/cong-paragraph-16.png
+share/gnome/conglomerate/pixmaps/cong-publisher-16.png
+share/gnome/conglomerate/pixmaps/cong-question-16.png
+share/gnome/conglomerate/pixmaps/cong-subsection-16.png
+share/gnome/conglomerate/pixmaps/cong-summary-16.png
+share/gnome/conglomerate/pixmaps/cong-tip-48.png
+share/gnome/conglomerate/pixmaps/cong-title-16.png
+share/gnome/conglomerate/pixmaps/cong-warning-48.png
+share/gnome/conglomerate/pixmaps/cong-wrapper-16.png
+share/gnome/conglomerate/templates/dispspec.xml
+share/gnome/conglomerate/templates/html.xml
 share/gnome/help/conglomerate/C/conglomerate.xml
 share/gnome/help/conglomerate/C/figures/conglomerate_logo.png
 share/gnome/help/conglomerate/C/figures/intro.png
@@ -137,39 +70,13 @@ 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
-share/gnome/pixmaps/cong-bibliography-16.png
-share/gnome/pixmaps/cong-bulleted-list-16.png
-share/gnome/pixmaps/cong-code-fragment-16.png
-share/gnome/pixmaps/cong-definition-list-16.png
-share/gnome/pixmaps/cong-docbook-article-16.png
-share/gnome/pixmaps/cong-docbook-book-16.png
-share/gnome/pixmaps/cong-docbook-set-16.png
-share/gnome/pixmaps/cong-editor-16.png
-share/gnome/pixmaps/cong-entry-16.png
-share/gnome/pixmaps/cong-faq-16.png
-share/gnome/pixmaps/cong-footnote-16.png
-share/gnome/pixmaps/cong-history-16.png
-share/gnome/pixmaps/cong-indexterm-16.png
-share/gnome/pixmaps/cong-list-16.png
-share/gnome/pixmaps/cong-list-item-16.png
-share/gnome/pixmaps/cong-metadata-16.png
-share/gnome/pixmaps/cong-name-16.png
-share/gnome/pixmaps/cong-numbered-list-16.png
-share/gnome/pixmaps/cong-paragraph-16.png
-share/gnome/pixmaps/cong-publisher-16.png
-share/gnome/pixmaps/cong-question-16.png
-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/gnome/pixmaps/conglomerate-icon-32.png
+share/locale/az/LC_MESSAGES/conglomerate.mo
+share/locale/ca/LC_MESSAGES/conglomerate.mo
 share/locale/cs/LC_MESSAGES/conglomerate.mo
 share/locale/da/LC_MESSAGES/conglomerate.mo
 share/locale/de/LC_MESSAGES/conglomerate.mo
+share/locale/el/LC_MESSAGES/conglomerate.mo
 share/locale/es/LC_MESSAGES/conglomerate.mo
 share/locale/nl/LC_MESSAGES/conglomerate.mo
 share/locale/pl/LC_MESSAGES/conglomerate.mo
@@ -189,4 +96,6 @@ share/locale/sv/LC_MESSAGES/conglomerate.mo
 @dirrm share/gnome/conglomerate/dtd
 @dirrm share/gnome/conglomerate/examples
 @dirrm share/gnome/conglomerate/glade
+@dirrm share/gnome/conglomerate/pixmaps
+@dirrm share/gnome/conglomerate/templates
 @dirrm share/gnome/conglomerate