6 files changed, 33 insertions, 133 deletions

diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 9165e3a8a04a..14363b662d8b 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,49 +1,27 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/libgsf/Makefile,v 1.35 2010/04/10 08:51:15 kwm Exp $
+#   $MCom: ports/trunk/devel/libgsf/Makefile 18401 2013-04-28 12:15:27Z kwm $
 
 PORTNAME=	libgsf
-PORTVERSION=	1.14.21
-PORTREVISION?=	1
-CATEGORIES?=	devel
+PORTVERSION=	1.14.26
+CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT?=	Extensible I/O abstraction for dealing with structured file formats
+COMMENT=	Extensible I/O abstraction for dealing with structured file formats
 
-.if !exists(/usr/lib/libbz2.so)
-LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
-.endif
+BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_GNOME?=	gnomehack gnomeprefix glib20 libxml2 ltverhack intlhack
+USE_GNOME=	gnomeprefix glib20 libxml2 ltverhack intlhack
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \
-		--without-bonobo
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if !defined(GSF_SLAVE)
 MAN1=		gsf.1 gsf-office-thumbnailer.1 gsf-vba-dump.1
-.endif
-
-OPTIONS_DEFINE=	GCONF
-OPTIONS_DEFAULT=	GCONF
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGCONF}
-USE_GNOME+=	gconf2
-. if !defined(GSF_SLAVE)
-GCONF_SCHEMAS=	gsf-office-thumbnailer.schemas
-PLIST_FILES+=	bin/gsf-office-thumbnailer
-. endif
-.else
-CONFIGURE_ARGS+=	--without-gconf
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 68ae69eb057f..f148888fc9a8 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/libgsf-1.14.21.tar.bz2) = eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db
-SIZE (gnome2/libgsf-1.14.21.tar.bz2) = 597463
+SHA256 (gnome2/libgsf-1.14.26.tar.xz) = 8919e725aadd785380350c8dec7427d82cf33164bc9a9a549df9440a0c3da6d5
+SIZE (gnome2/libgsf-1.14.26.tar.xz) = 528960
diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in
deleted file mode 100644
index 4ef836e0b522..000000000000
--- a/devel/libgsf/files/patch-gsf-gnome-Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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 =
--@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES =  \
--@WITH_LIBGSF_GNOME_TRUE@	$(top_builddir)/gsf/libgsf-1.la \
--@WITH_LIBGSF_GNOME_TRUE@	$(am__DEPENDENCIES_1)
-+@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES =
- 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
-@@ -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 = $(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	\
--	gsf-output-gnomevfs.h	\
--	gsf-input-bonobo.h 	\
--	gsf-output-bonobo.h	\
--	gsf-shared-bonobo-stream.h
-+@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_includedir =
-+@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
- 
- all: all-am
- 
diff --git a/devel/libgsf/files/patch-gsf-python-Makefile.in b/devel/libgsf/files/patch-gsf-python-Makefile.in
deleted file mode 100644
index 3114c2e957d9..000000000000
--- a/devel/libgsf/files/patch-gsf-python-Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
---- python/Makefile.in.orig	2007-09-05 10:35:23.000000000 -0500
-+++ python/Makefile.in	2007-09-05 10:38:00.000000000 -0500
-@@ -55,8 +55,7 @@
- pygsfexecLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(pygsfexec_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--_gsfmodule_la_DEPENDENCIES = $(top_builddir)/gsf/libgsf-1.la \
--	$(am__DEPENDENCIES_1)
-+_gsfmodule_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am__gsfmodule_la_OBJECTS = _gsfmodule_la-gsfmodule.lo
- nodist__gsfmodule_la_OBJECTS = _gsfmodule_la-gsf.lo
- _gsfmodule_la_OBJECTS = $(am__gsfmodule_la_OBJECTS) \
-@@ -64,10 +63,7 @@
- _gsfmodule_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(_gsfmodule_la_CFLAGS) \
- 	$(CFLAGS) $(_gsfmodule_la_LDFLAGS) $(LDFLAGS) -o $@
--gnomemodule_la_DEPENDENCIES =  \
--	$(top_builddir)/gsf-gnome/libgsf-gnome-1.la \
--	$(top_builddir)/gsf/libgsf-1.la $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
-+gnomemodule_la_DEPENDENCIES =  $(am__DEPENDENCIES_1)
- am_gnomemodule_la_OBJECTS = gnomemodule_la-gsfgnomemodule.lo
- nodist_gnomemodule_la_OBJECTS = gnomemodule_la-gsfgnome.lo
- gnomemodule_la_OBJECTS = $(am_gnomemodule_la_OBJECTS) \
-@@ -299,8 +295,7 @@
- 
- gnomemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgnome
- gnomemodule_la_LIBADD = \
--	$(top_builddir)/gsf-gnome/libgsf-gnome-1.la	\
--	$(top_builddir)/gsf/libgsf-1.la			\
-+	-lgsf-1 -lgsf-gnome-1 \
- 	$(LIBGSF_LIBS) $(LIBGSF_GNOME_LIBS)
- 
- gnomemodule_la_SOURCES = gsfgnomemodule.c
-@@ -310,7 +305,7 @@
- 	$(LIBGSF_CFLAGS)
- 
- _gsfmodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gsf
--_gsfmodule_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS)
-+_gsfmodule_la_LIBADD = $(LIBGSF_LIBS)
- _gsfmodule_la_SOURCES = gsfmodule.c
- nodist__gsfmodule_la_SOURCES = gsf.c
- all: all-am
diff --git a/devel/libgsf/files/patch-gsf_gsf-shared-memory.c b/devel/libgsf/files/patch-gsf_gsf-shared-memory.c
deleted file mode 100644
index 03f4e6379a1b..000000000000
--- a/devel/libgsf/files/patch-gsf_gsf-shared-memory.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gsf/gsf-shared-memory.c.orig	Wed Sep 11 23:58:35 2002
-+++ gsf/gsf-shared-memory.c	Wed Sep 11 23:58:46 2002
-@@ -21,6 +21,7 @@
- #include <gsf-config.h>
- #include <gsf/gsf-shared-memory.h>
- #include <gsf/gsf-impl-utils.h>
-+#include <sys/types.h>
- 
- #ifdef HAVE_MMAP
- #include <sys/mman.h>
diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist
index 3f71bd38c89b..2ff965774b47 100644
--- a/devel/libgsf/pkg-plist
+++ b/devel/libgsf/pkg-plist
@@ -1,9 +1,11 @@
 bin/gsf
+bin/gsf-office-thumbnailer
 bin/gsf-vba-dump
 include/libgsf-1/gsf/gsf-blob.h
 include/libgsf-1/gsf/gsf-clip-data.h
 include/libgsf-1/gsf/gsf-doc-meta-data.h
 include/libgsf-1/gsf/gsf-docprop-vector.h
+include/libgsf-1/gsf/gsf-fwd.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
@@ -53,13 +55,12 @@ lib/libgsf-1.la
 lib/libgsf-1.so
 lib/libgsf-1.so.114
 libdata/pkgconfig/libgsf-1.pc
+share/doc/gsf/annotation-glossary.html
 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
 share/doc/gsf/gsf-Input-from-unstructured-files.html
 share/doc/gsf/gsf-MS-OLE2.html
@@ -77,7 +78,6 @@ share/doc/gsf/gsf-memory.html
 share/doc/gsf/gsf-metadata.html
 share/doc/gsf/gsf-users.html
 share/doc/gsf/gsf-utils.html
-share/doc/gsf/gsf.devhelp
 share/doc/gsf/gsf.devhelp2
 share/doc/gsf/history.html
 share/doc/gsf/home.png
@@ -96,27 +96,44 @@ share/locale/ca/LC_MESSAGES/libgsf.mo
 share/locale/cs/LC_MESSAGES/libgsf.mo
 share/locale/da/LC_MESSAGES/libgsf.mo
 share/locale/de/LC_MESSAGES/libgsf.mo
+share/locale/el/LC_MESSAGES/libgsf.mo
 share/locale/en_GB/LC_MESSAGES/libgsf.mo
+share/locale/eo/LC_MESSAGES/libgsf.mo
 share/locale/es/LC_MESSAGES/libgsf.mo
 share/locale/eu/LC_MESSAGES/libgsf.mo
 share/locale/fr/LC_MESSAGES/libgsf.mo
 share/locale/gl/LC_MESSAGES/libgsf.mo
+share/locale/id/LC_MESSAGES/libgsf.mo
 share/locale/it/LC_MESSAGES/libgsf.mo
+share/locale/ja/LC_MESSAGES/libgsf.mo
+share/locale/lt/LC_MESSAGES/libgsf.mo
+share/locale/lv/LC_MESSAGES/libgsf.mo
 share/locale/nb/LC_MESSAGES/libgsf.mo
+share/locale/nn/LC_MESSAGES/libgsf.mo
 share/locale/oc/LC_MESSAGES/libgsf.mo
 share/locale/pa/LC_MESSAGES/libgsf.mo
 share/locale/pl/LC_MESSAGES/libgsf.mo
 share/locale/pt/LC_MESSAGES/libgsf.mo
 share/locale/pt_BR/LC_MESSAGES/libgsf.mo
+share/locale/ro/LC_MESSAGES/libgsf.mo
+share/locale/ru/LC_MESSAGES/libgsf.mo
 share/locale/sl/LC_MESSAGES/libgsf.mo
+share/locale/sr/LC_MESSAGES/libgsf.mo
+share/locale/sr@latin/LC_MESSAGES/libgsf.mo
 share/locale/sv/LC_MESSAGES/libgsf.mo
+share/locale/ta/LC_MESSAGES/libgsf.mo
+share/locale/tr/LC_MESSAGES/libgsf.mo
+share/locale/uk/LC_MESSAGES/libgsf.mo
 share/locale/zh_CN/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
+share/thumbnailers/gsf-office.thumbnailer
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrm share/doc/gsf
+@dirrm include/libgsf-1/gsf
+@dirrm include/libgsf-1