[packages_10.03.2] tmux: merge r27847, r27848, r27854, r27981, r29964

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30158 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/utils/tmux/Makefile b/utils/tmux/Makefile
index eaa45bb..71d02ea 100644 (file)
--- a/utils/tmux/Makefile
+++ b/utils/tmux/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2011 OpenWrt.org
+# Copyright (C) 2009-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tmux
-PKG_VERSION:=1.4
+PKG_VERSION:=1.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/tmux
-PKG_MD5SUM:=0bfc7dd9a5bab192406167589c716a21
+PKG_MD5SUM:=3e37db24aa596bf108a0442a81c845b3
 
 PKG_INSTALL:=1
 
@@ -23,7 +23,7 @@ define Package/tmux
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Terminal multiplexer
-  DEPENDS:=+libncurses +libevent +libpthread
+  DEPENDS:=+libncurses +libevent2 +libpthread +librt
   URL:=http://tmux.sourceforge.net/
 endef
 
@@ -33,7 +33,7 @@ endef
 
 MAKE_FLAGS += \
        PREFIX="/usr" \
-       TMUX_PLATFORM="Linux" \
+       PLATFORM="linux"
 
 define Package/tmux/install
        $(INSTALL_DIR) $(1)/usr/bin