5 files changed, 35 insertions, 26 deletions
diff --git a/devel/g-wrap/files/patch-Makefile.in b/devel/g-wrap/files/patch-Makefile.in
new file mode 100644
index 000000000000..93024a542005
--- /dev/null
+++ b/devel/g-wrap/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Nov  7 23:40:46 2002
++++ Makefile.in	Tue Feb  4 20:43:51 2003
+@@ -144,7 +144,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = doc rpm bin g-wrap example test
++SUBDIRS = doc rpm bin g-wrap example
+ 
+ guilemoduledir = @GUILEMODDIR@
+ guilemodule_DATA = @GUILEMOD_TARGET@
diff --git a/devel/g-wrap/files/patch-ab b/devel/g-wrap/files/patch-ab
new file mode 100644
index 000000000000..b22e980a6ce2
--- /dev/null
+++ b/devel/g-wrap/files/patch-ab
@@ -0,0 +1,13 @@
+--- doc/g-wrap.texi.orig	Thu Jun 22 06:42:12 2000
++++ doc/g-wrap.texi	Sat Jul 15 12:15:38 2000
+@@ -2,6 +2,10 @@
+ @c %**start of header
+ @setfilename g-wrap.info
+ @settitle g-wrap
++@dircategory Scheme Programming
++@direntry
++* g-wrap: (g-wrap).      A tool for exporting C libraries into Scheme interpreters.
++@end direntry
+ @setchapternewpage on
+ @c Choices for setchapternewpage are {on,off,odd}.
+ @paragraphindent 0
diff --git a/devel/g-wrap/files/patch-g-wrap_Makefile.in b/devel/g-wrap/files/patch-g-wrap_Makefile.in
new file mode 100644
index 000000000000..1e5ab26f8e38
--- /dev/null
+++ b/devel/g-wrap/files/patch-g-wrap_Makefile.in
@@ -0,0 +1,11 @@
+--- g-wrap/Makefile.in.orig	Tue Feb  4 20:45:49 2003
++++ g-wrap/Makefile.in	Tue Feb  4 20:46:00 2003
+@@ -197,7 +197,7 @@
+ 
+ 
+ #AM_CFLAGS = -O2 -g -Wall -Wno-uninitialized -Werror
+-AM_CFLAGS = -O2 -g -Wall -Werror \
++AM_CFLAGS = -Wall -Werror \
+  ${GW_GLIB_CFLAGS_ADD} \
+  ${GW_GUILE_GTK_CFLAGS_ADD}
+ 
diff --git a/devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in b/devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in
deleted file mode 100644
index 6ffbfe171907..000000000000
--- a/devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- guile/g-wrap-2.0-guile.pc.in.orig	Mon Oct 11 06:32:16 2004
-+++ guile/g-wrap-2.0-guile.pc.in	Tue Sep 12 17:10:41 2006
-@@ -5,9 +5,10 @@
- libdir=@libdir@
- includedir=@includedir@
- module_directory=@GUILEMODDIR@
-+ffiincludedir= @includedir@/g-wrap/ffi
- 
- Name: G-Wrap
- Description: A Guile wrapper generator
- Version: @VERSION@
--Libs: -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@ @LIBFFI_LIBS_INSTALLED@
--Cflags: @STD_CFLAGS@ -I${includedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS_INSTALLED@
-+Libs: -L/usr/local/lib/elf -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@
-+Cflags: @STD_CFLAGS@ -I${includedir} -I${ffiincludedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS_INSTALLED@
diff --git a/devel/g-wrap/files/patch-libffi_configure b/devel/g-wrap/files/patch-libffi_configure
deleted file mode 100644
index 2121d0c04a00..000000000000
--- a/devel/g-wrap/files/patch-libffi_configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- libffi/configure.orig	Tue Sep 12 17:01:51 2006
-+++ libffi/configure	Tue Sep 12 17:02:19 2006
-@@ -3285,7 +3285,7 @@
-       ;;
-     esac
- else
--  enable_shared=yes
-+  enable_shared=no # don't build shared lib (or conflict with gcc3*)
- fi;
- 
- # Check whether --enable-static or --disable-static was given.