4 files changed, 24 insertions, 32 deletions

diff --git a/cad/pcb/files/patch-Makefile.in b/cad/pcb/files/patch-Makefile.in
index 2d383d0cd75c..2eb2fd31d58b 100644
--- a/cad/pcb/files/patch-Makefile.in
+++ b/cad/pcb/files/patch-Makefile.in
@@ -1,11 +1,16 @@
---- Makefile.in.orig	Sat Jul  8 23:14:41 2006
-+++ Makefile.in	Sat Jul  8 23:14:48 2006
-@@ -209,7 +209,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- Makefile.in.orig	2008-02-01 22:31:31.000000000 +0900
++++ Makefile.in	2008-05-06 02:26:40.000000000 +0900
+@@ -270,11 +270,11 @@
  target_alias = @target_alias@
--DIRS = win32 src lib newlib example tools tutorial README_FILES
-+DIRS = src lib newlib example tools tutorial README_FILES
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-DIRS = win32 intl src data lib newlib example tools tutorial README_FILES po
++DIRS = intl src data lib newlib example tools tutorial README_FILES po
  SUBDIRS = ${DIRS} @DOC@
  DIST_SUBDIRS = ${DIRS} doc
- EXTRA_DIST = autogen.sh globalconst.h README.cvs README.win32
+ INTLTOOL_FILES = intltool-extract.in intltool-merge.in  intltool-update.in
+-EXTRA_DIST = config.rpath globalconst.h README.cvs README.win32 icon-theme-installer $(INTLTOOL_FILES)
++EXTRA_DIST = config.rpath globalconst.h README.cvs icon-theme-installer $(INTLTOOL_FILES)
+ DISTCLEANFILES = configure.lineno intltool-extract intltool-merge intltool-update po/.intltool-merge-cache
+ MAINTAINERCLEANFILES = $(INTLTOOL_FILES)
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/cad/pcb/files/patch-doc-Makefile.in b/cad/pcb/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..96acb68d3cb9
--- /dev/null
+++ b/cad/pcb/files/patch-doc-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	2008-06-09 00:39:42.000000000 +0900
++++ doc/Makefile.in	2008-06-09 00:40:06.000000000 +0900
+@@ -15,7 +15,7 @@
+ @SET_MAKE@
+ 
+ VPATH = @srcdir@
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(docdir)
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff --git a/cad/pcb/files/patch-src-autoroute.c b/cad/pcb/files/patch-src-autoroute.c
deleted file mode 100644
index 830c2027cfc8..000000000000
--- a/cad/pcb/files/patch-src-autoroute.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/autoroute.c.orig	Mon Oct  9 15:57:46 2006
-+++ src/autoroute.c	Mon Oct  9 15:58:14 2006
-@@ -647,8 +647,9 @@
- {
-   int is_not_rectangle = 1;
-   int layergroup = GetLayerGroupNumberByNumber (layer);
-+  routebox_t *rb;
-   assert (0 <= layergroup && layergroup < max_layer);
--  routebox_t *rb = AddIrregularObstacle (layergroupboxes,
-+  rb = AddIrregularObstacle (layergroupboxes,
- 					 polygon->BoundingBox.X1,
- 					 polygon->BoundingBox.Y1,
- 					 polygon->BoundingBox.X2,
diff --git a/cad/pcb/files/patch-src-netlist.c b/cad/pcb/files/patch-src-netlist.c
deleted file mode 100644
index 808e7e541bd4..000000000000
--- a/cad/pcb/files/patch-src-netlist.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/netlist.c.orig	Mon Jul 10 11:19:14 2006
-+++ src/netlist.c	Mon Jul 10 11:19:23 2006
-@@ -29,6 +29,8 @@
- /* generic netlist operations
-  */
- 
-+#include <sys/types.h>
-+
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif