6 files changed, 131 insertions, 0 deletions
diff --git a/graphics/librsvg/files/patch-Makefile.in b/graphics/librsvg/files/patch-Makefile.in
new file mode 100644
index 000000000..076b991ec
--- /dev/null
+++ b/graphics/librsvg/files/patch-Makefile.in
@@ -0,0 +1,52 @@
+--- Makefile.in.orig	Fri Jul 27 16:29:51 2001
++++ Makefile.in	Fri Jul 27 16:30:27 2001
+@@ -110,7 +110,7 @@
+ XML_CONFIG = @XML_CONFIG@
+ XML_LIBS = @XML_LIBS@
+ 
+-noinst_PROGRAMS = test-ft-gtk test-ft test-rsvg
++noinst_PROGRAMS = #test-ft-gtk test-ft test-rsvg
+ 
+ bin_SCRIPTS =  	librsvg-config
+ 
+@@ -151,10 +151,10 @@
+ test_rsvg_DEPENDENCIES = $(DEPS)
+ test_rsvg_LDADD = $(LDADDS) -lm
+ 
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(prefix)/share/aclocal
+ m4data_DATA = librsvg.m4
+ 
+-confexecdir = $(libdir)
++confexecdir = $(sysconfdir)
+ confexec_DATA = librsvgConf.sh
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+@@ -188,7 +188,7 @@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+-DATA =  $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA)
++DATA =  $(confexec_DATA) $(m4data_DATA)
+ 
+ HEADERS =  $(librsvginc_HEADERS)
+ 
+@@ -560,8 +560,7 @@
+ 		install-confexecDATA
+ install-exec: install-exec-am
+ 
+-install-data-am: install-m4dataDATA install-pkgconfigDATA \
+-		install-librsvgincHEADERS
++install-data-am: install-m4dataDATA install-librsvgincHEADERS
+ install-data: install-data-am
+ 
+ install-am: all-am
+@@ -579,7 +578,7 @@
+ installdirs:
+ 	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
+ 		$(DESTDIR)$(confexecdir) $(DESTDIR)$(m4datadir) \
+-		$(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(librsvgincdir)
++		$(DESTDIR)$(librsvgincdir)
+ 
+ 
+ mostlyclean-generic:
diff --git a/graphics/librsvg/files/patch-configure b/graphics/librsvg/files/patch-configure
new file mode 100644
index 000000000..e34540082
--- /dev/null
+++ b/graphics/librsvg/files/patch-configure
@@ -0,0 +1,30 @@
+--- configure.orig	Thu Jan 17 13:54:07 2002
++++ configure	Mon Mar 22 23:16:08 2004
+@@ -5397,6 +5397,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -6020,7 +6021,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ char*
+ my_strdup (char *str)
+@@ -6114,7 +6116,8 @@
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ int main() {
+  return 0; 
diff --git a/graphics/librsvg/files/patch-librsvg-config.in b/graphics/librsvg/files/patch-librsvg-config.in
new file mode 100644
index 000000000..2c4c58a19
--- /dev/null
+++ b/graphics/librsvg/files/patch-librsvg-config.in
@@ -0,0 +1,13 @@
+--- librsvg-config.in	2001/10/05 14:55:24	1.1
++++ librsvg-config.in	2001/10/05 15:05:57
+@@ -39,9 +39,7 @@
+       echo @LIBRSVG_VERSION@
+       ;;
+     --cflags)
+-      if test @includedir@ != /usr/include ; then
+-        includes=-I@includedir@
+-      fi
++      includes=-I@includedir@/librsvg-1
+       echo $includes
+       ;;
+     --libs)
diff --git a/graphics/librsvg/files/patch-rsvg-ft.c b/graphics/librsvg/files/patch-rsvg-ft.c
new file mode 100644
index 000000000..60740ddb1
--- /dev/null
+++ b/graphics/librsvg/files/patch-rsvg-ft.c
@@ -0,0 +1,12 @@
+--- rsvg-ft.c.orig	Mon Mar 22 23:16:39 2004
++++ rsvg-ft.c	Mon Mar 22 23:16:57 2004
+@@ -28,7 +28,8 @@
+ #include <stdlib.h>
+ #include <math.h>
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #include <libart_lgpl/art_misc.h>
+ #include <libart_lgpl/art_rect.h>
diff --git a/graphics/librsvg/files/patch-test-ft-gtk.c b/graphics/librsvg/files/patch-test-ft-gtk.c
new file mode 100644
index 000000000..07bc00113
--- /dev/null
+++ b/graphics/librsvg/files/patch-test-ft-gtk.c
@@ -0,0 +1,12 @@
+--- test-ft-gtk.c.orig	Mon Mar 22 23:17:19 2004
++++ test-ft-gtk.c	Mon Mar 22 23:17:38 2004
+@@ -34,7 +34,8 @@
+ 
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #include <libart_lgpl/art_misc.h>
+ #include <libart_lgpl/art_rect.h>
diff --git a/graphics/librsvg/files/patch-test-ft.c b/graphics/librsvg/files/patch-test-ft.c
new file mode 100644
index 000000000..97f323bdb
--- /dev/null
+++ b/graphics/librsvg/files/patch-test-ft.c
@@ -0,0 +1,12 @@
+--- test-ft.c.orig	Mon Mar 22 23:17:54 2004
++++ test-ft.c	Mon Mar 22 23:18:06 2004
+@@ -30,7 +30,8 @@
+ 
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #include <libart_lgpl/art_misc.h>
+ #include <libart_lgpl/art_rect.h>