diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/file/Makefile | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/file/Makefile')
| -rw-r--r-- | package/file/Makefile | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/package/file/Makefile b/package/file/Makefile index a3a6c17f2..1c2797ed1 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -6,27 +6,28 @@ include ${TOPDIR}/rules.mk PKG_NAME:= file -PKG_VERSION:= 4.26 +PKG_VERSION:= 5.03 PKG_RELEASE:= 1 -PKG_MD5SUM:= 74cd5466416136da30a4e69f74dbc7a0 -MASTER_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \ +PKG_MD5SUM:= d05f08a53e5c2f51f8ee6a4758c0cc53 +PKG_DESCR:= a file type guesser +PKG_SECTION:= utils +PKG_URL:= http://www.darwinsys.com/file +PKG_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \ ftp://ftp.astron.com/pub/file/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_FILE}/usr/bin - ${INSTALL_DIR} ${IDIR_FILE}/usr/lib - ${INSTALL_DIR} ${IDIR_FILE}/usr/share/file + ${INSTALL_DIR} ${IDIR_FILE}/usr/bin ${IDIR_FILE}/usr/lib ${IDIR_FILE}/usr/share/misc ${INSTALL_BIN} ${WRKINST}/usr/bin/file ${IDIR_FILE}/usr/bin - ${INSTALL_DATA} ${WRKINST}/usr/share/file/magic.mgc \ - ${IDIR_FILE}/usr/share/file + ${INSTALL_DATA} ${WRKINST}/usr/share/misc/magic.mgc \ + ${IDIR_FILE}/usr/share/misc ${CP} ${WRKINST}/usr/lib/libmagic.so.* ${IDIR_FILE}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk |