tmux:

	* bump version to 2.0
	* simple test only


git-svn-id: file:///var/svn/freetz/trunk@13097 149334a1-2f27-0410-a3b9-fc62619ac1e6

CHANGELOG

@@ -159,7 +159,7 @@ Latest changes:
     * subversion 1.7.20/1.8.13
     * tinc 1.0.25
     * tinyproxy 1.8.3
-    * tmux 1.8
+    * tmux 2.0
     * tor 0.2.5.12
     * transmission 2.84
     * truecrypt 7.2

make/tmux/Config.in

@@ -1,5 +1,5 @@
 config FREETZ_PACKAGE_TMUX
-	bool "tmux 1.8 (binary only)"
+	bool "tmux 2.0 (binary only)"
 	select FREETZ_LIB_libutil if ! FREETZ_PACKAGE_TMUX_STATIC
 	select FREETZ_LIB_libncurses if ! FREETZ_PACKAGE_TMUX_STATIC
 	select FREETZ_LIB_libevent if ! FREETZ_PACKAGE_TMUX_STATIC

make/tmux/patches/005-no_libresolv.patch

@@ -1,14 +1,14 @@
 --- configure
 +++ configure
-@@ -5009,6 +5009,7 @@
+@@ -5086,6 +5086,7 @@
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
 
 +if false; then
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for b64_ntop with -lresolv" >&5
  $as_echo_n "checking for b64_ntop with -lresolv... " >&6; }
  	LIBS="$LIBS -lresolv"
-@@ -5040,6 +5041,7 @@
+@@ -5117,6 +5118,7 @@
  $as_echo "no" >&6; }
  	fi
  fi

make/tmux/patches/100-use_var_tmp.patch

@@ -1,6 +1,6 @@
 --- compat.h
 +++ compat.h
-@@ -39,7 +39,7 @@
+@@ -43,7 +43,7 @@
 
  #ifndef HAVE_PATHS_H
  #define	_PATH_BSHELL	"/bin/sh"

make/tmux/patches/105-no_opt_CFLAGS.patch

@@ -1,11 +1,11 @@
 --- Makefile.in
 +++ Makefile.in
-@@ -72,7 +72,7 @@
- @IS_DEBUG_TRUE@@IS_GCC_TRUE@	-Winline -Wcast-align \
- @IS_DEBUG_TRUE@@IS_GCC_TRUE@	-Wdeclaration-after-statement
- @IS_DEBUG_TRUE@@IS_GCC_TRUE@am__append_4 = -DDEBUG
--@IS_DEBUG_FALSE@@IS_GCC_TRUE@am__append_5 = -O2
-+@IS_DEBUG_FALSE@@IS_GCC_TRUE@am__append_5 =
- @IS_GCC4_TRUE@@IS_GCC_TRUE@am__append_6 = -iquote. -I/usr/local/include
- @IS_DEBUG_TRUE@@IS_GCC4_TRUE@@IS_GCC_TRUE@am__append_7 = -Wno-pointer-sign
- @IS_GCC4_FALSE@@IS_GCC_TRUE@am__append_8 = -I. -I- -I/usr/local/include
+@@ -88,7 +88,7 @@
+
+ # Set flags for gcc. gcc4 whines abouts silly stuff so it needs slightly
+ # different flags.
+-@IS_GCC_TRUE@am__append_2 = -std=gnu99 -O2
++@IS_GCC_TRUE@am__append_2 = -std=gnu99
+ @IS_DEBUG_TRUE@@IS_GCC_TRUE@am__append_3 = -g -Wno-long-long -Wall -W \
+ @IS_DEBUG_TRUE@@IS_GCC_TRUE@	-Wnested-externs -Wformat=2 \
+ @IS_DEBUG_TRUE@@IS_GCC_TRUE@	-Wmissing-prototypes \

make/tmux/patches/120-b64_ntop-deviating_declaration_and_definition.patch

@@ -1,9 +1,9 @@
 --- compat.h
 +++ compat.h
-@@ -198,7 +198,7 @@
-
+@@ -230,7 +230,7 @@
  #ifndef HAVE_B64_NTOP
  /* b64_ntop.c */
+ #undef b64_ntop /* for Cygwin */
 -int		 b64_ntop(const char *, size_t, char *, size_t);
 +int		 b64_ntop(const unsigned char *, size_t, char *, size_t);
  #endif

make/tmux/patches/121-b64_ntop-ignore_uClibc_define.patch

@@ -1,12 +1,12 @@
 --- compat.h
 +++ compat.h
-@@ -197,6 +197,9 @@
+@@ -228,6 +228,9 @@
  #endif
 
  #ifndef HAVE_B64_NTOP
 +#ifdef b64_ntop
 +#undef b64_ntop
 +#endif
  /* b64_ntop.c */
+ #undef b64_ntop /* for Cygwin */
  int		 b64_ntop(const unsigned char *, size_t, char *, size_t);
- #endif

make/tmux/tmux.mk

@@ -1,6 +1,6 @@
-$(call PKG_INIT_BIN, 1.8)
+$(call PKG_INIT_BIN, 2.0)
 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
-$(PKG)_SOURCE_MD5:=b9477de2fe660244cbc6e6d7e668ea0e
+$(PKG)_SOURCE_MD5:=9fb6b443392c3978da5d599f1e814eaa
 $(PKG)_SITE:=@SF/$(pkg)
 
 $(PKG)_BINARY:=$($(PKG)_DIR)/tmux