- Update to 0.7.13

4 files changed, 141 insertions, 67 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index cefd915c6b2e..2c3d5710034f 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	conglomerate
-PORTVERSION=	0.7.12
-PORTREVISION=	1
+PORTVERSION=	0.7.13
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +17,6 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libgnomeui gtksourceview gnomeprefix gnomehack intlhack lthack
 USE_LIBTOOL_VER=	13
-USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index 841ee6f4a06f..05723457993a 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1,2 +1,2 @@
-MD5 (conglomerate-0.7.12.tar.gz) = 8743f9d8f079fc22f6aef70efd838aac
-SIZE (conglomerate-0.7.12.tar.gz) = 1996197
+MD5 (conglomerate-0.7.13.tar.gz) = 5dd94b1abb69a095c550f2506ad31964
+SIZE (conglomerate-0.7.13.tar.gz) = 2426796
diff --git a/editors/conglomerate/files/patch-src-cong-editor-node-element-span.c b/editors/conglomerate/files/patch-src-cong-editor-node-element-span.c
deleted file mode 100644
index 54dbe39c3654..000000000000
--- a/editors/conglomerate/files/patch-src-cong-editor-node-element-span.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/cong-editor-node-element-span.c.orig	Tue Feb 17 18:24:28 2004
-+++ src/cong-editor-node-element-span.c	Wed Feb 18 09:58:02 2004
-@@ -145,9 +145,9 @@
- 				
- 				if (child_line_fragments) {
- 					GList* list_of_areas;
--					list_of_areas = cong_editor_line_fragments_get_area_list (child_line_fragments);
--					
- 					gboolean is_first = TRUE;
-+					
-+					list_of_areas = cong_editor_line_fragments_get_area_list (child_line_fragments);
- 					
- 					while (list_of_areas) {
- 						
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index 38a686a17efe..61590ec2b548 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -1,26 +1,114 @@
 bin/conglomerate
-etc/gconf/gconf.xml.defaults/apps/conglomerate/plugins/templates/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/conglomerate/plugins/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/conglomerate/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate/plugins/templates/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate/plugins/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate/%gconf.xml
 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/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-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-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-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/ch09.html
+share/doc/conglomerate/index.html
+share/doc/conglomerate/index.sgml
 share/gnome/application-registry/conglomerate.applications
 share/gnome/applications/conglomerate.desktop
+share/gnome/conglomerate/css/docbook.css
 share/gnome/conglomerate/dispspecs/cnxml.xds
 share/gnome/conglomerate/dispspecs/dispspec.xds
-share/gnome/conglomerate/dispspecs/dispspec-template.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/opml.xds
 share/gnome/conglomerate/dispspecs/readme.xds
 share/gnome/conglomerate/dispspecs/relax-ng.xds
+share/gnome/conglomerate/dispspecs/release.xds
 share/gnome/conglomerate/dispspecs/teixlite.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/release.dtd
 share/gnome/conglomerate/dtd/xds.dtd
 share/gnome/conglomerate/examples/cnxml.xml
 share/gnome/conglomerate/examples/error-proposal.xml
@@ -30,51 +118,20 @@ 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/examples/test-table3.xml
 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/docbook-common-properties.glade
 share/gnome/conglomerate/glade/docbook-orderedlist-properties.glade
 share/gnome/conglomerate/glade/docbook-ulink-properties.glade
 share/gnome/conglomerate/glade/plugin-random.glade
 share/gnome/conglomerate/glade/string_selection_dialog.glade
 share/gnome/conglomerate/help/conglomerate
-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/stylesheets/selection-to-text.xsl
 share/gnome/conglomerate/templates/dispspec.xml
+share/gnome/conglomerate/templates/dispspec-template.xds
 share/gnome/conglomerate/templates/html.xml
 share/gnome/help/conglomerate/C/cong_element_map_ref.xml
 share/gnome/help/conglomerate/C/conglomerate.xml
@@ -139,18 +196,55 @@ share/gnome/mime-info/conglomerate.keys
 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/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-code-fragment-16.png
+share/gnome/pixmaps/conglomerate/cong-definition-list-16.png
+share/gnome/pixmaps/conglomerate/cong-docbook-article-16.png
+share/gnome/pixmaps/conglomerate/cong-docbook-book-16.png
+share/gnome/pixmaps/conglomerate/cong-docbook-set-16.png
+share/gnome/pixmaps/conglomerate/cong-editor-16.png
+share/gnome/pixmaps/conglomerate/cong-entry-16.png
+share/gnome/pixmaps/conglomerate/cong-faq-16.png
+share/gnome/pixmaps/conglomerate/cong-footnote-16.png
+share/gnome/pixmaps/conglomerate/cong-history-16.png
+share/gnome/pixmaps/conglomerate/cong-important-48.png
+share/gnome/pixmaps/conglomerate/cong-indexterm-16.png
+share/gnome/pixmaps/conglomerate/cong-list-item-16.png
+share/gnome/pixmaps/conglomerate/cong-list-16.png
+share/gnome/pixmaps/conglomerate/cong-metadata-16.png
+share/gnome/pixmaps/conglomerate/cong-name-16.png
+share/gnome/pixmaps/conglomerate/cong-note-48.png
+share/gnome/pixmaps/conglomerate/cong-numbered-list-16.png
+share/gnome/pixmaps/conglomerate/cong-paragraph-16.png
+share/gnome/pixmaps/conglomerate/cong-publisher-16.png
+share/gnome/pixmaps/conglomerate/cong-question-16.png
+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-warning-48.png
+share/gnome/pixmaps/conglomerate/cong-wrapper-16.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/en_CA/LC_MESSAGES/conglomerate.mo
+share/locale/en_GB/LC_MESSAGES/conglomerate.mo
 share/locale/es/LC_MESSAGES/conglomerate.mo
 share/locale/fr/LC_MESSAGES/conglomerate.mo
 share/locale/hr/LC_MESSAGES/conglomerate.mo
 share/locale/ja/LC_MESSAGES/conglomerate.mo
 share/locale/nl/LC_MESSAGES/conglomerate.mo
 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/ru/LC_MESSAGES/conglomerate.mo
@@ -160,22 +254,18 @@ 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/pixmaps/conglomerate
 @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/css
 @dirrm share/gnome/conglomerate/dispspecs
 @dirrm share/gnome/conglomerate/dtd
 @dirrm share/gnome/conglomerate/examples
 @dirrm share/gnome/conglomerate/glade
 @dirrm share/gnome/conglomerate/help
-@dirrm share/gnome/conglomerate/pixmaps
 @dirrm share/gnome/conglomerate/stylesheets
 @dirrm share/gnome/conglomerate/templates
 @dirrm share/gnome/conglomerate
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate/plugins/templates
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate/plugins
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate
-@dirrm etc/gconf/gconf.xml.defaults/apps/conglomerate/plugins/templates
-@dirrm etc/gconf/gconf.xml.defaults/apps/conglomerate/plugins
-@dirrm etc/gconf/gconf.xml.defaults/apps/conglomerate
+@dirrm share/doc/conglomerate