[packages] mc: update to v4.6.2, update URLs, cleanup

SVN-Revision: 17940

diff --git a/utils/mc/Makefile b/utils/mc/Makefile
index 4ebd10972b9c5ba65ed75c366c335b0c0c0caed8..a99ee63dd0ece26d1b45dbba76e63bd75cf37d57 100644 (file)
--- a/utils/mc/Makefile
+++ b/utils/mc/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mc
-PKG_VERSION:=4.6.1
-PKG_RELEASE:=2
+PKG_VERSION:=4.6.2
+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_BUILD_DEPENDS:=glib1 libncurses
+PKG_SOURCE_URL:=http://www.midnight-commander.org/downloads/
+PKG_MD5SUM:=ec92966f4d0c8b50c344fe901859ae2a
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,7 +22,7 @@ define Package/mc
   CATEGORY:=Utilities
   DEPENDS:=+glib1 +libncurses
   TITLE:=midnight commander - a powerful file manager
-  URL:=http://www.ibiblio.org/mc/
+  URL:=http://www.midnight-commander.org/
   SUBMENU:=filemanager
 endef
 
@@ -39,8 +37,6 @@ define Package/mc/description
 endef
 
 CONFIGURE_ARGS += \
-       --prefix=/usr \
-       --disable-nls \
        --with-included-gettext \
        --with-ncurses \
        --without-sco \
@@ -66,13 +62,11 @@ CONFIGURE_ARGS += \
        --disable-glibtest \
        --with-glib12 \
        --with-glib-prefix="$(STAGING_DIR)/usr" \
-       , \
-       PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
 
 define Package/mc/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mc $(1)/usr/bin
-       ln -sf mc $(1)/usr/bin/mcedit
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mc $(1)/usr/bin/
+       ln -nsf mc $(1)/usr/bin/mcedit
 endef
 
 $(eval $(call BuildPackage,mc))

diff --git a/utils/mc/patches/100-fix-missingsyntax.patch b/utils/mc/patches/100-fix-missingsyntax.patch
index 3e4f737e2edc11f1286572d52eb4c7cede7ea73c..88a78439a14c4af64a2914a1fc86c61bf40abf5c 100644 (file)
--- a/utils/mc/patches/100-fix-missingsyntax.patch
+++ b/utils/mc/patches/100-fix-missingsyntax.patch
@@ -1,19 +1,14 @@
-Index: mc-4.6.1/edit/syntax.c
-===================================================================
---- mc-4.6.1.orig/edit/syntax.c        2007-07-26 17:35:14.000000000 +0200
-+++ mc-4.6.1/edit/syntax.c     2007-07-26 17:35:14.000000000 +0200
-@@ -1113,13 +1113,8 @@
-     f = catstrs (home_dir, SYNTAX_FILE, (char *) NULL);
-     r = edit_read_syntax_file (edit, names, f, edit ? edit->filename : 0,
+--- a/edit/syntax.c
++++ b/edit/syntax.c
+@@ -1193,10 +1193,7 @@ edit_load_syntax (WEdit *edit, char ***p
+     r = edit_read_syntax_file (edit, pnames, f, edit ? edit->filename : 0,
                               get_first_editor_line (edit), type);
--    if (r == -1) {
+     if (r == -1) {
 -      edit_free_syntax_rules (edit);
 -      message (D_ERROR, _(" Load syntax file "),
 -               _(" Cannot open file %s \n %s "), f,
 -               unix_error_string (errno));
-+    if (r == -1) 
-       return;
--    }
-     if (r) {
++      /* missing syntax file */
+     } else if (r) {
        edit_free_syntax_rules (edit);
        message (D_ERROR, _(" Load syntax file "),