From 21d586b47c8c5338913c5e8ca2ee604409cc57a0 Mon Sep 17 00:00:00 2001
From: Qing He <qing.he@intel.com>
Date: Tue, 6 Jul 2010 13:19:10 +0800
Subject: file: upgrade to version 5.04

from 4.18

changes:
  - remove native-fix.patch and sed line in do_configure_prepend,
    AM_CONDITIONAL(IS_CROSS_COMPILE, ...) works well
  - fix the bug of not packaging ${datadir}/misc/magic.mgc,
    without this file, this utility isn't very useful
  - add zlib as explicit build dependency

Signed-off-by: Qing He <qing.he@intel.com>
---
 meta/packages/file/file/native-fix.diff | 13 -------------
 meta/packages/file/file_4.18.bb         | 25 -------------------------
 meta/packages/file/file_5.04.bb         | 27 +++++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 38 deletions(-)
 delete mode 100644 meta/packages/file/file/native-fix.diff
 delete mode 100644 meta/packages/file/file_4.18.bb
 create mode 100644 meta/packages/file/file_5.04.bb

diff --git a/meta/packages/file/file/native-fix.diff b/meta/packages/file/file/native-fix.diff
deleted file mode 100644
index d17215a1b4..0000000000
--- a/meta/packages/file/file/native-fix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: file-4.16/magic/Makefile.am
-===================================================================
---- file-4.16.orig/magic/Makefile.am	2005-08-18 17:20:49.000000000 +0200
-+++ file-4.16/magic/Makefile.am	2006-03-08 17:01:13.000000000 +0100
-@@ -18,7 +18,7 @@
- if IS_CROSS_COMPILE
- FILE_COMPILE = file
- else
--FILE_COMPILE = $(top_builddir)/src/file
-+FILE_COMPILE = ../src/file
- endif
- 
- magic.mgc: magic
diff --git a/meta/packages/file/file_4.18.bb b/meta/packages/file/file_4.18.bb
deleted file mode 100644
index 4c8e64c308..0000000000
--- a/meta/packages/file/file_4.18.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "File attempts to classify files depending \
-on their contents and prints a description if a match is found."
-HOMEPAGE = "http://www.darwinsys.com/file/"
-SECTION = "console/utils"
-
-# two clause BSD
-LICENSE = "BSD"
-
-DEPENDS = "file-native"
-DEPENDS_virtclass-native = ""
-
-SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
-           file://dump \
-           file://filesystems"
-SRC_URI_append_virtclass-native = " file://native-fix.diff;patch=1"
-
-inherit autotools
-
-do_configure_prepend() {
-	sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
-	cp ${WORKDIR}/dump ${S}/magic/Magdir/
-	cp ${WORKDIR}/filesystems ${S}/magic/Magdir/
-}
-
-BBCLASSEXTEND = "native"
diff --git a/meta/packages/file/file_5.04.bb b/meta/packages/file/file_5.04.bb
new file mode 100644
index 0000000000..d872be5dfa
--- /dev/null
+++ b/meta/packages/file/file_5.04.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "File attempts to classify files depending \
+on their contents and prints a description if a match is found."
+HOMEPAGE = "http://www.darwinsys.com/file/"
+SECTION = "console/utils"
+
+# two clause BSD
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188"
+
+DEPENDS = "zlib file-native"
+DEPENDS_virtclass-native = "zlib-native"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
+           file://dump \
+           file://filesystems"
+
+inherit autotools
+
+do_configure_prepend() {
+	cp ${WORKDIR}/dump ${S}/magic/Magdir/
+	cp ${WORKDIR}/filesystems ${S}/magic/Magdir/
+}
+
+FILES_${PN} += "${datadir}/misc/*.mgc"
+
+BBCLASSEXTEND = "native"
-- 
cgit v1.2.3-54-g00ecf