From 4c26f93d42f6b98dc8a85481df47aa53cade4fbd Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 13 May 2009 10:04:25 +0000
Subject: Update to 1.14.13. Set LICENSE to gnu-gpl-v2 # AND gnu-lgpl-v2.1

libgsf 1.14.13

Andreas:
	* Fix gsf_opendoc_metadata_subtree [#581530]

--------------------------------------------------------------------------
libgsf 1.14.12

Andreas:
	* Also read user defined OpenDocument metadata

Christian Persch:
	* Fix allocation method problem.  [#579155]

J.H.M. Dassen (Ray):
	* Fix incorrect use of g_enum_register_static which broke
	  documentation generation in some environments.
	  [http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39015]

Jody :
	* Handle small-block files that are not block aligned. [#572290]
	* Deprecate gsf_timestamp_parse and replace it with
	  gsf_timestamp_from_string.
	* Gtk-Doc fixes.
	* Fix handling of namespace declared default and prefix.
	  (Such as in SpreadsheetML-2003)

Morten:
	* Handle malformed xml better.  [#568994]
	* Drop characters that xml 1.0 cannot represent.  [#568919]
	* Fix problem loading zero-sized files.  [#580228]
---
 devel/libgsf/Makefile         |  6 ++++--
 devel/libgsf/distinfo         |  9 ++++-----
 devel/libgsf/patches/patch-ab | 27 ---------------------------
 3 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 devel/libgsf/patches/patch-ab

(limited to 'devel/libgsf')

diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 7ed661d5271..c766568759a 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2009/01/07 22:11:27 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2009/05/13 10:04:25 wiz Exp $
 #
 
-DISTNAME=	libgsf-1.14.11
+DISTNAME=	libgsf-1.14.13
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgsf/1.14/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME2 structured file library
 
+LICENSE=	gnu-gpl-v2 # AND gnu-lgpl-v2.1
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 72e7ad1e9f8..eb2f47ae910 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.28 2009/01/25 22:13:08 sketch Exp $
+$NetBSD: distinfo,v 1.29 2009/05/13 10:04:25 wiz Exp $
 
-SHA1 (libgsf-1.14.11.tar.bz2) = 9f097ba5e3d538f6810ae27941a918964aea1de9
-RMD160 (libgsf-1.14.11.tar.bz2) = 5654eaedd6e40622d2f8385a0ac27d5d2e3959b1
-Size (libgsf-1.14.11.tar.bz2) = 637329 bytes
+SHA1 (libgsf-1.14.13.tar.bz2) = 47a932dfc881845e1ef114e0fb3e2c37ea1486c3
+RMD160 (libgsf-1.14.13.tar.bz2) = 3601c1bd68af38ddd21a7912ce215485f1deebd5
+Size (libgsf-1.14.13.tar.bz2) = 596487 bytes
 SHA1 (patch-aa) = 2bfd206d45abd91ed8d5237df76a6128383e1322
-SHA1 (patch-ab) = d198bd69d2a73e94ea012d2b333a3a9a422b72f3
diff --git a/devel/libgsf/patches/patch-ab b/devel/libgsf/patches/patch-ab
deleted file mode 100644
index b0bed91d5db..00000000000
--- a/devel/libgsf/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2009/01/25 22:13:08 sketch Exp $
-
---- doc/Makefile.in.orig	Sun Jan 25 22:08:45 2009
-+++ doc/Makefile.in	Sun Jan 25 22:09:55 2009
-@@ -637,8 +637,9 @@
- @GTK_DOC_INSTALLED_TRUE@	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
- @GTK_DOC_INSTALLED_TRUE@	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- @GTK_DOC_INSTALLED_TRUE@	  fi; \
--@GTK_DOC_INSTALLED_TRUE@	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+@GTK_DOC_INSTALLED_TRUE@	  if type gtkdoc-rebase >/dev/null; then \
- @GTK_DOC_INSTALLED_TRUE@	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
-+@GTK_DOC_INSTALLED_TRUE@	  fi; \
- @GTK_DOC_INSTALLED_TRUE@	fi
- 
- @GTK_DOC_INSTALLED_TRUE@uninstall-local:
-@@ -667,8 +668,9 @@
- @GTK_DOC_INSTALLED_TRUE@	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- @GTK_DOC_INSTALLED_TRUE@	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- @GTK_DOC_INSTALLED_TRUE@	cd $(distdir) && rm -f $(DISTCLEANFILES)
--@GTK_DOC_INSTALLED_TRUE@	! which gtkdoc-rebase >/dev/null 2>&1 || \
--@GTK_DOC_INSTALLED_TRUE@	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-+@GTK_DOC_INSTALLED_TRUE@	if type gtkdoc-rebase >/dev/null; then \
-+@GTK_DOC_INSTALLED_TRUE@	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html; \
-+@GTK_DOC_INSTALLED_TRUE@	fi
- 
- @GTK_DOC_INSTALLED_TRUE@.PHONY : dist-hook-local docs
- @GTK_DOC_INSTALLED_TRUE@.PHONY : dist-hook-local
-- 
cgit v1.2.3