Restore patches from 1.14.8.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11520 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 98 insertions, 2 deletions

diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 342bf7e45..13474f04f 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/devel/libgsf/Makefile,v 1.29 2008/09/09 00:08:35 kwm Exp $
 #
 
 PORTNAME=	libgsf
 PORTVERSION=	1.14.9
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in
new file mode 100644
index 000000000..c182f45cc
--- /dev/null
+++ b/devel/libgsf/files/patch-gsf-gnome-Makefile.in
@@ -0,0 +1,43 @@
+--- 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 =
+-@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
+@@ -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
+-@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 =  \
+ @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	\
+-	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
new file mode 100644
index 000000000..3114c2e95
--- /dev/null
+++ b/devel/libgsf/files/patch-gsf-python-Makefile.in
@@ -0,0 +1,43 @@
+--- 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
new file mode 100644
index 000000000..03f4e6379
--- /dev/null
+++ b/devel/libgsf/files/patch-gsf_gsf-shared-memory.c
@@ -0,0 +1,10 @@
+--- 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>