Update to 0.7.5.

* undo/redo support
* API documentation
* new translations: cs, pl
* various bugfixes and HIG improvements

PR:		57762
Submitted by:	maintainer

3 files changed, 113 insertions, 2 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 4ffc794ae542..d6d27fd0382d 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	conglomerate
-PORTVERSION=	0.7.4
+PORTVERSION=	0.7.5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index b5e2ff49d2c4..44e05fb0a4e3 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1 +1 @@
-MD5 (conglomerate-0.7.4.tar.gz) = 90acc05143bcce4f7108fbe6669c82f0
+MD5 (conglomerate-0.7.5.tar.gz) = 7b2bb48fc04f978bfb44b97a39eb0687
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index 644e36a1bd1f..513be2f6650c 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -1,4 +1,109 @@
 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
@@ -9,6 +114,7 @@ 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/xhtml1-strict.xds
+share/gnome/conglomerate/dispspecs/xsl.xds
 share/gnome/conglomerate/dtd/xds.dtd
 share/gnome/conglomerate/examples/cnxml.xml
 share/gnome/conglomerate/examples/error-proposal.xml
@@ -21,6 +127,7 @@ 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/string_selection_dialog.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
@@ -59,10 +166,13 @@ 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/cs/LC_MESSAGES/conglomerate.mo
 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/pl/LC_MESSAGES/conglomerate.mo
 share/locale/pt/LC_MESSAGES/conglomerate.mo
 share/locale/ru/LC_MESSAGES/conglomerate.mo
 share/locale/sr/LC_MESSAGES/conglomerate.mo
@@ -70,6 +180,7 @@ 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/doc/conglomerate
 @dirrm share/gnome/omf/conglomerate
 @dirrm share/gnome/help/conglomerate/C/figures
 @dirrm share/gnome/help/conglomerate/C