5 files changed, 41 insertions, 39 deletions

diff --git a/x11-toolkits/vdk/files/patch-vdk-FileDialog.h b/x11-toolkits/vdk/files/patch-include__vdk__FileDialog.h
index ccb8b0dccde0..47f2b42a6a5d 100644
--- a/x11-toolkits/vdk/files/patch-vdk-FileDialog.h
+++ b/x11-toolkits/vdk/files/patch-include__vdk__FileDialog.h
@@ -1,5 +1,5 @@
---- vdk/FileDialog.h.orig	Sun Jun  5 20:03:15 2005
-+++ vdk/FileDialog.h	Sun Jun  5 20:03:31 2005
+--- include/vdk/FileDialog.h.orig	Sun Jun  5 20:03:15 2005
++++ include/vdk/FileDialog.h	Sun Jun  5 20:03:31 2005
 @@ -35,7 +35,9 @@
  #ifndef _USE_FNMATCH
  # include <regex.h>
diff --git a/x11-toolkits/vdk/files/patch-include__vdk__Makefile.in b/x11-toolkits/vdk/files/patch-include__vdk__Makefile.in
new file mode 100644
index 000000000000..6b8aef957e81
--- /dev/null
+++ b/x11-toolkits/vdk/files/patch-include__vdk__Makefile.in
@@ -0,0 +1,10 @@
+--- include/vdk/Makefile.in.bak	2009-11-05 01:32:15.000000000 +0900
++++ include/vdk/Makefile.in	2009-11-24 18:11:45.000000000 +0900
+@@ -191,7 +191,6 @@
+ top_srcdir = @top_srcdir@
+ vdkincludedir = $(includedir)/vdk-@VDK_VERSION_MAJOR@/vdk
+ vdkinclude_HEADERS = \
+-	regex.h\
+ 	gtksourcebuffer.h\
+ 	gtktextsearch.h \
+ 	gtksourcetag.h\
diff --git a/x11-toolkits/vdk/files/patch-src__Makefile.in b/x11-toolkits/vdk/files/patch-src__Makefile.in
new file mode 100644
index 000000000000..54d1f95257b0
--- /dev/null
+++ b/x11-toolkits/vdk/files/patch-src__Makefile.in
@@ -0,0 +1,27 @@
+--- src/Makefile.in.bak	2009-11-05 01:32:15.000000000 +0900
++++ src/Makefile.in	2009-11-24 18:12:19.000000000 +0900
+@@ -51,7 +51,7 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libvdk_@VDK_VERSION_MAJOR@_la_LIBADD =
+-am_libvdk_@VDK_VERSION_MAJOR@_la_OBJECTS = regex.lo gtksourcebuffer.lo \
++am_libvdk_@VDK_VERSION_MAJOR@_la_OBJECTS = gtksourcebuffer.lo \
+ 	gtktextsearch.lo gtksourcetag.lo gtksourceview.lo \
+ 	gtkundomanager.lo gtksourceview-marshal.lo gtktextregion.lo \
+ 	vdkeditor.lo gtkdatabox.lo gtkdataboxmarshal.lo \
+@@ -238,7 +238,6 @@
+ lib_LTLIBRARIES = libvdk-@VDK_VERSION_MAJOR@.la
+ vdkincludedir = $(includedir)/vdk-@VDK_VERSION_MAJOR@
+ libvdk_@VDK_VERSION_MAJOR@_la_SOURCES = \
+-	regex.c\
+ 	gtksourcebuffer.c\
+ 	gtktextsearch.c \
+ 	gtksourcetag.c\
+@@ -434,7 +433,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawobj.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawpixbuf.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawpixmap.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrolled.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/separator.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slider.Plo@am__quote@
diff --git a/x11-toolkits/vdk/files/patch-vdk-vdkclist.cc b/x11-toolkits/vdk/files/patch-src__vdkclist.cc
index f7d181714f8e..88cdb38b9cbe 100644
--- a/x11-toolkits/vdk/files/patch-vdk-vdkclist.cc
+++ b/x11-toolkits/vdk/files/patch-src__vdkclist.cc
@@ -1,5 +1,5 @@
---- vdk/vdkclist.cc.orig	2007-08-03 16:19:09.000000000 +0200
-+++ vdk/vdkclist.cc	2007-08-03 16:20:09.000000000 +0200
+--- src/vdkclist.cc.orig	2007-08-03 16:19:09.000000000 +0200
++++ src/vdkclist.cc	2007-08-03 16:20:09.000000000 +0200
 @@ -26,7 +26,7 @@
   *
   */
diff --git a/x11-toolkits/vdk/files/patch-vdk::Makefile.in b/x11-toolkits/vdk/files/patch-vdk::Makefile.in
deleted file mode 100644
index 53b1f27af7a4..000000000000
--- a/x11-toolkits/vdk/files/patch-vdk::Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
---- vdk/Makefile.in.orig	Wed May 25 00:05:27 2005
-+++ vdk/Makefile.in	Thu Jun  2 13:58:14 2005
-@@ -59,7 +59,7 @@
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libvdk_la_LIBADD =
--am_libvdk_la_OBJECTS = regex.lo gtksourcebuffer.lo gtktextsearch.lo \
-+am_libvdk_la_OBJECTS = gtksourcebuffer.lo gtktextsearch.lo \
- 	gtksourcetag.lo gtksourceview.lo gtkundomanager.lo \
- 	gtksourceview-marshal.lo gtktextregion.lo vdkeditor.lo \
- 	gtkdatabox.lo gtkdataboxmarshal.lo abstract_button.lo \
-@@ -231,7 +231,6 @@
- lib_LTLIBRARIES = libvdk.la
- vdkincludedir = $(includedir)/vdk2/vdk
- vdkinclude_HEADERS = \
--	regex.h\
- 	gtksourcebuffer.h\
- 	gtktextsearch.h \
- 	gtksourcetag.h\
-@@ -330,7 +329,6 @@
- 	vdkdockable.h
- 
- libvdk_la_SOURCES = \
--	regex.c\
- 	gtksourcebuffer.c\
- 	gtktextsearch.c \
- 	gtksourcetag.c\
-@@ -528,7 +526,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawobj.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawpixbuf.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawpixmap.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrolled.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/separator.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slider.Plo@am__quote@