Attachment #140577 for bug #187210

View | Details | Raw Unified | Return to bug 187210
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	tmux
PORTVERSION=	1.9
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}



CFLAGS+=	-Wno-pointer-sign

BACKSPACE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
LIBEVENT2_CONFIGURE_ENV=	LIBEVENT_CFLAGS="-I${LOCALBASE}/include/event2/compat" \
							LIBEVENT_LIBS="-L${LOCALBASE}/lib/event2 -levent"
LIBEVENT2_CONFIGURE_ENV_OFF=LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \
							LIBEVENT_LIBS="-L${LOCALBASE}/lib -levent"
LIBEVENT2_LIB_DEPENDS=		libevent-2.0.so:${PORTSDIR}/devel/libevent2
LIBEVENT2_LIB_DEPENDS_OFF=	libevent-1.4.so:${PORTSDIR}/devel/libevent

.include <bsd.port.options.mk>

post-patch:
	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' \
		${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h ${WRKSRC}/CHANGES
	@${REINPLACE_CMD} -e '/LIBS=/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT}

.if ${PORT_OPTIONS:MLIBEVENT_STATIC}
.if ${PORT_OPTIONS:MLIBEVENT2}
CONFIGURE_ENV+=	LIBEVENT_CFLAGS="-I${LOCALBASE}/include/event2/compat" \
		LIBEVENT_LIBS="-L${LOCALBASE}/lib/event2 -levent"
. if ${PORT_OPTIONS:MLIBEVENT_STATIC}
BUILD_DEPENDS+=	${LOCALBASE}/lib/event2/libevent.a:${PORTSDIR}/devel/libevent2
LESTATIC=	${LOCALBASE}/lib/event2/libevent.a
. else
LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
. endif
.else
CONFIGURE_ENV+=	LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \
		LIBEVENT_LIBS="-L${LOCALBASE}/lib -levent"
. if ${PORT_OPTIONS:MLIBEVENT_STATIC}
BUILD_DEPENDS+=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
LESTATIC=	${LOCALBASE}/lib/libevent.a
. else
LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
. endif
.endif

.if ${PORT_OPTIONS:MBACKSPACE}
EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' \
		${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h ${WRKSRC}/CHANGES
	@${REINPLACE_CMD} -e '/LIBS=/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT}

post-configure:
.if defined(WITH_LIBEVENT_STATIC)
	${REINPLACE_CMD} -e '/LIBS/s|-levent[^[:blank:]]*|${LESTATIC}|' \
		${WRKSRC}/${MAKEFILE}
.endif

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/tmux ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/tmux.1 ${STAGEDIR}${MANPREFIX}/man/man1
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
	${INSTALL_DATA} ${WRKSRC}/examples/bash_completion_tmux.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (tmux-1.8.tar.gz) = f265401ca890f8223e09149fcea5abcd6dfe75d597ab106e172b01e9d0c9cd44	1	SHA256 (tmux-1.9.tar.gz) = 3ee6ca093513aca816e9d3cc62f9f2ab89b1d2a5a237ed967957ebedd99a1e27
2	SIZE (tmux-1.8.tar.gz) = 417537	2	SIZE (tmux-1.9.tar.gz) = 447027




$FreeBSD$

Apply upstream commit cbee283c26968304b473e2191d2bb5f52208b58d to prevent
OS X's Terminal.app turning on underlining when the status bar contains
bold characters.

--- tty.c
+++ tty.c
@@ -220,7 +220,7 @@ tty_start_tty(struct tty *tty)
 		tty_puts(tty, "\033[?1000l\033[?1006l\033[?1005l");
 
 	if (tty_term_has(tty->term, TTYC_XT))
-		tty_puts(tty, "\033[c\033[>4;1m\033[?1004h");
+		tty_puts(tty, "\033[c\033[>4;1m\033[?1004h\033[m");
 
 	tty->cx = UINT_MAX;
 	tty->cy = UINT_MAX;
@@ -283,7 +283,7 @@ tty_stop_tty(struct tty *tty)
 		tty_raw(tty, "\033[?1000l\033[?1006l\033[?1005l");
 
 	if (tty_term_has(tty->term, TTYC_XT))
-		tty_raw(tty, "\033[>4m\033[?1004l");
+		tty_raw(tty, "\033[>4m\033[?1004l\033[m");
 
 	tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));

Return to bug 187210

Lines 2-9 Link Here

(-)Makefile (-36 / +20 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= tmux	4	PORTNAME= tmux
5	PORTVERSION= 1.8	5	PORTVERSION= 1.9
6	PORTREVISION= 1
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
9		8
Lines 33-87 Link Here
33		32
34	CFLAGS+= -Wno-pointer-sign	33	CFLAGS+= -Wno-pointer-sign
35		34
		35	BACKSPACE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tty-keys.c
		36	LIBEVENT2_CONFIGURE_ENV= LIBEVENT_CFLAGS="-I${LOCALBASE}/include/event2/compat" \
		37	LIBEVENT_LIBS="-L${LOCALBASE}/lib/event2 -levent"
		38	LIBEVENT2_CONFIGURE_ENV_OFF=LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \
		39	LIBEVENT_LIBS="-L${LOCALBASE}/lib -levent"
		40	LIBEVENT2_LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2
		41	LIBEVENT2_LIB_DEPENDS_OFF= libevent-1.4.so:${PORTSDIR}/devel/libevent
		42
36	.include <bsd.port.options.mk>	43	.include <bsd.port.options.mk>
37		44
		45	post-patch:
		46	@${REINPLACE_CMD} -e 's\|/etc/tmux.conf\|${PREFIX}/etc/tmux.conf\|g' \
		47	${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h ${WRKSRC}/CHANGES
		48	@${REINPLACE_CMD} -e '/LIBS=/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT}
		49
		50	.if ${PORT_OPTIONS:MLIBEVENT_STATIC}
38	.if ${PORT_OPTIONS:MLIBEVENT2}	51	.if ${PORT_OPTIONS:MLIBEVENT2}
39	CONFIGURE_ENV+= LIBEVENT_CFLAGS="-I${LOCALBASE}/include/event2/compat" \
40	LIBEVENT_LIBS="-L${LOCALBASE}/lib/event2 -levent"
41	. if ${PORT_OPTIONS:MLIBEVENT_STATIC}
42	BUILD_DEPENDS+= ${LOCALBASE}/lib/event2/libevent.a:${PORTSDIR}/devel/libevent2
43	LESTATIC= ${LOCALBASE}/lib/event2/libevent.a	52	LESTATIC= ${LOCALBASE}/lib/event2/libevent.a
44	. else
45	LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2
46	. endif
47	.else	53	.else
48	CONFIGURE_ENV+= LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \
49	LIBEVENT_LIBS="-L${LOCALBASE}/lib -levent"
50	. if ${PORT_OPTIONS:MLIBEVENT_STATIC}
51	BUILD_DEPENDS+= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
52	LESTATIC= ${LOCALBASE}/lib/libevent.a	54	LESTATIC= ${LOCALBASE}/lib/libevent.a
53	. else
54	LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent
55	. endif
56	.endif	55	.endif
57
58	.if ${PORT_OPTIONS:MBACKSPACE}
59	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tty-keys.c
60	.endif
61
62	post-patch:
63	@${REINPLACE_CMD} -e 's\|/etc/tmux.conf\|${PREFIX}/etc/tmux.conf\|g' \
64	${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h ${WRKSRC}/CHANGES
65	@${REINPLACE_CMD} -e '/LIBS=/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT}
66
67	post-configure:	56	post-configure:
68	.if defined(WITH_LIBEVENT_STATIC)
69	${REINPLACE_CMD} -e '/LIBS/s\|-levent[^[:blank:]]*\|${LESTATIC}\|' \	57	${REINPLACE_CMD} -e '/LIBS/s\|-levent[^[:blank:]]*\|${LESTATIC}\|' \
70	${WRKSRC}/${MAKEFILE}	58	${WRKSRC}/${MAKEFILE}
71	.endif	59	.endif
72		60
73	do-install:	61	do-install:
74	@${INSTALL_PROGRAM} ${WRKSRC}/tmux ${STAGEDIR}${PREFIX}/bin	62	${INSTALL_PROGRAM} ${WRKSRC}/tmux ${STAGEDIR}${PREFIX}/bin
75	@${INSTALL_MAN} ${WRKSRC}/tmux.1 ${STAGEDIR}${MANPREFIX}/man/man1	63	${INSTALL_MAN} ${WRKSRC}/tmux.1 ${STAGEDIR}${MANPREFIX}/man/man1
76	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d	64	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
77	@${INSTALL_DATA} ${WRKSRC}/examples/bash_completion_tmux.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux	65	${INSTALL_DATA} ${WRKSRC}/examples/bash_completion_tmux.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux
78	.if ${PORT_OPTIONS:MDOCS}
79	@${MKDIR} ${STAGEDIR}${DOCSDIR}	66	@${MKDIR} ${STAGEDIR}${DOCSDIR}
80	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}	67	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
81	.endif
82	.if ${PORT_OPTIONS:MEXAMPLES}
83	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	68	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
84	@${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}	69	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
85	.endif
86		70
87	.include <bsd.port.mk>	71	.include <bsd.port.mk>

Lines 1-25 Link Here

(-)files/patch-tty.c (-25 lines)
1	$FreeBSD$
2
3	Apply upstream commit cbee283c26968304b473e2191d2bb5f52208b58d to prevent
4	OS X's Terminal.app turning on underlining when the status bar contains
5	bold characters.
6
7	--- tty.c
8	+++ tty.c
9	@@ -220,7 +220,7 @@ tty_start_tty(struct tty *tty)
10	tty_puts(tty, "\033[?1000l\033[?1006l\033[?1005l");
11
12	if (tty_term_has(tty->term, TTYC_XT))
13	- tty_puts(tty, "\033[c\033[>4;1m\033[?1004h");
14	+ tty_puts(tty, "\033[c\033[>4;1m\033[?1004h\033[m");
15
16	tty->cx = UINT_MAX;
17	tty->cy = UINT_MAX;
18	@@ -283,7 +283,7 @@ tty_stop_tty(struct tty *tty)
19	tty_raw(tty, "\033[?1000l\033[?1006l\033[?1005l");
20
21	if (tty_term_has(tty->term, TTYC_XT))
22	- tty_raw(tty, "\033[>4m\033[?1004l");
23	+ tty_raw(tty, "\033[>4m\033[?1004l\033[m");
24
25	tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));