4 files changed, 30 insertions, 28 deletions

diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index e1960df0f07a..147844c249a6 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgsf/Makefile,v 1.27 2006/10/04 00:03:42 ahze Exp $
+#   $MCom: ports/devel/libgsf/Makefile,v 1.33 2009/01/08 01:28:46 marcus Exp $
 #
 
 PORTNAME=	libgsf
-PORTVERSION=	1.14.8
-PORTREVISION?=	2
+PORTVERSION=	1.14.11
+PORTREVISION?=	0
 CATEGORIES?=	devel
 MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -27,13 +26,14 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_GNOME?=	gnomehack gnomeprefix glib20 libxml2 gconf2 ltverhack intlhack
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS?=--without-gnome --without-python --without-gvfs
+CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \
+		--without-bonobo
 CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if !defined(GSF_SLAVE)
 GCONF_SCHEMAS=	gsf-office-thumbnailer.schemas
-MAN1=		gsf.1 gsf-office-thumbnailer.1
+MAN1=		gsf.1 gsf-office-thumbnailer.1 gsf-vba-dump.1
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 3b84d9be47b2..d56c8857da8e 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgsf-1.14.8.tar.bz2) = 09e4b6639be79fa888cabc751f73674f
-SHA256 (gnome2/libgsf-1.14.8.tar.bz2) = d5f635ea86f8417dd777c32bcf7ef86cf3af3912f34ae21db9933a0e48e54748
-SIZE (gnome2/libgsf-1.14.8.tar.bz2) = 632363
+MD5 (gnome2/libgsf-1.14.11.tar.bz2) = 86bec0012435fbafe02a6e4c88bdf9ba
+SHA256 (gnome2/libgsf-1.14.11.tar.bz2) = ceb5fc6538d5998d83adf3fdf04f1dd344a5d0803c87593fadcd02db7ceabfcf
+SIZE (gnome2/libgsf-1.14.11.tar.bz2) = 637329
diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in
index c182f45cccf8..4ef836e0b522 100644
--- a/devel/libgsf/files/patch-gsf-gnome-Makefile.in
+++ b/devel/libgsf/files/patch-gsf-gnome-Makefile.in
@@ -1,6 +1,6 @@
---- gsf-gnome/Makefile.in.orig	Tue Jun 19 00:39:37 2007
-+++ gsf-gnome/Makefile.in	Tue Jun 19 00:41:22 2007
-@@ -66,9 +66,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+--- gsf-gnome/Makefile.in.orig	2008-10-19 22:08:05.000000000 -0500
++++ gsf-gnome/Makefile.in	2008-10-19 22:12:54.000000000 -0500
+@@ -66,9 +66,7 @@
  libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -11,17 +11,16 @@
  am__libgsf_gnome_1_la_SOURCES_DIST = gsf-input-gnomevfs.c \
  	gsf-output-gnomevfs.c gsf-input-bonobo.c gsf-output-bonobo.c \
  	gsf-shared-bonobo-stream.c
-@@ -309,19 +307,21 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -298,18 +296,20 @@
+ top_srcdir = @top_srcdir@
  AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_GNOME_CFLAGS)
  @WITH_LIBGSF_GNOME_TRUE@lib_LTLIBRARIES = libgsf-gnome-1.la
 -@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS)
 +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(LIBGSF_GNOME_LIBS)
  @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LDFLAGS = -version-info \
  @WITH_LIBGSF_GNOME_TRUE@	$(VERSION_INFO) $(am__append_1)
- @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES =  \
- @WITH_LIBGSF_GNOME_TRUE@	gsf-input-gnomevfs.c \
- @WITH_LIBGSF_GNOME_TRUE@	gsf-output-gnomevfs.c $(am__append_2)
+ @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = $(am__append_2) \
+ @WITH_LIBGSF_GNOME_TRUE@	$(am__append_3)
 -libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome
 -libgsf_gnome_1_include_HEADERS = \
 -	gsf-input-gnomevfs.h	\
@@ -33,11 +32,11 @@
 +@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_include_HEADERS =
 +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome
 +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_include_HEADERS = \
-+@WITH_LIBGSF_GNOME_TRUE@       gsf-input-gnomevfs.h    \
-+@WITH_LIBGSF_GNOME_TRUE@       gsf-output-gnomevfs.h   \
-+@WITH_LIBGSF_GNOME_TRUE@       gsf-input-bonobo.h      \
-+@WITH_LIBGSF_GNOME_TRUE@       gsf-output-bonobo.h     \
-+@WITH_LIBGSF_GNOME_TRUE@       gsf-shared-bonobo-stream.h
++@WITH_LIBGSF_GNOME_TRUE@	gsf-input-gnomevfs.h	\
++@WITH_LIBGSF_GNOME_TRUE@	gsf-output-gnomevfs.h	\
++@WITH_LIBGSF_GNOME_TRUE@	gsf-input-bonobo.h 	\
++@WITH_LIBGSF_GNOME_TRUE@	gsf-output-bonobo.h	\
++@WITH_LIBGSF_GNOME_TRUE@	gsf-shared-bonobo-stream.h
  
  all: all-am
  
diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist
index a5ba6d370bef..99a0e886b406 100644
--- a/devel/libgsf/pkg-plist
+++ b/devel/libgsf/pkg-plist
@@ -1,8 +1,6 @@
 bin/gsf
 bin/gsf-office-thumbnailer
 bin/gsf-vba-dump
-include/libgsf-1/gsf-gvfs/gsf-input-gvfs.h
-include/libgsf-1/gsf-gvfs/gsf-output-gvfs.h
 include/libgsf-1/gsf/gsf-blob.h
 include/libgsf-1/gsf/gsf-clip-data.h
 include/libgsf-1/gsf/gsf-doc-meta-data.h
@@ -12,9 +10,11 @@ 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-tar.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-gio.h
 include/libgsf-1/gsf/gsf-input-gzip.h
 include/libgsf-1/gsf/gsf-input-http.h
 include/libgsf-1/gsf/gsf-input-impl.h
@@ -36,6 +36,7 @@ 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-csv.h
+include/libgsf-1/gsf/gsf-output-gio.h
 include/libgsf-1/gsf/gsf-output-gzip.h
 include/libgsf-1/gsf/gsf-output-iconv.h
 include/libgsf-1/gsf/gsf-output-impl.h
@@ -43,6 +44,7 @@ include/libgsf-1/gsf/gsf-output-iochannel.h
 include/libgsf-1/gsf/gsf-output-memory.h
 include/libgsf-1/gsf/gsf-output-stdio.h
 include/libgsf-1/gsf/gsf-output.h
+include/libgsf-1/gsf/gsf-shared-memory.h
 include/libgsf-1/gsf/gsf-structured-blob.h
 include/libgsf-1/gsf/gsf-timestamp.h
 include/libgsf-1/gsf/gsf-utils.h
@@ -57,6 +59,7 @@ share/doc/gsf/api.html
 share/doc/gsf/dependencies.html
 share/doc/gsf/gsf-Bononbo.html
 share/doc/gsf/gsf-Compression.html
+share/doc/gsf/gsf-GIO.html
 share/doc/gsf/gsf-GIOChannel.html
 share/doc/gsf/gsf-GnomeVFS.html
 share/doc/gsf/gsf-Infile-reading-structed-files.html
@@ -91,15 +94,15 @@ share/doc/gsf/sources.html
 share/doc/gsf/style.css
 share/doc/gsf/up.png
 share/locale/es/LC_MESSAGES/libgsf.mo
+share/locale/nb/LC_MESSAGES/libgsf.mo
 share/locale/oc/LC_MESSAGES/libgsf.mo
 share/locale/sv/LC_MESSAGES/libgsf.mo
 share/locale/zh_HK/LC_MESSAGES/libgsf.mo
 share/locale/zh_TW/LC_MESSAGES/libgsf.mo
+@dirrm share/doc/gsf
+@dirrm include/libgsf-1/gsf
+@dirrm include/libgsf-1
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
-@dirrm share/doc/gsf
-@dirrm include/libgsf-1/gsf-gvfs
-@dirrm include/libgsf-1/gsf
-@dirrm include/libgsf-1