X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=utils%2Fmc%2FMakefile;h=b3ba29190c197768754a0b058878c8e3f5d80db9;hb=d65bf1e8ada2765561c7b643e01653311d05bd2b;hp=67d7591ace5c4ff22e8a3b6b82b8338d90af9a9d;hpb=bae28c11de37e7c42dba7f1cceb70535525c5e2f;p=packages.git

diff --git a/utils/mc/Makefile b/utils/mc/Makefile
index 67d7591ac..b3ba29190 100644
--- a/utils/mc/Makefile
+++ b/utils/mc/Makefile
@@ -1,76 +1,96 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mc
-PKG_VERSION:=4.6.1
-PKG_RELEASE:=2
+PKG_VERSION:=4.8.10
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/
-PKG_MD5SUM:=18b20db6e40480a53bac2870c56fc3c4
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.midnight-commander.org/downloads/
+PKG_MD5SUM:=eb4bdc23abd4fdfa14911d53d65c8186
 
-PKG_BUILD_DEPENDS:=glib1 libncurses
+PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/mc
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+glib1 +libncurses
+  DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS)
   TITLE:=midnight commander - a powerful file manager
-  DESCRIPTION:=\
-	GNU Midnight Commander is a text-mode full-screen file manager. \\\
-	It uses a two panel interface and a subshell for command execution. \\\
-	It includes an internal editor with syntax highlighting and an \\\
-	internal viewer with support for binary files. Also included is \\\
-	Virtual Filesystem (VFS), that allows files on remote systems \\\
-	(e.g. FTP, SSH, SMB servers) and files inside archives to be \\\
-	manipulated like real files.
-  URL:=http://www.ibiblio.org/mc/
+  URL:=http://www.midnight-commander.org/
+  SUBMENU:=filemanager
+  MENU:=1
+endef
+
+define Package/mc/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Package/mc/description
+ GNU Midnight Commander is a visual file manager, licensed under GNU General
+ Public License and therefore qualifies as Free Software. It's a feature rich
+ full-screen text mode application that allows you to copy, move and delete
+ files and whole directory trees, search for files and run commands in the
+ subshell.
 endef
 
 CONFIGURE_ARGS += \
-	--prefix=/usr \
-	--disable-nls \
-	--with-included-gettext \
-	--with-ncurses \
-	--without-sco \
-	--without-sunos-curses \
-	--without-osf1-curses \
-	--without-vcurses \
+	--enable-utf8 \
+	--disable-doxygen-doc \
+	--disable-vfs-sftp \
+	--with-screen=ncurses \
 	--without-gpm-mouse \
-	--without-hsc \
-	--without-termnet \
-	--without-debug \
-	--without-efence \
-	--without-terminfo \
-	--without-termcap \
-	--without-slang \
-	--without-vfs \
-	--without-netrc \
-	--without-ext2undel \
-	--without-catgets \
 	--without-x \
-	--without-tk \
-	--without-xview \
-	--without-subshell \
-	--disable-glibtest \
-	--with-glib12 \
-	--with-glib-prefix="$(STAGING_DIR)/usr" \
-	, \
-	PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
+	ac_cv_search_addwstr=no
+
+ifeq ($(CONFIG_MC_DIFF_VIEWER),n)
+CONFIGURE_ARGS += \
+	--without-diff-viewer
+endif
+
+ifeq ($(CONFIG_MC_EDITOR),n)
+CONFIGURE_ARGS += \
+	--without-edit
+endif
+
+ifeq ($(CONFIG_MC_SUBSHELL),n)
+CONFIGURE_ARGS += \
+	--without-subshell
+endif
+
+ifeq ($(CONFIG_MC_DISABLE_VFS),y)
+CONFIGURE_ARGS += \
+	--without-vfs
+endif
 
 define Package/mc/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mc $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/etc/mc
+ifeq ($(CONFIG_MC_DIFF_VIEWER),y)
+	ln -sf mc $(1)/usr/bin/mcdiff
+endif
+ifeq ($(CONFIG_MC_EDITOR),y)
 	ln -sf mc $(1)/usr/bin/mcedit
+endif
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/mc.menu $(1)/etc/mc
+	$(INSTALL_DIR) $(1)/etc/mc/skins
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/skins/default.ini $(1)/etc/mc/skins
+	$(INSTALL_DIR) $(1)/root/.mc/cedit/Syntax
+endef
+
+define Package/mc/conffiles
+/etc/mc/mc.menu
+/etc/mc/skins/default.ini
 endef
 
 $(eval $(call BuildPackage,mc))