Updated to 0.7.6

Changes:

     * Undo/Redo now works, with an unlimited history. Large amounts of
        the program was rewritten to allow this.

     * Allow clicking beyond the end of the fragment of text, to make
       it easy to select past the end of a line.

     * Improvements to the "Required Child" dialog to use Glade and be
       more HIG-compliant (David Hoover).

And more bugfixes, etc.

3 files changed, 54 insertions, 7 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 277f63f08bc..e3a24f2f48c 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/03 23:03:39 xtraeme Exp $
 #
 
-DISTNAME=	conglomerate-0.7.4
-PKGREVISION=	2
+DISTNAME=	conglomerate-0.7.6
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conglomerate/}
 
@@ -24,6 +23,10 @@ USE_PKGLOCALEDIR=	yes
 
 LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 
+CONFIGURE_ARGS+=	--enable-printing
+CONFIGURE_ARGS+=	--disable-gtk-doc
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
@@ -31,6 +34,7 @@ LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../textproc/libxslt/buildlink2.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../x11/gtksourceview/buildlink2.mk"
 
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/conglomerate/PLIST b/editors/conglomerate/PLIST
index 310445acd1e..3732118f2c3 100644
--- a/editors/conglomerate/PLIST
+++ b/editors/conglomerate/PLIST
@@ -1,15 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/25 15:45:20 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/12/03 23:03:39 xtraeme Exp $
 bin/conglomerate
 share/applications/conglomerate.desktop
 share/conglomerate/dispspecs/cnxml.xds
 share/conglomerate/dispspecs/dispspec.xds
 share/conglomerate/dispspecs/docbook.xds
+share/conglomerate/dispspecs/forrest-document.xds
 share/conglomerate/dispspecs/kernel-traffic-newsletter.xds
 share/conglomerate/dispspecs/readme.xds
 share/conglomerate/dispspecs/relax-ng.xds
 share/conglomerate/dispspecs/website-layout.xds
 share/conglomerate/dispspecs/website-webpage.xds
 share/conglomerate/dispspecs/xhtml1-strict.xds
+share/conglomerate/dispspecs/xsl.xds
 share/conglomerate/dtd/xds.dtd
 share/conglomerate/examples/cnxml.xml
 share/conglomerate/examples/error-proposal.xml
@@ -22,6 +24,44 @@ share/conglomerate/examples/test-table.xml
 share/conglomerate/glade/cong-file-import.glade
 share/conglomerate/glade/docbook-common-properties.glade
 share/conglomerate/glade/docbook-orderedlist-properties.glade
+share/conglomerate/glade/docbook-ulink-properties.glade
+share/conglomerate/glade/string_selection_dialog.glade
+share/conglomerate/pixmaps/cong-address-16.png
+share/conglomerate/pixmaps/cong-answer-16.png
+share/conglomerate/pixmaps/cong-author-16.png
+share/conglomerate/pixmaps/cong-bibliography-16.png
+share/conglomerate/pixmaps/cong-bulleted-list-16.png
+share/conglomerate/pixmaps/cong-caution-48.png
+share/conglomerate/pixmaps/cong-code-fragment-16.png
+share/conglomerate/pixmaps/cong-definition-list-16.png
+share/conglomerate/pixmaps/cong-docbook-article-16.png
+share/conglomerate/pixmaps/cong-docbook-book-16.png
+share/conglomerate/pixmaps/cong-docbook-set-16.png
+share/conglomerate/pixmaps/cong-editor-16.png
+share/conglomerate/pixmaps/cong-entry-16.png
+share/conglomerate/pixmaps/cong-faq-16.png
+share/conglomerate/pixmaps/cong-footnote-16.png
+share/conglomerate/pixmaps/cong-history-16.png
+share/conglomerate/pixmaps/cong-important-48.png
+share/conglomerate/pixmaps/cong-indexterm-16.png
+share/conglomerate/pixmaps/cong-list-16.png
+share/conglomerate/pixmaps/cong-list-item-16.png
+share/conglomerate/pixmaps/cong-metadata-16.png
+share/conglomerate/pixmaps/cong-name-16.png
+share/conglomerate/pixmaps/cong-note-48.png
+share/conglomerate/pixmaps/cong-numbered-list-16.png
+share/conglomerate/pixmaps/cong-paragraph-16.png
+share/conglomerate/pixmaps/cong-publisher-16.png
+share/conglomerate/pixmaps/cong-question-16.png
+share/conglomerate/pixmaps/cong-subsection-16.png
+share/conglomerate/pixmaps/cong-summary-16.png
+share/conglomerate/pixmaps/cong-tip-48.png
+share/conglomerate/pixmaps/cong-title-16.png
+share/conglomerate/pixmaps/cong-warning-48.png
+share/conglomerate/pixmaps/cong-wrapper-16.png
+share/conglomerate/pixmaps/conglomerate-icon-32.png
+share/conglomerate/templates/dispspec.xml
+share/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
@@ -30,6 +70,9 @@ share/gnome/help/conglomerate/C/figures/new-doc-wizard.png
 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
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/conglomerate.mo
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index 760dddd8ca3..2820ce303e6 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/09/25 15:45:20 xtraeme Exp $
+$NetBSD: distinfo,v 1.3 2003/12/03 23:03:39 xtraeme Exp $
 
-SHA1 (conglomerate-0.7.4.tar.gz) = 181c48069b6b4013909c67bd2bdb9ae3dbc7ac92
-Size (conglomerate-0.7.4.tar.gz) = 846534 bytes
+SHA1 (conglomerate-0.7.6.tar.gz) = 5c8739dea4035a7502334b5f6ad254e1d3cd3ba5
+Size (conglomerate-0.7.6.tar.gz) = 1115602 bytes