Update to 1.9.0:

Dom:
	* Fix bzip output to flush if last deflate fills buffer

Jody Goldberg:
	* If the file is not an OLE2 file do not change the filepos.
	* Handle broken ole files that specify codepage as signed short
	* Fix reading ole files > 13.6 Meg on sparc/alpha (from Xavier Roche)
	* Tune validation test for LPSTR properties to handle char width > 1
	* Make the impl headers for the base interfaces public as requested
	* Add some directory tree wrappers
	* Work around a -fstrict-alias warning for SuSE
	* Move to automake-1.7
	* Fix gnome-vfs backend to open files with random access
	* Support merging content from nested nodes for sax parsing
	* Fix gtk-doc

Joseph Frazee:
	* patch the spec file.

Morten Welinder:
	* Properly chain finalizer.
	* Fix gzip output to flush if last deflate fills buffer

Tor Lillqvist:
	* packaging tools for win32.

5 files changed, 64 insertions, 76 deletions

diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 510b1959af2..3dc72401cac 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/05 14:06:35 jmmv Exp $
 #
 
-DISTNAME=	libgsf-1.8.2
-PKGREVISION=	7
+DISTNAME=	libgsf-1.9.0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgsf/1.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgsf/1.9/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
@@ -19,7 +18,7 @@ PKGCONFIG_OVERRIDE=	libgsf-1.pc.in
 PKGCONFIG_OVERRIDE+=	libgsf-gnome-1.pc.in
 
 CONFIGURE_ARGS+=	--disable-gtk-doc
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html/libgsf
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/libgsf
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/libgsf/PLIST b/devel/libgsf/PLIST
index 272cccd9969..4f1abf0f490 100644
--- a/devel/libgsf/PLIST
+++ b/devel/libgsf/PLIST
@@ -1,17 +1,21 @@
-@comment $NetBSD: PLIST,v 1.2 2003/10/05 20:20:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/05 14:06:35 jmmv Exp $
 include/libgsf-1/gsf-gnome/gsf-input-bonobo.h
 include/libgsf-1/gsf-gnome/gsf-input-gnomevfs.h
 include/libgsf-1/gsf-gnome/gsf-output-bonobo.h
 include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h
 include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h
+include/libgsf-1/gsf-win32/gsf-input-win32.h
+include/libgsf-1/gsf-win32/gsf-output-win32.h
 include/libgsf-1/gsf/gsf-doc-meta-data.h
 include/libgsf-1/gsf/gsf-impl-utils.h
+include/libgsf-1/gsf/gsf-infile-impl.h
 include/libgsf-1/gsf/gsf-infile-msole.h
-include/libgsf-1/gsf/gsf-infile-msvba.h
+include/libgsf-1/gsf/gsf-infile-stdio.h
 include/libgsf-1/gsf/gsf-infile-zip.h
 include/libgsf-1/gsf/gsf-infile.h
 include/libgsf-1/gsf/gsf-input-bzip.h
 include/libgsf-1/gsf/gsf-input-gzip.h
+include/libgsf-1/gsf/gsf-input-impl.h
 include/libgsf-1/gsf/gsf-input-iochannel.h
 include/libgsf-1/gsf/gsf-input-memory.h
 include/libgsf-1/gsf/gsf-input-stdio.h
@@ -19,11 +23,14 @@ include/libgsf-1/gsf/gsf-input-textline.h
 include/libgsf-1/gsf/gsf-input.h
 include/libgsf-1/gsf/gsf-libxml.h
 include/libgsf-1/gsf/gsf-msole-utils.h
+include/libgsf-1/gsf/gsf-outfile-impl.h
 include/libgsf-1/gsf/gsf-outfile-msole.h
+include/libgsf-1/gsf/gsf-outfile-stdio.h
 include/libgsf-1/gsf/gsf-outfile-zip.h
 include/libgsf-1/gsf/gsf-outfile.h
 include/libgsf-1/gsf/gsf-output-bzip.h
 include/libgsf-1/gsf/gsf-output-gzip.h
+include/libgsf-1/gsf/gsf-output-impl.h
 include/libgsf-1/gsf/gsf-output-iochannel.h
 include/libgsf-1/gsf/gsf-output-memory.h
 include/libgsf-1/gsf/gsf-output-stdio.h
@@ -35,62 +42,57 @@ include/libgsf-1/gsf/gsf.h
 lib/libgsf-1.a
 lib/libgsf-1.la
 lib/libgsf-1.so
-lib/libgsf-1.so.9
-lib/libgsf-1.so.9.2
+lib/libgsf-1.so.10
+lib/libgsf-1.so.10.0
 lib/libgsf-gnome-1.a
 lib/libgsf-gnome-1.la
 lib/libgsf-gnome-1.so
-lib/libgsf-gnome-1.so.9
-lib/libgsf-gnome-1.so.9.2
+lib/libgsf-gnome-1.so.10
+lib/libgsf-gnome-1.so.10.0
 lib/pkgconfig/libgsf-1.pc
 lib/pkgconfig/libgsf-gnome-1.pc
-share/doc/html/libgsf/gsf-gsf-impl-utils.html
-share/doc/html/libgsf/gsf-gsf-infile-msole.html
-share/doc/html/libgsf/gsf-gsf-infile-zip.html
-share/doc/html/libgsf/gsf-gsf-infile.html
-share/doc/html/libgsf/gsf-gsf-input-gnomevfs.html
-share/doc/html/libgsf/gsf-gsf-input-gzip.html
-share/doc/html/libgsf/gsf-gsf-input-memory.html
-share/doc/html/libgsf/gsf-gsf-input-stdio.html
-share/doc/html/libgsf/gsf-gsf-input-textline.html
-share/doc/html/libgsf/gsf-gsf-input.html
-share/doc/html/libgsf/gsf-gsf-libxml.html
-share/doc/html/libgsf/gsf-gsf-outfile.html
-share/doc/html/libgsf/gsf-gsf-output.html
-share/doc/html/libgsf/gsf-gsf-shared-memory.html
-share/doc/html/libgsf/gsf-gsf-utils.html
-share/doc/html/libgsf/gsf-gsf.html
-share/doc/html/libgsf/gsf-gsfinfile.html
-share/doc/html/libgsf/gsf-gsfinput.html
-share/doc/html/libgsf/gsf-gsfoutput.html
-share/doc/html/libgsf/gsf.html
-share/doc/html/libgsf/home.png
-share/doc/html/libgsf/i1987.html
-share/doc/html/libgsf/index.html
-share/doc/html/libgsf/index.sgml
-share/doc/html/libgsf/left.png
-share/doc/html/libgsf/r1058.html
-share/doc/html/libgsf/r1189.html
-share/doc/html/libgsf/r1284.html
-share/doc/html/libgsf/r14.html
-share/doc/html/libgsf/r1420.html
-share/doc/html/libgsf/r1492.html
-share/doc/html/libgsf/r1524.html
-share/doc/html/libgsf/r1704.html
-share/doc/html/libgsf/r1748.html
-share/doc/html/libgsf/r1879.html
-share/doc/html/libgsf/r189.html
-share/doc/html/libgsf/r331.html
-share/doc/html/libgsf/r363.html
-share/doc/html/libgsf/r459.html
-share/doc/html/libgsf/r555.html
-share/doc/html/libgsf/r64.html
-share/doc/html/libgsf/r819.html
-share/doc/html/libgsf/r944.html
-share/doc/html/libgsf/r962.html
-share/doc/html/libgsf/right.png
-share/doc/html/libgsf/up.png
-@dirrm share/doc/html/libgsf
+share/doc/libgsf/gsf-gsf-impl-utils.html
+share/doc/libgsf/gsf-gsf-infile-msole.html
+share/doc/libgsf/gsf-gsf-infile-zip.html
+share/doc/libgsf/gsf-gsf-input-gnomevfs.html
+share/doc/libgsf/gsf-gsf-input-gzip.html
+share/doc/libgsf/gsf-gsf-input-memory.html
+share/doc/libgsf/gsf-gsf-input-stdio.html
+share/doc/libgsf/gsf-gsf-input-textline.html
+share/doc/libgsf/gsf-gsf-input.html
+share/doc/libgsf/gsf-gsf-libxml.html
+share/doc/libgsf/gsf-gsf-output.html
+share/doc/libgsf/gsf-gsf-shared-memory.html
+share/doc/libgsf/gsf-gsf-utils.html
+share/doc/libgsf/gsf-gsf.html
+share/doc/libgsf/gsf-infile-reading-structed-files.html
+share/doc/libgsf/gsf-outfile-writing-structed-files.html
+share/doc/libgsf/gsf.html
+share/doc/libgsf/home.png
+share/doc/libgsf/i3309.html
+share/doc/libgsf/index.html
+share/doc/libgsf/index.sgml
+share/doc/libgsf/left.png
+share/doc/libgsf/r1039.html
+share/doc/libgsf/r1096.html
+share/doc/libgsf/r1247.html
+share/doc/libgsf/r1357.html
+share/doc/libgsf/r14.html
+share/doc/libgsf/r1551.html
+share/doc/libgsf/r197.html
+share/doc/libgsf/r2466.html
+share/doc/libgsf/r2559.html
+share/doc/libgsf/r373.html
+share/doc/libgsf/r447.html
+share/doc/libgsf/r510.html
+share/doc/libgsf/r72.html
+share/doc/libgsf/r736.html
+share/doc/libgsf/r792.html
+share/doc/libgsf/r902.html
+share/doc/libgsf/right.png
+share/doc/libgsf/up.png
+@dirrm share/doc/libgsf
+@dirrm include/libgsf-1/gsf-win32
 @dirrm include/libgsf-1/gsf-gnome
 @dirrm include/libgsf-1/gsf
 @dirrm include/libgsf-1
diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk
index c958f9019aa..0820c4a3bab 100644
--- a/devel/libgsf/buildlink3.mk
+++ b/devel/libgsf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/05/05 14:06:35 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGSF_BUILDLINK3_MK:=	${LIBGSF_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgsf}
 BUILDLINK_PACKAGES+=	libgsf
 
 .if !empty(LIBGSF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgsf+=	libgsf>=1.8.2nb3
-BUILDLINK_RECOMMENDED.libgsf?=	libgsf>=1.8.2nb7
+BUILDLINK_DEPENDS.libgsf+=	libgsf>=1.9.0
 BUILDLINK_PKGSRCDIR.libgsf?=	../../devel/libgsf
 .endif	# LIBGSF_BUILDLINK3_MK
 
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 645d352343d..999ebf29b0a 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/10/09 06:43:42 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/05/05 14:06:35 jmmv Exp $
 
-SHA1 (libgsf-1.8.2.tar.bz2) = 4fcf08be27cda3df9b9af8bc2658ff9b658a72e4
-Size (libgsf-1.8.2.tar.bz2) = 330342 bytes
+SHA1 (libgsf-1.9.0.tar.bz2) = 39fb07fe75b2c960306337d8007a2965873a4601
+Size (libgsf-1.9.0.tar.bz2) = 380030 bytes
 SHA1 (patch-ab) = fb120149076d849c576842889b22cf45e23773e7
diff --git a/devel/libgsf/patches/patch-ab b/devel/libgsf/patches/patch-ab
deleted file mode 100644
index 2f59801c471..00000000000
--- a/devel/libgsf/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/10/05 20:20:18 wiz Exp $
-
---- doc/Makefile.in.orig	Sat Sep 13 06:00:30 2003
-+++ doc/Makefile.in
-@@ -272,6 +272,7 @@ mostlyclean-generic distclean-generic cl
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
- 
-+@ENABLE_GTK_DOC_FALSE@all-local:
- @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
- 
- #### scan ####