5 files changed, 66 insertions, 38 deletions

diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index b76935f4dfff..7aed3c3c1b32 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/devel/libgsf/Makefile,v 1.17 2005/10/11 22:08:17 marcus Exp $
 #
 
 PORTNAME=	libgsf
-PORTVERSION=	1.11.1
-PORTREVISION?=	1
+PORTVERSION=	1.13.2
+PORTREVISION?=	0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -20,14 +21,21 @@ COMMENT?=	An extensible i/o abstraction for dealing with structured file formats
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
+USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_GNOME?=	gnomehack glib20 libxml2
-USE_LIBTOOL_VER=15
+USE_GNOME?=	gnomehack glib20 libxml2 gconf2 ltverhack intlhack
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
-		--disable-gtk-doc --without-gnome --with-bz2
+		--disable-gtk-doc --without-gnome --with-bz2 \
+		--mandir=${PREFIX}/man
 CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.if !defined(GSF_SLAVE)
+GCONF_SCHEMAS=	gsf-office-thumbnailer.schemas
+MAN1=		gsf-office-thumbnailer.1
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 01cc1c40a6dd..bcd0b44dd610 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgsf-1.11.1.tar.bz2) = b6d867f46e20dca5c6bf2cf3bfc38cfc
-SIZE (gnome2/libgsf-1.11.1.tar.bz2) = 413711
+MD5 (gnome2/libgsf-1.13.2.tar.bz2) = 0894afd88f9e43eada27e52cb22cd0f1
+SIZE (gnome2/libgsf-1.13.2.tar.bz2) = 504413
diff --git a/devel/libgsf/files/patch-doc_Makefile.in b/devel/libgsf/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..2d1069fce2c8
--- /dev/null
+++ b/devel/libgsf/files/patch-doc_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Tue Oct 11 15:56:09 2005
++++ doc/Makefile.in	Tue Oct 11 15:56:24 2005
+@@ -293,7 +293,7 @@
+ # if $(DOC_MODULE).types is non-empty.
+ GTKDOC_CFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS)
+ GTKDOC_LIBS = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS)
+-manpagedir = $(datadir)/man/man1
++manpagedir = $(prefix)/man/man1
+ manpage_DATA = gsf-office-thumbnailer.1
+ @GTK_DOC_INSTALLED_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+ @GTK_DOC_INSTALLED_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in
index 4051a60c2310..ffe67fa45f86 100644
--- a/devel/libgsf/files/patch-gsf-gnome-Makefile.in
+++ b/devel/libgsf/files/patch-gsf-gnome-Makefile.in
@@ -1,30 +1,29 @@
---- gsf-gnome/Makefile.in.orig	Sat May 22 18:56:24 2004
-+++ gsf-gnome/Makefile.in	Sat May 22 18:57:23 2004
-@@ -170,7 +170,7 @@
- 
- lib_LTLIBRARIES = $(target_libgsf_gnome)
- 
--libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS)
-+libgsf_gnome_1_la_LIBADD = $(LIBGSF_GNOME_LIBS)
- libgsf_gnome_1_la_LDFLAGS = -version-info $(VERSION_INFO)
- libgsf_gnome_1_la_SOURCES = \
- 	gsf-input-gnomevfs.c 	\
-@@ -199,7 +199,7 @@
- CONFIG_CLEAN_FILES =
+--- gsf-gnome/Makefile.in.orig	Tue Oct 11 15:47:39 2005
++++ gsf-gnome/Makefile.in	Tue Oct 11 15:50:56 2005
+@@ -54,9 +54,7 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
- 
--libgsf_gnome_1_la_DEPENDENCIES = $(top_builddir)/gsf/libgsf-1.la
-+libgsf_gnome_1_la_DEPENDENCIES =
- am_libgsf_gnome_1_la_OBJECTS = gsf-input-gnomevfs.lo \
- 	gsf-output-gnomevfs.lo gsf-input-bonobo.lo gsf-output-bonobo.lo \
- 	gsf-shared-bonobo-stream.lo
---- gsf-gnome/Makefile.in.orig	Sat May 22 19:26:16 2004
-+++ gsf-gnome/Makefile.in	Sat May 22 19:30:30 2004
-@@ -179,14 +179,15 @@
- 	gsf-output-bonobo.c	\
+ 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
+@@ -273,7 +271,7 @@
+ target_alias = @target_alias@
+ 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 $(VERSION_INFO) $(am__append_1)
+ @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = \
+ @WITH_LIBGSF_GNOME_TRUE@	gsf-input-gnomevfs.c 	\
+@@ -282,13 +280,15 @@
+ @WITH_LIBGSF_GNOME_TRUE@	gsf-output-bonobo.c	\
+ @WITH_LIBGSF_GNOME_TRUE@	gsf-shared-bonobo-stream.c
  
--
 -libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome
 -libgsf_gnome_1_include_HEADERS = \
 -	gsf-input-gnomevfs.h	\
@@ -36,11 +35,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
  
- # include these just in case we are building a tarball without
diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist
index 9f6dc384532b..169911e34ccb 100644
--- a/devel/libgsf/pkg-plist
+++ b/devel/libgsf/pkg-plist
@@ -1,6 +1,10 @@
+bin/gsf-office-thumbnailer
 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
+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-impl-utils.h
 include/libgsf-1/gsf/gsf-infile-impl.h
 include/libgsf-1/gsf/gsf-infile-msole.h
@@ -20,13 +24,16 @@ 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-opendoc-utils.h
 include/libgsf-1/gsf/gsf-outfile-impl.h
 include/libgsf-1/gsf/gsf-outfile-msole.h
 include/libgsf-1/gsf/gsf-outfile-stdio.h
 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-gzip.h
+include/libgsf-1/gsf/gsf-output-iconv.h
 include/libgsf-1/gsf/gsf-output-impl.h
 include/libgsf-1/gsf/gsf-output-iochannel.h
 include/libgsf-1/gsf/gsf-output-memory.h
@@ -38,8 +45,10 @@ include/libgsf-1/gsf/gsf-utils.h
 include/libgsf-1/gsf/gsf.h
 lib/libgsf-1.a
 lib/libgsf-1.so
-lib/libgsf-1.so.12
+lib/libgsf-1.so.113
 libdata/pkgconfig/libgsf-1.pc
+share/doc/gsf/GsfBlob.html
+share/doc/gsf/GsfClipData.html
 share/doc/gsf/api.html
 share/doc/gsf/gsf-Bononbo.html
 share/doc/gsf/gsf-Compression.html
@@ -72,6 +81,7 @@ share/doc/gsf/right.png
 share/doc/gsf/sources.html
 share/doc/gsf/style.css
 share/doc/gsf/up.png
+share/locale/es/LC_MESSAGES/libgsf.mo
 @dirrm share/doc/gsf
 @dirrm include/libgsf-1/gsf-win32
 @dirrm include/libgsf-1/gsf