From 42b0d187b9ed307d38ada4a7354f1f4c031a35f7 Mon Sep 17 00:00:00 2001
From: Steven Barth <cyrus@openwrt.org>
Date: Sat, 14 Jun 2014 17:39:26 +0000
Subject: [PATCH] tmux: moved to github

SVN-Revision: 41187
---
 utils/tmux/Makefile                           | 43 -------------------
 .../tmux/patches/100-b64_ntop-conflict.patch  | 41 ------------------
 2 files changed, 84 deletions(-)
 delete mode 100644 utils/tmux/Makefile
 delete mode 100644 utils/tmux/patches/100-b64_ntop-conflict.patch

diff --git a/utils/tmux/Makefile b/utils/tmux/Makefile
deleted file mode 100644
index b704b01e5..000000000
--- a/utils/tmux/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tmux
-PKG_VERSION:=1.6
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/tmux
-PKG_MD5SUM:=3e37db24aa596bf108a0442a81c845b3
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tmux
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Terminal multiplexer
-  DEPENDS:=+libncurses +libevent2 +libpthread +librt
-  URL:=http://tmux.sourceforge.net/
-endef
-
-define Package/tmux/description
-  tmux is a modern, BSD-licensed alternative to GNU screen.
-endef
-
-MAKE_FLAGS += \
-	PREFIX="/usr" \
-	PLATFORM="linux"
-
-define Package/tmux/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tmux $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,tmux))
diff --git a/utils/tmux/patches/100-b64_ntop-conflict.patch b/utils/tmux/patches/100-b64_ntop-conflict.patch
deleted file mode 100644
index 8e7a8d7d0..000000000
--- a/utils/tmux/patches/100-b64_ntop-conflict.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: tmux-1.6/compat.h
-===================================================================
---- tmux-1.6.orig/compat.h
-+++ tmux-1.6/compat.h
-@@ -198,7 +198,9 @@ int	 	 daemon(int, int);
- 
- #ifndef HAVE_B64_NTOP
- /* b64_ntop.c */
--int		 b64_ntop(const char *, size_t, char *, size_t);
-+int		 local_b64_ntop(const char *, size_t, char *, size_t);
-+#else
-+#define local_b64_ntop b64_ntop
- #endif
- 
- #ifndef HAVE_FORKPTY
-Index: tmux-1.6/compat/b64_ntop.c
-===================================================================
---- tmux-1.6.orig/compat/b64_ntop.c
-+++ tmux-1.6/compat/b64_ntop.c
-@@ -122,7 +122,7 @@ static const char Pad64 = '=';
-    */
- 
- int
--b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
-+local_b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
- 	size_t datalength = 0;
- 	uint8_t input[3];
- 	uint8_t output[4];
-Index: tmux-1.6/tty.c
-===================================================================
---- tmux-1.6.orig/tty.c
-+++ tmux-1.6/tty.c
-@@ -1006,7 +1006,7 @@ tty_cmd_setselection(struct tty *tty, co
- 	off = 4 * ((ctx->num + 2) / 3) + 1; /* storage for base64 */
- 	buf = xmalloc(off);
- 
--	b64_ntop(ctx->ptr, ctx->num, buf, off);
-+	local_b64_ntop(ctx->ptr, ctx->num, buf, off);
- 	tty_putcode_ptr2(tty, TTYC_MS, "", buf);
- 
- 	xfree(buf);
-- 
2.30.2