6 files changed, 60 insertions, 66 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 213dd4a7ad18..5998ce09f63c 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	conglomerate
-PORTVERSION=	0.7.10
+PORTVERSION=	0.7.11
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ COMMENT=	GNOME2 visual XML editor with emphasis on DocBook editing
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	libgnomeui gtksourceview gnomeprefix gnomehack
+USE_GNOME=	libgnomeui gtksourceview gnomeprefix gnomehack intlhack lthack
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index fa6b9b6517e0..ef7ecbb59392 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1 +1,2 @@
-MD5 (conglomerate-0.7.10.tar.gz) = e0720de762a96ffb7108bee595823900
+MD5 (conglomerate-0.7.11.tar.gz) = b31b955273944f7636c8c26dada76636
+SIZE (conglomerate-0.7.11.tar.gz) = 1932492
diff --git a/editors/conglomerate/files/patch-configure b/editors/conglomerate/files/patch-configure
deleted file mode 100644
index b2ca39f6e4d4..000000000000
--- a/editors/conglomerate/files/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.orig	Mon Jan  5 04:13:36 2004
-+++ configure	Mon Jan  5 04:17:09 2004
-@@ -8502,6 +8502,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10535,15 +10536,6 @@
-   GTKDOC=false
- fi
- 
--# Check whether --enable-gtk-doc or --disable-gtk-doc was given.
--if test "${enable_gtk_doc+set}" = set; then
--  enableval="$enable_gtk_doc"
--  enable_gtk_doc="$enableval"
--else
--  enable_gtk_doc=yes
--fi;
--
--    enable_gtk_doc=yes
- 
- 
- 
diff --git a/editors/conglomerate/files/patch-doc_C_conglomerate.xml b/editors/conglomerate/files/patch-doc_C_conglomerate.xml
deleted file mode 100644
index 592f05e6d756..000000000000
--- a/editors/conglomerate/files/patch-doc_C_conglomerate.xml
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/C/conglomerate.xml.orig	Sun Dec 28 17:45:01 2003
-+++ doc/C/conglomerate.xml	Sun Dec 28 17:45:24 2003
-@@ -185,8 +185,8 @@
-       </sect3>
-     </sect2>
-   </sect1>
--  <sect1 id="faq">
-+  <!--  <sect1 id="faq">
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-       href="./faq.xml#xpointer(/article/*)"/>
--  </sect1>
-+  </sect1>-->
- </article>
diff --git a/editors/conglomerate/files/patch-intltool-merge.in b/editors/conglomerate/files/patch-intltool-merge.in
deleted file mode 100644
index 54c8a233119d..000000000000
--- a/editors/conglomerate/files/patch-intltool-merge.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- intltool-merge.in.orig	Wed Nov 12 15:29:28 2003
-+++ intltool-merge.in	Wed Nov 12 15:31:54 2003
-@@ -858,7 +858,7 @@
-     if ($MULTIPLE_OUTPUT) {
-         for my $lang (sort keys %po_files_by_lang) {
- 	    if ( ! -e $lang ) {
--	        mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
-+	        mkdir $lang, 0777 or die "Cannot create subdirectory $lang: $!\n";
-             }
-             open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
-             my $tree = readXml($FILE);
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index fc6cc39d8e3b..f08961f6b993 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -6,22 +6,11 @@ etc/gconf/gconf.xml.defaults/schemas/apps/conglomerate/plugins/templates/%gconf.
 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/ch01.html
-share/doc/conglomerate/ch02.html
-share/doc/conglomerate/ch03.html
-share/doc/conglomerate/ch04.html
-share/doc/conglomerate/ch04s02.html
-share/doc/conglomerate/ch04s03.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/gnome/application-registry/conglomerate.applications
 share/gnome/applications/conglomerate.desktop
 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
@@ -42,9 +31,11 @@ share/gnome/conglomerate/examples/test-entities.xml
 share/gnome/conglomerate/examples/test-table.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/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
@@ -84,15 +75,65 @@ 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/html.xml
+share/gnome/help/conglomerate/C/cong_element_map_ref.xml
 share/gnome/help/conglomerate/C/conglomerate.xml
+share/gnome/help/conglomerate/C/conventions.xml
+share/gnome/help/conglomerate/C/doc_type_support.xml
 share/gnome/help/conglomerate/C/faq.xml
+share/gnome/help/conglomerate/C/figures/caution.png
+share/gnome/help/conglomerate/C/figures/cong_create_new_file_wiz1.png
+share/gnome/help/conglomerate/C/figures/cong_create_new_file_wiz2.png
+share/gnome/help/conglomerate/C/figures/cong_dump_xds_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_editor_outlineview_overview.png
+share/gnome/help/conglomerate/C/figures/cong_editor_outlineview_popup_menu.png
+share/gnome/help/conglomerate/C/figures/cong_editor_outlineview_raw.png
+share/gnome/help/conglomerate/C/figures/cong_editor_window.png
+share/gnome/help/conglomerate/C/figures/cong_editor_window_doc_area.png
+share/gnome/help/conglomerate/C/figures/cong_editor_window_doc_edit.png
+share/gnome/help/conglomerate/C/figures/cong_editor_window_doc_edit_collapse.png
+share/gnome/help/conglomerate/C/figures/cong_editor_window_menubar.png
+share/gnome/help/conglomerate/C/figures/cong_editor_window_statusbar.png
+share/gnome/help/conglomerate/C/figures/cong_editor_window_titlebar.png
+share/gnome/help/conglomerate/C/figures/cong_editor_window_toolbar.png
+share/gnome/help/conglomerate/C/figures/cong_edit_xds_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_export_file_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_import_file_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_inline_menu.png
+share/gnome/help/conglomerate/C/figures/cong_input_focus.png
+share/gnome/help/conglomerate/C/figures/cong_open_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_add.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd_add.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd_adv.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd_adv_add.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_dtd_reder.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_lang.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_rev.png
+share/gnome/help/conglomerate/C/figures/cong_properties_dialog_scope.png
+share/gnome/help/conglomerate/C/figures/cong_save_as_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_save_copy_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_start_window.png
+share/gnome/help/conglomerate/C/figures/cong_validate_tool_dialog.png
+share/gnome/help/conglomerate/C/figures/cong_view_source_menu.png
+share/gnome/help/conglomerate/C/figures/cong_view_source_window.png
 share/gnome/help/conglomerate/C/figures/conglomerate_logo.png
+share/gnome/help/conglomerate/C/figures/important.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/note.png
 share/gnome/help/conglomerate/C/figures/properties-dialog.png
 share/gnome/help/conglomerate/C/figures/quote.png
+share/gnome/help/conglomerate/C/figures/tip.png
+share/gnome/help/conglomerate/C/figures/warning.png
+share/gnome/help/conglomerate/C/global.ent
+share/gnome/help/conglomerate/C/glossary.xml
+share/gnome/help/conglomerate/C/notice_fdl.xml
+share/gnome/help/conglomerate/C/notice_gpl.xml
+share/gnome/help/conglomerate/C/row_xml_lang_attrib.xml
+share/gnome/help/conglomerate/C/tbl_element_attrib.xml
+share/gnome/help/conglomerate/C/xds_dtd_def.xml
 share/gnome/mime-info/conglomerate.keys
 share/gnome/mime-info/conglomerate.mime
 share/gnome/omf/conglomerate/conglomerate-C.omf
@@ -104,16 +145,18 @@ 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/fr/LC_MESSAGES/conglomerate.mo
 share/locale/nl/LC_MESSAGES/conglomerate.mo
+share/locale/no/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/sq/LC_MESSAGES/conglomerate.mo
 share/locale/sr/LC_MESSAGES/conglomerate.mo
 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