From 44eedc5c44416a97b3f5ca03d596ec3c9fb29380 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Sat, 9 Oct 2004 02:49:33 +0000
Subject: facelift step number two

---
 package/file/file.mk    |  2 +-
 package/file/file.patch | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 package/file/file.patch

(limited to 'package/file')

diff --git a/package/file/file.mk b/package/file/file.mk
index ad21956c7..1bdaf788e 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -18,7 +18,7 @@ file-source: $(DL_DIR)/$(FILE_SOURCE)
 
 $(FILE_DIR)/.unpacked: $(DL_DIR)/$(FILE_SOURCE)
 	$(FILE_CAT) $(DL_DIR)/$(FILE_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	cat $(SOURCE_DIR)/file.patch | patch -p1 -d $(FILE_DIR)
+	toolchain/patch-kernel.sh $(FILE_DIR) package/file/ file\*.patch
 	touch  $(FILE_DIR)/.unpacked
 
 $(FILE_DIR)/.configured: $(FILE_DIR)/.unpacked
diff --git a/package/file/file.patch b/package/file/file.patch
new file mode 100644
index 000000000..b2b7d3c80
--- /dev/null
+++ b/package/file/file.patch
@@ -0,0 +1,30 @@
+--- file-4.10/magic/Makefile.in.orig	2004-07-24 14:38:55.000000000 -0600
++++ file-4.10/magic/Makefile.in	2004-07-28 12:16:23.000000000 -0600
+@@ -490,10 +490,10 @@
+ 	done >> $@
+ 
+ magic.mgc: magic
+-	$(top_builddir)/src/file -C -m magic
++	/usr/bin/file -C -m magic
+ 
+ magic.mime.mgc: magic.mime
+-	$(top_builddir)/src/file -C -m $(srcdir)/magic.mime
++	/usr/bin/file -C -m $(srcdir)/magic.mime
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- file-4.10/magic/Makefile.am.orig	2004-07-24 14:38:55.000000000 -0600
++++ file-4.10/magic/Makefile.am	2004-07-28 12:18:15.000000000 -0600
+@@ -16,10 +16,10 @@
+ 	done >> $@
+ 
+ magic.mgc: magic
+-	$(top_builddir)/src/file -C -m magic
++	/usr/bin/file -C -m magic
+ 
+ magic.mime.mgc: magic.mime
+-	$(top_builddir)/src/file -C -m $(srcdir)/magic.mime
++	/usr/bin/file -C -m $(srcdir)/magic.mime
+ 
+ magic_FRAGMENTS = \
+ Magdir/acorn \
-- 
cgit v1.2.3