aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorgahr <gahr@FreeBSD.org>2012-01-31 19:23:22 +0800
committergahr <gahr@FreeBSD.org>2012-01-31 19:23:22 +0800
commit1f92e761474672e68100090818822f0253aaa50c (patch)
tree1be49280e8387c50164bf6f95bc98652fe472bdf /sysutils
parent94f989add1d5c96cb166a4d32f706da75e26b838 (diff)
downloadfreebsd-ports-gnome-1f92e761474672e68100090818822f0253aaa50c.tar.gz
freebsd-ports-gnome-1f92e761474672e68100090818822f0253aaa50c.tar.zst
freebsd-ports-gnome-1f92e761474672e68100090818822f0253aaa50c.zip
- Update to 1.6
- Install bash completion script [1] PR: 164405 [1] Submitted by: Adam Weinberger <adamw@freebsd.org>
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/tmux/Makefile19
-rw-r--r--sysutils/tmux/distinfo4
2 files changed, 15 insertions, 8 deletions
diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
index 869ca0dfaf61..792c2b9c0c55 100644
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= tmux
-PORTVERSION= 1.5
+PORTVERSION= 1.6
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -15,11 +15,13 @@ COMMENT= A Terminal Multiplexer
LICENSE= BSD
-HAS_CONFIGURE= yes
+USE_AUTOTOOLS= autoconf
MAN1= tmux.1
-PLIST_FILES= bin/tmux
+PLIST_FILES= bin/tmux \
+ etc/bash_completion.d/tmux
+PLIST_DIRSTRY= etc/bash_completion.d
PORTDOCS= CHANGES FAQ NOTES
PORTEXAMPLES= *
@@ -28,18 +30,21 @@ OPTIONS= LIBEVENT2 "Use libevent version 2" Off \
LIBEVENT_STATIC "Build with static libevent" Off \
BACKSPACE "Build with tty/keys patch" Off
+CONFIGURE_ENV+= "LIBEVENT_CFLAGS=${CFLAGS}" \
+ "LIBEVENT_LIBS=${LDFLAGS} -levent"
+
.include <bsd.port.pre.mk>
.if defined(WITH_LIBEVENT2)
LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2
-CPPFLAGS+= -I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
+CFLAGS+= -I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib/event2
. if defined(WITH_LIBEVENT_STATIC)
LESTATIC= ${LOCALBASE}/lib/event2/libevent.a
. endif
.else
LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent
-CPPFLAGS+= -I${LOCALBASE}/include
+CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
. if defined(WITH_LIBEVENT_STATIC)
LESTATIC= ${LOCALBASE}/lib/libevent.a
@@ -55,7 +60,7 @@ post-patch:
${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h ${WRKSRC}/CHANGES
${REINPLACE_CMD} -e '/LIBS=/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT}
.if defined(WITH_LIBEVENT_STATIC)
- ${REINPLACE_CMD} -e '4534s|$$ac_res |${LESTATIC} |' ${WRKSRC}/${CONFIGURE_SCRIPT}
+ ${REINPLACE_CMD} -e 's|$$LIBEVENT_LIBS |${LESTATIC} |' ${WRKSRC}/configure.ac
.endif
do-install:
@@ -63,6 +68,8 @@ do-install:
@${INSTALL_MAN} ${WRKSRC}/tmux.1 ${MANPREFIX}/man/man1
post-install:
+ ${MKDIR} ${PREFIX}/etc/bash_completion.d
+ @${LN} ${WRKSRC}/examples/bash_completion_tmux.sh ${PREFIX}/etc/bash_completion.d/tmux
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for i in ${PORTDOCS}
diff --git a/sysutils/tmux/distinfo b/sysutils/tmux/distinfo
index 5d03bf524519..ff83cf292a64 100644
--- a/sysutils/tmux/distinfo
+++ b/sysutils/tmux/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tmux-1.5.tar.gz) = eb8215b57c05b765d2446d9acb2bc5edcdb3eb4ea31af89ee127a27e90056306
-SIZE (tmux-1.5.tar.gz) = 374093
+SHA256 (tmux-1.6.tar.gz) = faee08ba1bd8c22537cd5b7458881d1bdb4985df88ed6bc5967c56881a7efbd6
+SIZE (tmux-1.6.tar.gz) = 388633