packages/libs/file: make sure to remove magic.mime before regenerating it (#4422)

[openwrt/svn-archive/archive.git] / libs / file / Makefile

diff --git a/libs/file/Makefile b/libs/file/Makefile
index 23d0f0cdb775affa29c26cb44d1caeccae73ab6c..1be259985e6cd993cb9909bf3309abe9c2a715ea 100644 (file)
--- a/libs/file/Makefile
+++ b/libs/file/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,16 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=file
-PKG_VERSION:=4.19
+PKG_VERSION:=4.26
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.astron.com/pub/file/
-PKG_MD5SUM:=1b1e2b495c5aa20c08725f30545a110b
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=74cd5466416136da30a4e69f74dbc7a0
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,37 +22,52 @@ define Package/libmagic
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=+zlib
-  TITLE:=File type determination library
+  TITLE:=Determines file type using "magic" numbers
   URL:=ftp://ftp.astron.com/pub/file/
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               --disable-rpath \
-               --without-libiconv-prefix \
-               --without-libintl-prefix \
-       )
+define Package/file
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libmagic
+  TITLE:=Determines file type using "magic" numbers
+  URL:=ftp://ftp.astron.com/pub/file/
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/src \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+define Package/file/description
+ File tests each argument in an attempt to classify it. There
+ are three sets of tests, performed in this order: filesystem
+ tests, magic number tests, and language tests. The first test
+ that succeeds causes the file type to be printed.
+
+ Starting with version 4, the file command is not much more than
+ a wrapper around the "magic" library. 
 endef
 
-define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/magic.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmagic.{a,so*} $(STAGING_DIR)/usr/lib/
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
+       --disable-rpath \
+       --without-libiconv-prefix \
+       --without-libintl-prefix \
+
+MAKE_FLAGS += \
+       -C $(PKG_BUILD_DIR)/src \
+       DESTDIR="$(PKG_INSTALL_DIR)" \
+       all install \
+
+define Build/Prepare
+       $(call Build/Prepare/Default)
+       chmod -R u+w $(PKG_BUILD_DIR)
 endef
 
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/magic.h \
-               $(STAGING_DIR)/usr/lib/libmagic.{a,so*}
+define Build/InstallDev
+       mkdir -p $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/magic.h $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmagic.{a,so*} $(1)/usr/lib/
 endef
 
 define Package/libmagic/install
@@ -64,4 +75,13 @@ define Package/libmagic/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmagic.so.* $(1)/usr/lib/
 endef
 
+define Package/file/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/share/file
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/file $(1)/usr/bin
+       (cd $(PKG_BUILD_DIR)/magic/Magdir; rm -f magic.mime; for file in `ls`; do cat $$$${file} >> magic.mime; done)
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/magic/Magdir/magic.mime $(1)/usr/share/file/magic
+endef
+
 $(eval $(call BuildPackage,libmagic))
+$(eval $(call BuildPackage,file))