svn commit: r385629 - in head/sysutils/tmux: . files

[Mathieu Arnold]

Author: mat
Date: Thu May  7 14:18:24 2015
New Revision: 385629
URL: https://svnweb.freebsd.org/changeset/ports/385629

Log:
  Update to 2.0.
  
  Now links with libutempter (libulog).
  
  Changes:	http://heanet.dl.sourceforge.net/project/tmux/tmux/tmux-2.0/tmux-2.0-readme
  Sponsored by:	Absolight

Modified:
  head/sysutils/tmux/Makefile
  head/sysutils/tmux/distinfo
  head/sysutils/tmux/files/extra-patch-tty-keys.c
  head/sysutils/tmux/files/patch-configure

Modified: head/sysutils/tmux/Makefile
==============================================================================
--- head/sysutils/tmux/Makefile	Thu May  7 14:07:34 2015	(r385628)
+++ head/sysutils/tmux/Makefile	Thu May  7 14:18:24 2015	(r385629)
@@ -2,15 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	tmux
-PORTVERSION=	1.9a
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//}
 
 MAINTAINER=	mat at FreeBSD.org
 COMMENT=	Terminal Multiplexer
 
-LICENSE=	BSD2CLAUSE
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig shebangfix ncurses
 SHEBANG_FILES=	examples/tmux_backup.sh
@@ -25,15 +25,11 @@ PLIST_FILES=	bin/tmux \
 PORTDOCS=	CHANGES FAQ README TODO
 PORTEXAMPLES=	*
 
-PORTSCOUT=	skipv:1.9
-
 OPTIONS_DEFINE=	DOCS EXAMPLES LIBEVENT_STATIC BACKSPACE
 
 LIBEVENT_STATIC_DESC=	Build with static libevent
 BACKSPACE_DESC=	Build with tty/keys patch
 
-CFLAGS+=	-Wno-pointer-sign
-
 BACKSPACE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
 
 LIBEVENT_STATIC_LIB_DEPENDS_OFF=	libevent.so:${PORTSDIR}/devel/libevent2
@@ -41,6 +37,12 @@ LIBEVENT_STATIC_BUILD_DEPENDS=	${LOCALBA
 
 .include <bsd.port.options.mk>
 
+.if ${OSVERSION} < 900004
+LIB_DEPENDS+=   libutempter.so:${PORTSDIR}/sysutils/libutempter
+CFLAGS+=        -I${LOCALBASE}/include
+LDFLAGS+=       -L${LOCALBASE}/lib
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' ${WRKSRC}/CHANGES
 

Modified: head/sysutils/tmux/distinfo
==============================================================================
--- head/sysutils/tmux/distinfo	Thu May  7 14:07:34 2015	(r385628)
+++ head/sysutils/tmux/distinfo	Thu May  7 14:18:24 2015	(r385629)
@@ -1,2 +1,2 @@
-SHA256 (tmux-1.9a.tar.gz) = c5e3b22b901cf109b20dab54a4a651f0471abd1f79f6039d79b250d21c2733f5
-SIZE (tmux-1.9a.tar.gz) = 447938
+SHA256 (tmux-2.0.tar.gz) = 795f4b4446b0ea968b9201c25e8c1ef8a6ade710ebca4657dd879c35916ad362
+SIZE (tmux-2.0.tar.gz) = 455754

Modified: head/sysutils/tmux/files/extra-patch-tty-keys.c
==============================================================================
--- head/sysutils/tmux/files/extra-patch-tty-keys.c	Thu May  7 14:07:34 2015	(r385628)
+++ head/sysutils/tmux/files/extra-patch-tty-keys.c	Thu May  7 14:18:24 2015	(r385629)
@@ -1,6 +1,6 @@
---- tty-keys.c.orig	2013-03-27 14:37:25.000000000 +0100
-+++ tty-keys.c	2013-03-27 14:37:44.000000000 +0100
-@@ -529,8 +529,6 @@
+--- tty-keys.c.orig	2015-05-05 20:21:51 UTC
++++ tty-keys.c
+@@ -556,8 +556,6 @@ first_key:
  	 * used. termios should have a better idea.
  	 */
  	bspace = tty->tio.c_cc[VERASE];

Modified: head/sysutils/tmux/files/patch-configure
==============================================================================
--- head/sysutils/tmux/files/patch-configure	Thu May  7 14:07:34 2015	(r385628)
+++ head/sysutils/tmux/files/patch-configure	Thu May  7 14:18:24 2015	(r385629)
@@ -1,6 +1,6 @@
---- configure.bak	2014-02-22 15:56:15.000000000 -0500
-+++ configure	2014-09-16 12:14:41.103867989 -0400
-@@ -4975,7 +4975,7 @@
+--- configure.orig	2015-05-06 22:49:42 UTC
++++ configure
+@@ -5002,7 +5002,7 @@ return setupterm ();
    return 0;
  }
  _ACEOF
@@ -9,7 +9,7 @@
    if test -z "$ac_lib"; then
      ac_res="none required"
    else
-@@ -5692,6 +5692,28 @@
+@@ -5755,6 +5755,28 @@ $as_echo "yes" >&6; }
  	fi
  fi
  if test "x$found_strnvis" = xyes; then