2 files changed, 40 insertions, 30 deletions
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