3 files changed, 126 insertions, 73 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index ae0c6eb36b9f..9041f4619d3e 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	conglomerate
-PORTVERSION=	0.7.14
+PORTVERSION=	0.7.15
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,8 +20,14 @@ USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/libdata/pkgconfig/enchant.pc) || defined(WITH_ENCHANT)
+LIB_DEPENDS+=	enchant.2:${PORTSDIR}/textproc/enchant
+.endif
+
 post-install:
 	${MKDIR} ${PREFIX}/share/gnome/${PORTNAME}/help
 	${LN} -sf ${PREFIX}/share/gnome/help/${PORTNAME} ${PREFIX}/share/gnome/${PORTNAME}/help/${PORTNAME}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index 12aa13437331..e7252a0d9ea6 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1,2 +1,2 @@
-MD5 (conglomerate-0.7.14.tar.gz) = 1a04815a1059987aea45816aa1401bc3
-SIZE (conglomerate-0.7.14.tar.gz) = 2438625
+MD5 (conglomerate-0.7.15.tar.gz) = 463fd68d67d093a0e7b612a0a481e1ac
+SIZE (conglomerate-0.7.15.tar.gz) = 2837509
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index cf10a6cf6006..cf4f6e34dfb9 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -1,96 +1,137 @@
 bin/conglomerate
 etc/gconf/schemas/conglomerate.schemas
-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-history.html
+share/doc/conglomerate/class-hierarchy.html
+share/doc/conglomerate/class-overview.html
+share/doc/conglomerate/CongAttributeEditorCDATA.html
+share/doc/conglomerate/CongAttributeEditorENUMERATION.html
+share/doc/conglomerate/CongAttributeEditorLang.html
+share/doc/conglomerate/CongAttributeEditor.html
+share/doc/conglomerate/CongAttributeWrapperCheckButton.html
+share/doc/conglomerate/CongAttributeWrapperRadioButton.html
+share/doc/conglomerate/CongAttributeWrapper.html
+share/doc/conglomerate/CongCommandHistory.html
+share/doc/conglomerate/CongCommand.html
+share/doc/conglomerate/CongDocumentTraversal.html
+share/doc/conglomerate/CongDocument.html
+share/doc/conglomerate/CongEditorAreaBin.html
+share/doc/conglomerate/CongEditorAreaBorder.html
+share/doc/conglomerate/CongEditorAreaComposer.html
+share/doc/conglomerate/CongEditorAreaContainer.html
+share/doc/conglomerate/CongEditorAreaEntityDecl.html
+share/doc/conglomerate/CongEditorAreaEntityRef.html
+share/doc/conglomerate/CongEditorAreaExpander.html
+share/doc/conglomerate/CongEditorAreaFlowHolderBlocks.html
+share/doc/conglomerate/CongEditorAreaFlowHolderInlines.html
+share/doc/conglomerate/CongEditorAreaFlowHolderSingle.html
+share/doc/conglomerate/CongEditorAreaFlowHolder.html
+share/doc/conglomerate/CongEditorAreaLabelled.html
+share/doc/conglomerate/CongEditorAreaLine.html
+share/doc/conglomerate/CongEditorAreaListitem.html
+share/doc/conglomerate/CongEditorAreaParagraph.html
+share/doc/conglomerate/CongEditorAreaPixbuf.html
+share/doc/conglomerate/CongEditorAreaSpacer.html
+share/doc/conglomerate/CongEditorAreaSpanTag.html
+share/doc/conglomerate/CongEditorAreaStructuralTag.html
+share/doc/conglomerate/CongEditorAreaStructural.html
+share/doc/conglomerate/CongEditorAreaTextComment.html
+share/doc/conglomerate/CongEditorAreaTextFragment.html
+share/doc/conglomerate/CongEditorAreaText.html
+share/doc/conglomerate/CongEditorAreaUnderline.html
+share/doc/conglomerate/CongEditorAreaUnknownTag.html
+share/doc/conglomerate/CongEditorArea.html
+share/doc/conglomerate/CongEditorChildPolicyFlowHolder.html
+share/doc/conglomerate/CongEditorChildPolicyInline.html
+share/doc/conglomerate/CongEditorChildPolicy.html
+share/doc/conglomerate/CongEditorLineFragments.html
+share/doc/conglomerate/CongEditorNodeComment.html
+share/doc/conglomerate/CongEditorNodeDocument.html
+share/doc/conglomerate/CongEditorNodeDtd.html
+share/doc/conglomerate/CongEditorNodeElementAdmonition.html
+share/doc/conglomerate/CongEditorNodeElementListitem.html
+share/doc/conglomerate/CongEditorNodeElementParagraph.html
+share/doc/conglomerate/CongEditorNodeElementSpan.html
+share/doc/conglomerate/CongEditorNodeElementStructural.html
+share/doc/conglomerate/CongEditorNodeElementUnknown.html
+share/doc/conglomerate/CongEditorNodeElement.html
+share/doc/conglomerate/CongEditorNodeEntityDecl.html
+share/doc/conglomerate/CongEditorNodeEntityRef.html
+share/doc/conglomerate/CongEditorNodeText.html
+share/doc/conglomerate/CongEditorNodeUnimplemented.html
+share/doc/conglomerate/CongEditorNode.html
+share/doc/conglomerate/CongEditorWidget3.html
+share/doc/conglomerate/conglomerate-CongApp.html
+share/doc/conglomerate/conglomerate-CongDispspecElement.html
+share/doc/conglomerate/conglomerate-CongDispspecRegistry.html
+share/doc/conglomerate/conglomerate-CongDispspec.html
+share/doc/conglomerate/conglomerate-CongLocation.html
+share/doc/conglomerate/conglomerate-CongObject.html
+share/doc/conglomerate/conglomerate-CongPluginManager.html
+share/doc/conglomerate/conglomerate-CongRange.html
+share/doc/conglomerate/conglomerate-CongSelection.html
+share/doc/conglomerate/conglomerate-CongServicePrintMethod.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-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-edit-find-and-replace.html
 share/doc/conglomerate/conglomerate-cong-eel.html
+share/doc/conglomerate/conglomerate-cong-eel-graphic-effects.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-file-selection.html
 share/doc/conglomerate/conglomerate-cong-font.html
+share/doc/conglomerate/conglomerate-cong-glade.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-node.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-ui-hooks.html
+share/doc/conglomerate/conglomerate-cong-vfs.html
 share/doc/conglomerate/conglomerate-cong-view.html
+share/doc/conglomerate/conglomerate-DTD-Handling.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/conglomerate-Utility-functions.html
+share/doc/conglomerate/conglomerate-XML-Nodes.html
+share/doc/conglomerate/CongModificationCursorChange.html
+share/doc/conglomerate/CongModificationSelectionChange.html
+share/doc/conglomerate/CongModificationSetDtdPtr.html
+share/doc/conglomerate/CongModification.html
+share/doc/conglomerate/CongNodeModificationAddAfter.html
+share/doc/conglomerate/CongNodeModificationAddBefore.html
+share/doc/conglomerate/CongNodeModificationMakeOrphan.html
+share/doc/conglomerate/CongNodeModificationRemoveAttribute.html
+share/doc/conglomerate/CongNodeModificationSetAttribute.html
+share/doc/conglomerate/CongNodeModificationSetParent.html
+share/doc/conglomerate/CongNodeModificationSetText.html
+share/doc/conglomerate/CongNodeModification.html
+share/doc/conglomerate/CongPlugin.html
+share/doc/conglomerate/CongServiceDocTool.html
+share/doc/conglomerate/CongServiceDocumentFactory.html
+share/doc/conglomerate/CongServiceEditorNodeFactory.html
+share/doc/conglomerate/CongServiceExporter.html
+share/doc/conglomerate/CongServiceImporter.html
+share/doc/conglomerate/CongServiceNodePropertyDialog.html
+share/doc/conglomerate/CongServiceNodeTool.html
+share/doc/conglomerate/CongServiceTool.html
+share/doc/conglomerate/CongService.html
+share/doc/conglomerate/CongTraversalNode.html
+share/doc/conglomerate/CongXPathExpression.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/ch09.html
+share/doc/conglomerate/editor.html
+share/doc/conglomerate/helper.html
 share/doc/conglomerate/index.html
 share/doc/conglomerate/index.sgml
+share/doc/conglomerate/ix01.html
+share/doc/conglomerate/misc.html
+share/doc/conglomerate/plugins.html
+share/doc/conglomerate/state.html
+share/doc/conglomerate/views.html
+share/doc/conglomerate/xml.html
 share/gnome/application-registry/conglomerate.applications
 share/gnome/applications/conglomerate.desktop
 share/gnome/conglomerate/css/docbook.css
@@ -114,6 +155,7 @@ 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/nmtoken.xml
 share/gnome/conglomerate/examples/readme.xml
 share/gnome/conglomerate/examples/test-docbook.xml
 share/gnome/conglomerate/examples/test-entities.xml
@@ -123,6 +165,7 @@ share/gnome/conglomerate/glade/cong-file-import.glade
 share/gnome/conglomerate/glade/cong-file-properties.glade
 share/gnome/conglomerate/glade/cong-find-replace.glade
 share/gnome/conglomerate/glade/cong-preferences.glade
+share/gnome/conglomerate/glade/custom-element.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
@@ -198,12 +241,14 @@ share/gnome/mime-info/conglomerate.mime
 share/gnome/omf/conglomerate/conglomerate-C.omf
 share/gnome/pixmaps/conglomerate-icon-16.png
 share/gnome/pixmaps/conglomerate/conglomerate-icon-32.png
+share/gnome/pixmaps/conglomerate/conglomerate-logo.png
 share/gnome/pixmaps/conglomerate/cong-address-16.png
 share/gnome/pixmaps/conglomerate/cong-answer-16.png
 share/gnome/pixmaps/conglomerate/cong-author-16.png
 share/gnome/pixmaps/conglomerate/cong-bibliography-16.png
 share/gnome/pixmaps/conglomerate/cong-bulleted-list-16.png
 share/gnome/pixmaps/conglomerate/cong-caution-48.png
+share/gnome/pixmaps/conglomerate/cong-comment-16.png
 share/gnome/pixmaps/conglomerate/cong-code-fragment-16.png
 share/gnome/pixmaps/conglomerate/cong-definition-list-16.png
 share/gnome/pixmaps/conglomerate/cong-docbook-article-16.png
@@ -229,6 +274,7 @@ share/gnome/pixmaps/conglomerate/cong-subsection-16.png
 share/gnome/pixmaps/conglomerate/cong-summary-16.png
 share/gnome/pixmaps/conglomerate/cong-tip-48.png
 share/gnome/pixmaps/conglomerate/cong-title-16.png
+share/gnome/pixmaps/conglomerate/cong-uncomment-16.png
 share/gnome/pixmaps/conglomerate/cong-warning-48.png
 share/gnome/pixmaps/conglomerate/cong-wrapper-16.png
 share/locale/az/LC_MESSAGES/conglomerate.mo
@@ -248,6 +294,7 @@ share/locale/no/LC_MESSAGES/conglomerate.mo
 share/locale/pa/LC_MESSAGES/conglomerate.mo
 share/locale/pl/LC_MESSAGES/conglomerate.mo
 share/locale/pt/LC_MESSAGES/conglomerate.mo
+share/locale/pt_BR/LC_MESSAGES/conglomerate.mo
 share/locale/ru/LC_MESSAGES/conglomerate.mo
 share/locale/sq/LC_MESSAGES/conglomerate.mo
 share/locale/sr/LC_MESSAGES/conglomerate.mo