6 files changed, 31 insertions, 83 deletions

diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile
index 5d3d444c8f9e..70d56137fb6f 100644
--- a/devel/libgsf-gnome/Makefile
+++ b/devel/libgsf-gnome/Makefile
@@ -21,7 +21,7 @@ PLIST=		${.CURDIR}/pkg-plist
 
 USE_GNOME=	gnomehack libgsf gnomevfs2 ltverhack intlhack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc/gsf \
-		--with-bz2 --with-gnome
+		--with-bz2 --with-gnome --without-gvfs
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgsf-1"
 
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index c35ca7433268..c1180e8aaf46 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	libgsf
-PORTVERSION=	1.14.5
-PORTREVISION?=	2
+PORTVERSION=	1.14.6
+PORTREVISION?=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -28,7 +28,7 @@ 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
+CONFIGURE_ARGS?=--without-gnome --without-python --without-gvfs
 CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 3c6cd601a2fe..76074f00982f 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgsf-1.14.5.tar.bz2) = 0c1a70ca77aef5706544c1b4082a632a
-SHA256 (gnome2/libgsf-1.14.5.tar.bz2) = 54a1432c73e2df93dfe16bd6c11eb56c949da0967479be2e31e2c08ea0ee1901
-SIZE (gnome2/libgsf-1.14.5.tar.bz2) = 541647
+MD5 (gnome2/libgsf-1.14.6.tar.bz2) = 5939265125356730fc1d90c8ee3af7eb
+SHA256 (gnome2/libgsf-1.14.6.tar.bz2) = edd589ae683d5cb6f9475e0164faf1cb790bc3b020f7cf55625181bd766f2ad4
+SIZE (gnome2/libgsf-1.14.6.tar.bz2) = 584878
diff --git a/devel/libgsf/files/patch-gsf-python-Makefile.in b/devel/libgsf/files/patch-gsf-python-Makefile.in
index 007dc120bd4e..3114c2e957d9 100644
--- a/devel/libgsf/files/patch-gsf-python-Makefile.in
+++ b/devel/libgsf/files/patch-gsf-python-Makefile.in
@@ -1,24 +1,28 @@
---- python/Makefile.in.orig	Tue Oct  3 20:31:15 2006
-+++ python/Makefile.in	Tue Oct  3 20:32:17 2006
-@@ -59,15 +59,13 @@
+--- 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)
++_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) \
- 	$(nodist__gsfmodule_la_OBJECTS)
- gnomemodule_la_DEPENDENCIES =  \
+@@ -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) \
- 	$(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
-@@ -312,8 +310,7 @@
+ gnomemodule_la_OBJECTS = $(am_gnomemodule_la_OBJECTS) \
+@@ -299,8 +295,7 @@
  
  gnomemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgnome
  gnomemodule_la_LIBADD = \
@@ -28,7 +32,7 @@
  	$(LIBGSF_LIBS) $(LIBGSF_GNOME_LIBS)
  
  gnomemodule_la_SOURCES = gsfgnomemodule.c
-@@ -323,7 +320,7 @@
+@@ -310,7 +305,7 @@
  	$(LIBGSF_CFLAGS)
  
  _gsfmodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gsf
diff --git a/devel/libgsf/files/patch-thumbnailer_Makefile.in b/devel/libgsf/files/patch-thumbnailer_Makefile.in
deleted file mode 100644
index 6799d7c54716..000000000000
--- a/devel/libgsf/files/patch-thumbnailer_Makefile.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- thumbnailer/Makefile.in.orig	2007-07-12 14:58:43.000000000 -0400
-+++ thumbnailer/Makefile.in	2007-07-12 14:58:29.000000000 -0400
-@@ -127,10 +127,11 @@ FFLAGS = @FFLAGS@
- GCONFTOOL = @GCONFTOOL@
- GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
- GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
-+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
--GREP = @GREP@
- GTK_DOC_INSTALLED_FALSE = @GTK_DOC_INSTALLED_FALSE@
- GTK_DOC_INSTALLED_TRUE = @GTK_DOC_INSTALLED_TRUE@
- GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-@@ -236,9 +237,17 @@ WITH_WIN32_TRUE = @WITH_WIN32_TRUE@
- XGETTEXT = @XGETTEXT@
- Z_CPPFLAGS = @Z_CPPFLAGS@
- Z_LIBS = @Z_LIBS@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_AS = @ac_ct_AS@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
- ac_ct_F77 = @ac_ct_F77@
-+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+ac_ct_WINDRES = @ac_ct_WINDRES@
-+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -255,32 +264,25 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--datarootdir = @datarootdir@
--docdir = @docdir@
--dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
--htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
--localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
--pdfdir = @pdfdir@
- pkgpyexecdir = @pkgpyexecdir@
- pkgpythondir = @pkgpythondir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
--psdir = @psdir@
- pyexecdir = @pyexecdir@
- pythondir = @pythondir@
- sbindir = @sbindir@
diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist
index d1c785f7729f..ad386d90738b 100644
--- a/devel/libgsf/pkg-plist
+++ b/devel/libgsf/pkg-plist
@@ -1,6 +1,8 @@
 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-win32/gsf-input-win32.h
 include/libgsf-1/gsf-win32/gsf-output-win32.h
 include/libgsf-1/gsf/gsf-blob.h
@@ -91,8 +93,16 @@ share/doc/gsf/sources.html
 share/doc/gsf/style.css
 share/doc/gsf/up.png
 share/locale/es/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
+@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-win32
+@dirrm include/libgsf-1/gsf-gvfs
 @dirrm include/libgsf-1/gsf
 @dirrm include/libgsf-1