- Update to 0.7.7

5 files changed, 37 insertions, 18 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 19560f9d1827..f4efb8a4c639 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	conglomerate
-PORTVERSION=	0.7.6
+PORTVERSION=	0.7.7
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index d945edb62eda..6a308d2a675f 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1 +1 @@
-MD5 (conglomerate-0.7.6.tar.gz) = 6333b54dbe3222fd71ff8917355adc94
+MD5 (conglomerate-0.7.7.tar.gz) = f63dbd271dfe7605683fe7218b59f955
diff --git a/editors/conglomerate/files/patch-src-cong-primary-window.c b/editors/conglomerate/files/patch-src-cong-primary-window.c
new file mode 100644
index 000000000000..bf59f5e11089
--- /dev/null
+++ b/editors/conglomerate/files/patch-src-cong-primary-window.c
@@ -0,0 +1,19 @@
+--- src/cong-primary-window.c.orig	Tue Dec  9 17:09:13 2003
++++ src/cong-primary-window.c	Wed Dec 10 20:16:03 2003
+@@ -477,6 +477,7 @@
+ 	g_assert (primary_window);
+ 
+ 	if (doc) {
++		gchar *status_text;
+ 		primary_window->doc = doc;
+ 		g_object_ref(G_OBJECT(doc));
+ 		LOG_PRIMARY_WINDOW_CREATION1 ("Creating v3 widget");
+@@ -562,7 +563,7 @@
+ 		
+ 		/* update the statusbar */
+ 		
+-		gchar *status_text = g_strdup(cong_dispspec_get_name( cong_document_get_dispspec(primary_window->doc) ));
++		status_text = g_strdup(cong_dispspec_get_name( cong_document_get_dispspec(primary_window->doc) ));
+ #if 1
+ 		gnome_appbar_set_status (GNOME_APPBAR(primary_window->app_bar), 
+ 			 status_text);
diff --git a/editors/conglomerate/files/patch-src-plugin-templates.c b/editors/conglomerate/files/patch-src-plugin-templates.c
deleted file mode 100644
index c0f6816f9bda..000000000000
--- a/editors/conglomerate/files/patch-src-plugin-templates.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/plugin-templates.c.orig	Mon Oct 27 23:37:32 2003
-+++ src/plugin-templates.c	Thu Oct 30 18:50:50 2003
-@@ -169,12 +169,12 @@
- {
- 	int i;
- 	GSList* template_paths;
-+	CongTemplate* template;
- 
- 	g_return_val_if_fail(plugin, FALSE);
- 
- 	template_paths = get_template_paths(plugin);
- 
--	CongTemplate* template;
- 	template = g_new0(CongTemplate, sizeof(template));
- 	template->plugin = plugin;
- 
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index 491ed00ca602..d57bd17e6b3e 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -1,4 +1,17 @@
 bin/conglomerate
+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
@@ -62,6 +75,7 @@ share/gnome/conglomerate/pixmaps/cong-wrapper-16.png
 share/gnome/conglomerate/templates/dispspec.xml
 share/gnome/conglomerate/templates/html.xml
 share/gnome/help/conglomerate/C/conglomerate.xml
+share/gnome/help/conglomerate/C/faq.xml
 share/gnome/help/conglomerate/C/figures/conglomerate_logo.png
 share/gnome/help/conglomerate/C/figures/intro.png
 share/gnome/help/conglomerate/C/figures/menu-properties.png
@@ -69,6 +83,8 @@ 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
+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/locale/az/LC_MESSAGES/conglomerate.mo