From pav@oook.cz  Tue Sep  2 02:37:58 2003
Return-Path: <pav@oook.cz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 00FDD16A4BF
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  2 Sep 2003 02:37:58 -0700 (PDT)
Received: from e0-a3.b1.lan.prg.vol.cz (e0-a3.b1.lan.prg.vol.cz [195.122.204.155])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 642B443FFB
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  2 Sep 2003 02:37:55 -0700 (PDT)
	(envelope-from pav@oook.cz)
Received: from pav.hide.vol.cz (localhost [127.0.0.1])
	by e0-a3.b1.lan.prg.vol.cz (8.12.9/8.12.9) with ESMTP id h829bq2G077331
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 2 Sep 2003 11:37:52 +0200 (CEST)
	(envelope-from pav@pav.hide.vol.cz)
Received: (from pav@localhost)
	by pav.hide.vol.cz (8.12.9/8.12.9/Submit) id h829bqZG077330;
	Tue, 2 Sep 2003 11:37:52 +0200 (CEST)
	(envelope-from pav)
Message-Id: <200309020937.h829bqZG077330@pav.hide.vol.cz>
Date: Tue, 2 Sep 2003 11:37:52 +0200 (CEST)
From: Pav Lucistnik <pav@oook.cz>
Reply-To: Pav Lucistnik <pav@oook.cz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer update] editors/conglomerate to 0.7.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         56303
>Category:       ports
>Synopsis:       [maintainer update] editors/conglomerate to 0.7.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tom
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 02 02:40:14 PDT 2003
>Closed-Date:    Wed Sep 24 10:32:06 PDT 2003
>Last-Modified:  Wed Sep 24 10:32:06 PDT 2003
>Originator:     Pav Lucistnik
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD pav.hide.vol.cz 4.8-STABLE FreeBSD 4.8-STABLE #0: Mon Jul 28 12:47:51 CEST 2003 root@pav.hide.vol.cz:/usr/obj/usr/src/sys/PAV i386


	
>Description:
Update editors/conglomerate to 0.7.1

Remove two patches in files/: patch-src-cong-location.c patch-src-xmlview.c
One was merged upstream and one was bogus (patching #if 0-ed code).

New in this version:
- Text->DocBook importer
- German translation
- Bugfixes.
>How-To-Repeat:
	
>Fix:

diff -ru /usr/ports/editors/conglomerate/Makefile conglomerate/Makefile
--- /usr/ports/editors/conglomerate/Makefile	Mon Sep  1 09:49:15 2003
+++ conglomerate/Makefile	Tue Sep  2 10:24:01 2003
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/editors/conglomerate/Makefile,v 1.3 2003/08/30 23:06:15 marcus Exp $
 
 PORTNAME=	conglomerate
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -ru /usr/ports/editors/conglomerate/distinfo conglomerate/distinfo
--- /usr/ports/editors/conglomerate/distinfo	Mon Sep  1 09:49:15 2003
+++ conglomerate/distinfo	Tue Sep  2 10:24:11 2003
@@ -1 +1 @@
-MD5 (conglomerate-0.7.0.tar.gz) = f76ac1451593f7e92f8713bfc83205de
+MD5 (conglomerate-0.7.1.tar.gz) = 69245f82a9927458f70df54cc564bf74
diff -ru /usr/ports/editors/conglomerate/pkg-plist conglomerate/pkg-plist
--- /usr/ports/editors/conglomerate/pkg-plist	Mon Sep  1 09:49:15 2003
+++ conglomerate/pkg-plist	Tue Sep  2 10:46:13 2003
@@ -50,6 +50,7 @@
 share/gnome/pixmaps/cong-wrapper-16.png
 share/gnome/pixmaps/conglomerate-icon-16.png
 share/locale/da/LC_MESSAGES/conglomerate.mo
+share/locale/de/LC_MESSAGES/conglomerate.mo
 share/locale/es/LC_MESSAGES/conglomerate.mo
 share/locale/nl/LC_MESSAGES/conglomerate.mo
 share/locale/ru/LC_MESSAGES/conglomerate.mo
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->tom 
Responsible-Changed-By: tom 
Responsible-Changed-When: Thu Sep 11 09:02:14 PDT 2003 
Responsible-Changed-Why:  
I will commit this when the Ports freeze is over. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=56303 

From: Pav Lucistnik <pav@oook.cz>
To: FreeBSD-gnats-submit@freebsd.org
Cc: tom@freebsd.org
Subject: Re: ports/56303: [maintainer update] editors/conglomerate to 0.7.2
Date: Fri, 19 Sep 2003 11:16:35 +0200 (CEST)

 >Submitter-Id:	current-users
 >Originator:	Pav Lucistnik
 >Organization:	
 >Confidential:	no 
 >Synopsis:	Re: ports/56303: [maintainer update] editors/conglomerate to 0.7.2
 >Severity:	non-critical
 >Priority:	low
 >Category:	ports
 >Class:		maintainer-update
 >Release:	FreeBSD 4.8-STABLE i386
 >Environment:
 System: FreeBSD pav.hide.vol.cz 4.8-STABLE FreeBSD 4.8-STABLE #0: Mon Jul 28 12:47:51 CEST 2003 root@pav.hide.vol.cz:/usr/obj/usr/src/sys/PAV i386
 
 
 	
 >Description:
 
 Port updated to 0.7.2. Tested on -STABLE, -CURRENT, GNOME 2.2, GNOME 2.4.
 
 >How-To-Repeat:
 	
 >Fix:
 
 diff -ruN /usr/ports/editors/conglomerate/Makefile conglomerate/Makefile
 --- /usr/ports/editors/conglomerate/Makefile	Mon Sep  1 09:49:15 2003
 +++ conglomerate/Makefile	Fri Sep 19 10:23:04 2003
 @@ -5,7 +5,7 @@
  # $FreeBSD: ports/editors/conglomerate/Makefile,v 1.3 2003/08/30 23:06:15 marcus Exp $
  
  PORTNAME=	conglomerate
 -PORTVERSION=	0.7.0
 +PORTVERSION=	0.7.2
  CATEGORIES=	editors
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	${PORTNAME}
 diff -ruN /usr/ports/editors/conglomerate/distinfo conglomerate/distinfo
 --- /usr/ports/editors/conglomerate/distinfo	Mon Sep  1 09:49:15 2003
 +++ conglomerate/distinfo	Fri Sep 19 10:23:17 2003
 @@ -1 +1 @@
 -MD5 (conglomerate-0.7.0.tar.gz) = f76ac1451593f7e92f8713bfc83205de
 +MD5 (conglomerate-0.7.2.tar.gz) = d0dca94d30880fb0e942e8005f554786
 diff -ruN /usr/ports/editors/conglomerate/files/patch-src-cong-location.c conglomerate/files/patch-src-cong-location.c
 --- /usr/ports/editors/conglomerate/files/patch-src-cong-location.c	Sun Aug 31 01:06:15 2003
 +++ conglomerate/files/patch-src-cong-location.c	Thu Jan  1 01:00:00 1970
 @@ -1,46 +0,0 @@
 ---- src/cong-location.c.orig	Thu Aug 14 17:24:36 2003
 -+++ src/cong-location.c	Sat Aug 30 18:50:41 2003
 -@@ -4,6 +4,7 @@
 - #include <string.h>
 - #include <stdlib.h>
 - #include "cong-document.h"
 -+#include "cong-dispspec.h"
 - #include "cong-error-dialog.h"
 -
 - gboolean
 -@@ -328,7 +329,7 @@
 - 			else if (cong_node_type(n) == CONG_NODE_TYPE_ELEMENT)
 - 			{
 - 				if (!strcmp(cong_node_name(n), "table")) break;
 --				if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n)))
 -+				if (cong_dispspec_element_structural(dispspec, cong_node_get_xmlns(n), xml_frag_name_nice(n)))
 - 				{
 - 					n = n0 = 0;
 - 					break;
 -@@ -352,7 +353,7 @@
 -
 - 		while (n)
 - 		{
 --			if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n))) { n = 0; break; }
 -+			if (cong_dispspec_element_structural(dispspec, cong_node_get_xmlns(n), xml_frag_name_nice(n))) { n = 0; break; }
 - 			if (!cong_node_prev(n)) n = n0 = cong_node_parent(n);
 - 			else break;
 - 		}
 -@@ -417,7 +418,7 @@
 - 			else if (cong_node_type(n) == CONG_NODE_TYPE_ELEMENT)
 - 			{
 - 				if (!strcmp(cong_node_name(n), "table")) break;
 --				if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n)))
 -+				if (cong_dispspec_element_structural(dispspec, cong_node_get_xmlns(n), xml_frag_name_nice(n)))
 - 				{
 - 					n = n0 = 0;
 - 					break;
 -@@ -441,7 +442,7 @@
 -
 - 		while (n)
 - 		{
 --			if (cong_dispspec_element_structural(dispspec, xml_frag_name_nice(n))) { n = 0; break; }
 -+			if (cong_dispspec_element_structural(dispspec, cong_node_get_xmlns(n), xml_frag_name_nice(n))) { n = 0; break; }
 - 			if (!cong_node_next(n)) n = n0 = cong_node_parent(n);
 - 			else break;
 - 		}
 diff -ruN /usr/ports/editors/conglomerate/files/patch-src-xmlview.c conglomerate/files/patch-src-xmlview.c
 --- /usr/ports/editors/conglomerate/files/patch-src-xmlview.c	Sun Aug 31 01:06:15 2003
 +++ conglomerate/files/patch-src-xmlview.c	Thu Jan  1 01:00:00 1970
 @@ -1,11 +0,0 @@
 ---- src/xmlview.c.orig	Tue Jun 10 16:07:16 2003
 -+++ src/xmlview.c	Sat Aug 30 18:57:56 2003
 -@@ -877,7 +877,7 @@
 - 		enum CongNodeType node_type = cong_node_type(x);
 - 		const char *name = xml_frag_name_nice(x);
 -
 --		if (node_type == CONG_NODE_TYPE_ELEMENT && cong_dispspec_element_structural(ds, name))
 -+		if (node_type == CONG_NODE_TYPE_ELEMENT && cong_dispspec_element_structural(ds, cong_node_get_xmlns(x), name))
 - 		{
 - 			return(cong_node_prev(x));
 - 		}
 diff -ruN /usr/ports/editors/conglomerate/pkg-plist conglomerate/pkg-plist
 --- /usr/ports/editors/conglomerate/pkg-plist	Mon Sep  1 09:49:15 2003
 +++ conglomerate/pkg-plist	Fri Sep 19 10:48:30 2003
 @@ -1,16 +1,26 @@
  bin/conglomerate
  share/gnome/applications/conglomerate.desktop
  share/gnome/conglomerate/dispspecs/cnxml.xds
 +share/gnome/conglomerate/dispspecs/dispspec.xds
  share/gnome/conglomerate/dispspecs/docbook.xds
  share/gnome/conglomerate/dispspecs/kernel-traffic-newsletter.xds
  share/gnome/conglomerate/dispspecs/readme.xds
 +share/gnome/conglomerate/dispspecs/relax-ng.xds
  share/gnome/conglomerate/dispspecs/website-layout.xds
  share/gnome/conglomerate/dispspecs/website-webpage.xds
 -share/gnome/conglomerate/dispspecs/xsl.xds
 +share/gnome/conglomerate/dispspecs/xhtml1-strict.xds
 +share/gnome/conglomerate/dtd/xds.dtd
  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/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/glade/cong-file-import.glade
  share/gnome/conglomerate/glade/docbook-common-properties.glade
 +share/gnome/conglomerate/glade/docbook-orderedlist-properties.glade
  share/gnome/help/conglomerate/C/conglomerate.xml
  share/gnome/help/conglomerate/C/figures/conglomerate_logo.png
  share/gnome/help/conglomerate/C/figures/intro.png
 @@ -50,6 +60,7 @@
  share/gnome/pixmaps/cong-wrapper-16.png
  share/gnome/pixmaps/conglomerate-icon-16.png
  share/locale/da/LC_MESSAGES/conglomerate.mo
 +share/locale/de/LC_MESSAGES/conglomerate.mo
  share/locale/es/LC_MESSAGES/conglomerate.mo
  share/locale/nl/LC_MESSAGES/conglomerate.mo
  share/locale/ru/LC_MESSAGES/conglomerate.mo
 @@ -60,6 +71,7 @@
  @dirrm share/gnome/help/conglomerate/C
  @dirrm share/gnome/help/conglomerate
  @dirrm share/gnome/conglomerate/dispspecs
 +@dirrm share/gnome/conglomerate/dtd
  @dirrm share/gnome/conglomerate/examples
  @dirrm share/gnome/conglomerate/glade
  @dirrm share/gnome/conglomerate
State-Changed-From-To: open->closed 
State-Changed-By: tom 
State-Changed-When: Wed Sep 24 10:31:45 PDT 2003 
State-Changed-Why:  
Updated to version 0.7.3, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=56303 
>Unformatted:
