5 files changed, 47 insertions, 14 deletions

diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index b978af7042b2..ee3746f4bc48 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	libgsf
-PORTVERSION=	1.14.3
-PORTREVISION?=	1
+PORTVERSION=	1.14.4
+PORTREVISION?=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 664b016d6251..c288d1617b71 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgsf-1.14.3.tar.bz2) = c707a7ffc3e2bf802556bae86a453020
-SHA256 (gnome2/libgsf-1.14.3.tar.bz2) = 906139a86ddadc125d5ade3ebbbd0f2bf0749f12e08592157e4228cd17d318e4
-SIZE (gnome2/libgsf-1.14.3.tar.bz2) = 543791
+MD5 (gnome2/libgsf-1.14.4.tar.bz2) = 2d07ad2f1336c101ce14982ba7289f80
+SHA256 (gnome2/libgsf-1.14.4.tar.bz2) = e68ee826bda241ac847420043f0335c1c84cdf7ee772d672ae392ff21815e7f0
+SIZE (gnome2/libgsf-1.14.4.tar.bz2) = 543158
diff --git a/devel/libgsf/files/patch-configure b/devel/libgsf/files/patch-configure
new file mode 100644
index 000000000000..b73f5dfac9d3
--- /dev/null
+++ b/devel/libgsf/files/patch-configure
@@ -0,0 +1,32 @@
+--- configure.orig	Tue Jun 19 00:45:29 2007
++++ configure	Tue Jun 19 00:46:52 2007
+@@ -25107,13 +25107,6 @@ else
+ fi
+ 
+ 
+-if test $WITH_BONOBO = yes; then
+-  WITH_BONOBO_TRUE=
+-  WITH_BONOBO_FALSE='#'
+-else
+-  WITH_BONOBO_TRUE='#'
+-  WITH_BONOBO_FALSE=
+-fi
+ 
+ 
+     if test $WITH_BONOBO = yes; then
+@@ -25215,6 +25208,15 @@ else
+   WITH_LIBGSF_GNOME_TRUE='#'
+   WITH_LIBGSF_GNOME_FALSE=
+ fi
++
++if test $WITH_BONOBO = yes; then
++  WITH_BONOBO_TRUE=
++  WITH_BONOBO_FALSE='#'
++else
++  WITH_BONOBO_TRUE='#'
++  WITH_BONOBO_FALSE=
++fi
++
+ 
+ 
+ # ===================
diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in
index 6337cb21df7d..c182f45cccf8 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	Mon Nov  7 00:22:33 2005
-+++ gsf-gnome/Makefile.in	Mon Nov  7 00:23:42 2005
-@@ -60,9 +60,7 @@
+--- 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)" 
  libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -11,7 +11,7 @@
  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
-@@ -277,7 +275,7 @@
+@@ -309,19 +307,21 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_GNOME_CFLAGS)
  @WITH_LIBGSF_GNOME_TRUE@lib_LTLIBRARIES = libgsf-gnome-1.la
@@ -19,11 +19,9 @@
 +@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 = \
-@@ -287,13 +285,15 @@
- @WITH_LIBGSF_GNOME_TRUE@	gsf-output-bonobo.c	\
- @WITH_LIBGSF_GNOME_TRUE@	gsf-shared-bonobo-stream.c
- 
+ @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)
 -libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome
 -libgsf_gnome_1_include_HEADERS = \
 -	gsf-input-gnomevfs.h	\
diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist
index 4eef810962b2..16dbaa8c5be5 100644
--- a/devel/libgsf/pkg-plist
+++ b/devel/libgsf/pkg-plist
@@ -16,6 +16,7 @@ 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-http.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
@@ -26,6 +27,7 @@ include/libgsf-1/gsf/gsf-input.h
 include/libgsf-1/gsf/gsf-libxml.h
 include/libgsf-1/gsf/gsf-meta-names.h
 include/libgsf-1/gsf/gsf-msole-utils.h
+include/libgsf-1/gsf/gsf-open-pkg-utils.h
 include/libgsf-1/gsf/gsf-opendoc-utils.h
 include/libgsf-1/gsf/gsf-outfile-impl.h
 include/libgsf-1/gsf/gsf-outfile-msole.h
@@ -68,6 +70,7 @@ share/doc/gsf/gsf-Text.html
 share/doc/gsf/gsf-XML-and-libxml.html
 share/doc/gsf/gsf-Zip.html
 share/doc/gsf/gsf-blobs.html
+share/doc/gsf/gsf-index.html
 share/doc/gsf/gsf-memory.html
 share/doc/gsf/gsf-metadata.html
 share/doc/gsf/gsf-users.html