summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/tmux/Makefile6
-rw-r--r--misc/tmux/distinfo11
-rw-r--r--misc/tmux/patches/patch-ab19
-rw-r--r--misc/tmux/patches/patch-ac13
4 files changed, 13 insertions, 36 deletions
diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile
index a64af627883..646df6ed9b3 100644
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2010/02/23 10:56:04 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/21 12:55:54 jmmv Exp $
-DISTNAME= tmux-1.1
-PKGREVISION= 1
+DISTNAME= tmux-1.3
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tmux/}
@@ -15,5 +14,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
HAS_CONFIGURE= yes
USE_TERMINFO= yes
+.include "../../devel/libevent/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo
index 8d69507472d..31e3cb5f686 100644
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2010/02/22 19:07:41 drochner Exp $
+$NetBSD: distinfo,v 1.11 2010/12/21 12:55:54 jmmv Exp $
-SHA1 (tmux-1.1.tar.gz) = 8dc57a70605930bbe61664bd52ed2c8081ea5a1c
-RMD160 (tmux-1.1.tar.gz) = 9f03922c0be46e9259202ed2fdc0834dcf01581c
-Size (tmux-1.1.tar.gz) = 230955 bytes
+SHA1 (tmux-1.3.tar.gz) = 4d132a5fa25ef049e023f154824f39b0d7e72ab0
+RMD160 (tmux-1.3.tar.gz) = 7c895562c7810117d610c420901110c7e206bebf
+Size (tmux-1.3.tar.gz) = 251999 bytes
SHA1 (patch-aa) = e50976effc9fa43044d45055aabd86a69d9d9047
-SHA1 (patch-ab) = 8309eeec1f1ea1222b52fcd6940b9d49feb9e94c
-SHA1 (patch-ac) = e308390602756b03197715de648710ea6441f348
+SHA1 (patch-ab) = b47bc0846aa8b732d3600e9917011d8e79311408
diff --git a/misc/tmux/patches/patch-ab b/misc/tmux/patches/patch-ab
index 7aa1735e3ee..19c9554cced 100644
--- a/misc/tmux/patches/patch-ab
+++ b/misc/tmux/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2010/02/22 19:07:42 drochner Exp $
+$NetBSD: patch-ab,v 1.7 2010/12/21 12:55:55 jmmv Exp $
---- configure.orig 2009-10-25 22:09:56.000000000 +0000
+--- configure.orig 2010-06-06 13:00:47.000000000 +0000
+++ configure
-@@ -200,7 +200,7 @@ SRCS+= osdep-darwin.c \
+@@ -205,7 +205,7 @@ SRCS+= osdep-darwin.c \
EOF
;;
# ------------------------------------------------------------------------------
@@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.6 2010/02/22 19:07:42 drochner Exp $
+ FreeBSD)
cat <<EOF >>$CONFIG_H
#define HAVE_ASPRINTF
- #define HAVE_BZERO
-@@ -230,6 +230,38 @@ SRCS+= osdep-freebsd.c \
+ #define HAVE_BROKEN_KQUEUE
+@@ -236,6 +236,38 @@ SRCS+= osdep-freebsd.c \
EOF
;;
# ------------------------------------------------------------------------------
@@ -50,12 +50,3 @@ $NetBSD: patch-ab,v 1.6 2010/02/22 19:07:42 drochner Exp $
NetBSD)
cat <<EOF >>$CONFIG_H
#define HAVE_ASPRINTF
-@@ -252,7 +284,7 @@ EOF
- cat <<EOF >>$CONFIG_MK
- CPPFLAGS+= -I/usr/pkg/include
- LDFLAGS+= -L/usr/pkg/lib
--LIBS+= -lncurses -lcrypt -lutil
-+LIBS+= -lcurses -lcrypt -lutil
- SRCS+= osdep-netbsd.c \
- compat/strtonum.c \
- compat/vis.c \
diff --git a/misc/tmux/patches/patch-ac b/misc/tmux/patches/patch-ac
deleted file mode 100644
index 7f365312add..00000000000
--- a/misc/tmux/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2009/09/25 16:38:22 hasso Exp $
-
---- tty-term.c.orig 2009-09-24 15:58:21.000000000 +0200
-+++ tty-term.c
-@@ -18,7 +18,7 @@
-
- #include <sys/types.h>
-
--#include <curses.h>
-+#include <ncurses.h>
- #include <fnmatch.h>
- #include <stdlib.h>
- #include <string.h>