Changeset 30296


Ignore:
Timestamp:
2012-02-05T17:50:54+01:00 (6 years ago)
Author:
jow
Message:

[packages_10.03.2] mc: merge r27620, r27684, r27719, r28135, r29991

Location:
branches/packages_10.03.2/utils/mc
Files:
1 deleted
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/utils/mc/Makefile

    r26762 r30296  
    11#  
    2 # Copyright (C) 2006-2011 OpenWrt.org 
     2# Copyright (C) 2006-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=mc 
    11 PKG_VERSION:=4.7.5.2 
    12 PKG_RELEASE:=1 
     11PKG_VERSION:=4.7.5.3 
     12PKG_RELEASE:=2 
    1313 
    14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     14PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://www.midnight-commander.org/downloads/ 
    16 PKG_MD5SUM:=9fdfe7c0fcff362436eb35fcd1adf0fd 
     16PKG_MD5SUM:=6a67e139e0032d8a871455a80d490941 
    1717 
    1818PKG_BUILD_PARALLEL:=1 
     19PKG_FIXUP:=autoreconf 
    1920 
    2021include $(INCLUDE_DIR)/package.mk 
     
    2425  SECTION:=utils 
    2526  CATEGORY:=Utilities 
    26   DEPENDS:=+glib2 +libncurses +libiconv 
     27  DEPENDS:=+glib2 +libncurses $(ICONV_DEPENDS) 
    2728  TITLE:=midnight commander - a powerful file manager 
    2829  URL:=http://www.midnight-commander.org/ 
    2930  SUBMENU:=filemanager 
    3031  MAINTAINER:=Luka Perkov <openwrt@lukaperkov.net> 
     32  MENU:=1 
     33endef 
     34 
     35define Package/mc/config 
     36        source "$(SOURCE)/Config.in" 
    3137endef 
    3238 
     
    4147CONFIGURE_ARGS += \ 
    4248        --enable-utf8 \ 
    43         --disable-vfs \ 
     49        --disable-doxygen-doc \ 
    4450        --with-screen=ncurses \ 
    45         --without-edit \ 
    4651        --without-gpm-mouse \ 
    47         --without-subshell \ 
    48         --without-x 
     52        --without-x \ 
     53        ac_cv_search_addwstr=no 
    4954 
    50 AM_HOST=$(firstword $(wildcard $(STAGING_DIR_HOST)/share/automake-*)) 
     55ifeq ($(CONFIG_MC_DIFF_VIEWER),n) 
     56CONFIGURE_ARGS += \ 
     57        --without-diff-viewer 
     58endif 
    5159 
    52 define Build/Prepare 
    53         $(Build/Prepare/Default) 
    54         for script in config.guess config.sub depcomp install-sh missing; do \ 
    55                 rm -f $(PKG_BUILD_DIR)/config/$$$$script; \ 
    56                 ln -s $(AM_HOST)/$$$$script $(PKG_BUILD_DIR)/config/$$$$script; \ 
    57         done 
    58 endef 
     60ifeq ($(CONFIG_MC_EDITOR),n) 
     61CONFIGURE_ARGS += \ 
     62        --without-edit 
     63endif 
     64 
     65ifeq ($(CONFIG_MC_SUBSHELL),n) 
     66CONFIGURE_ARGS += \ 
     67        --without-subshell 
     68endif 
     69 
     70ifeq ($(CONFIG_MC_DISABLE_VFS),y) 
     71CONFIGURE_ARGS += \ 
     72        --without-vfs 
     73endif 
    5974 
    6075define Package/mc/install 
    6176        $(INSTALL_DIR) $(1)/usr/bin 
    62         $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mc $(1)/usr/bin/ 
     77        $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mc $(1)/usr/bin 
    6378        $(INSTALL_DIR) $(1)/etc/mc 
     79ifeq ($(CONFIG_MC_DIFF_VIEWER),y) 
     80        ln -sf mc $(1)/usr/bin/mcdiff 
     81endif 
     82ifeq ($(CONFIG_MC_EDITOR),y) 
     83        ln -sf mc $(1)/usr/bin/mcedit 
     84endif 
    6485        $(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/mc.menu $(1)/etc/mc 
    6586        $(INSTALL_DIR) $(1)/etc/mc/skins 
    6687        $(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/skins/default.ini $(1)/etc/mc/skins 
     88        $(INSTALL_DIR) $(1)/root/.mc/cedit/Syntax 
    6789endef 
    6890 
Note: See TracChangeset for help on using the changeset viewer.