Attachment 116922 Details for Bug 158946 – file.diff

[patch] file.diff

file.diff (text/plain), 7.47 KB, created by Pietro Cerutti on 2011-07-15 13:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pietro Cerutti

Created: 2011-07-15 13:20:09 UTC

Size: 7.47 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/sysutils/tmux/Makefile,v
>retrieving revision 1.30
>diff -u -r1.30 Makefile
>--- Makefile	11 Jul 2011 10:49:06 -0000	1.30
>+++ Makefile	15 Jul 2011 12:10:29 -0000
>@@ -6,12 +6,11 @@
> #
> 
> PORTNAME=	tmux
>-PORTVERSION=	1.4
>-PORTREVISION=	6
>+PORTVERSION=	1.5
> CATEGORIES=	sysutils
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	wen@FreeBSD.org
>+MAINTAINER=	gahr@FreeBSD.org
> COMMENT=	A Terminal Multiplexer
> 
> LICENSE=	BSD
>@@ -25,54 +24,29 @@
> PORTDOCS=	CHANGES FAQ NOTES
> PORTEXAMPLES=	*
> 
>-OPTIONS=	KQUEUE   	"Build without define HAVE_BROKEN_KQUEUE " On \
>-		LIBEVENT2	"Use libevent version 2" Off \
>+OPTIONS=	LIBEVENT2	"Use libevent version 2" Off \
> 		LIBEVENT_STATIC	"Build with static libevent" Off \
> 		BACKSPACE 	"Build with tty/keys patch" Off
> 
>-# Now I set tmux build without #define HAVE_BROKEN_KQUEUE as default and an option,
>-# If it still hang the system or other run error, try as upstream suggest:
>-# http://sourceforge.net/mailarchive/forum.php?thread_name=20110125092121.GA15934%40yelena.nicm.ath.cx&forum_name=tmux-users
>-
> .include <bsd.port.pre.mk>
> 
> .if defined(WITH_LIBEVENT2)
>-EXTRA_CPPFLAGS+=	-I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
>+LIB_DEPENDS=	event-2.0:${PORTSDIR}/devel/libevent2
>+CPPFLAGS+=	-I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib/event2
>-.else
>-EXTRA_CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-.endif
>-
>-MAKE_ENV+=	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>-
>-.if defined(WITH_LIBEVENT_STATIC)
>-. if defined(WITH_LIBEVENT2)
>-_LEVENT_LIB=	${LOCALBASE}/lib/event2/libevent.a
>-BUILD_DEPENDS+=	${_LEVENT_LIB}:${PORTSDIR}/devel/libevent2
>-. else
>-_LEVENT_LIB=	${LOCALBASE}/lib/libevent.a
>-BUILD_DEPENDS+=	${_LEVENT_LIB}:${PORTSDIR}/devel/libevent
>+. if defined(WITH_LIBEVENT_STATIC)
>+LESTATIC=	${LOCALBASE}/lib/event2/libevent.a
> . endif
> .else
>-. if defined(WITH_LIBEVENT2)
>-_LEVENT_LIB=	-levent-2.0
>-LIB_DEPENDS=	event-2.0:${PORTSDIR}/devel/libevent2
>-. else
>-_LEVENT_LIB=	-levent-1.4
> LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib
>+. if defined(WITH_LIBEVENT_STATIC)
>+LESTATIC=	${LOCALBASE}/lib/libevent.a
> . endif
> .endif
> 
>-.if !defined(WITHOUT_KQUEUE)
>-.if ${OSVERSION} < 702104
>-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-kqueue_and_fb7
>-.else
>-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-kqueue
>-.endif
>-.else
>-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fb7
>-.endif
>+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
> 
> .if defined(WITH_BACKSPACE)
> EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
>@@ -80,14 +54,10 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' \
>-		${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h
>-	@${REINPLACE_CMD} -e 's|-I/usr/local/include||g' \
>-		-e 's|/usr/local|${LOCALBASE}|g' \
>-		-e 's|$${CPPFLAGS}$$|${CPPFLAGS} ${EXTRA_CPPFLAGS}|g' \
>-		-e 's|LDFLAGS+=|#LDFLAGS+=|g' \
>-		${WRKSRC}/Makefile
>-	@${REINPLACE_CMD} -e 's|-levent|${_LEVENT_LIB}|g' \
>-		${WRKSRC}/configure
>+		${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h ${WRKSRC}/CHANGES
>+.if defined(WITH_LIBEVENT_STATIC)
>+	${REINPLACE_CMD} -e '4534s|$$ac_res |${LESTATIC} |' ${WRKSRC}/${CONFIGURE_SCRIPT}
>+.endif
> 
> do-install:
> 	@${INSTALL_PROGRAM} ${WRKSRC}/tmux ${PREFIX}/bin
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/sysutils/tmux/distinfo,v
>retrieving revision 1.15
>diff -u -r1.15 distinfo
>--- distinfo	30 Dec 2010 06:59:27 -0000	1.15
>+++ distinfo	12 Jul 2011 08:05:23 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (tmux-1.4.tar.gz) = c7e005f32e256b8ece214b71c51947f4081af8c5f0400083e4adaac2c258bbc7
>-SIZE (tmux-1.4.tar.gz) = 259614
>+SHA256 (tmux-1.5.tar.gz) = eb8215b57c05b765d2446d9acb2bc5edcdb3eb4ea31af89ee127a27e90056306
>+SIZE (tmux-1.5.tar.gz) = 374093
>Index: files/extra-patch-fb7
>===================================================================
>RCS file: files/extra-patch-fb7
>diff -N files/extra-patch-fb7
>--- files/extra-patch-fb7	21 Feb 2011 07:09:49 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,18 +0,0 @@
>---- configure.orig	2011-02-21 10:52:19.000000000 +0800
>-+++ configure	2011-02-21 10:54:29.000000000 +0800
>-@@ -224,7 +224,6 @@
>- #define HAVE_ASPRINTF
>- #define HAVE_BROKEN_KQUEUE
>- #define HAVE_BZERO
>--#define HAVE_CLOSEFROM
>- #define HAVE_DAEMON
>- #define HAVE_FGETLN
>- #define HAVE_FORKPTY
>-@@ -245,6 +244,7 @@
>- 	cat <<EOF >>$CONFIG_MK
>- LIBS+= -lcurses -lutil -levent
>- SRCS+= osdep-freebsd.c \
>-+	compat/closefrom.c \
>- 	compat/vis.c \
>- 	compat/unvis.c \
>- 	compat/imsg-buffer.c \
>Index: files/extra-patch-kqueue
>===================================================================
>RCS file: files/extra-patch-kqueue
>diff -N files/extra-patch-kqueue
>--- files/extra-patch-kqueue	21 Feb 2011 07:09:49 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,10 +0,0 @@
>---- configure.orig	2011-02-21 14:12:33.000000000 +0800
>-+++ configure	2011-02-21 14:13:00.000000000 +0800
>-@@ -222,7 +222,6 @@
>-     FreeBSD|DragonFly)
>- 	cat <<EOF >>$CONFIG_H
>- #define HAVE_ASPRINTF
>--#define HAVE_BROKEN_KQUEUE
>- #define HAVE_BZERO
>- #define HAVE_CLOSEFROM
>- #define HAVE_DAEMON
>Index: files/extra-patch-kqueue_and_fb7
>===================================================================
>RCS file: files/extra-patch-kqueue_and_fb7
>diff -N files/extra-patch-kqueue_and_fb7
>--- files/extra-patch-kqueue_and_fb7	21 Feb 2011 07:09:49 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,20 +0,0 @@
>---- configure.orig	2011-02-21 14:37:37.000000000 +0800
>-+++ configure	2011-02-21 14:38:21.000000000 +0800
>-@@ -222,9 +222,7 @@
>-     FreeBSD|DragonFly)
>- 	cat <<EOF >>$CONFIG_H
>- #define HAVE_ASPRINTF
>--#define HAVE_BROKEN_KQUEUE
>- #define HAVE_BZERO
>--#define HAVE_CLOSEFROM
>- #define HAVE_DAEMON
>- #define HAVE_FGETLN
>- #define HAVE_FORKPTY
>-@@ -245,6 +243,7 @@
>- 	cat <<EOF >>$CONFIG_MK
>- LIBS+= -lcurses -lutil -levent
>- SRCS+= osdep-freebsd.c \
>-+	compat/closefrom.c \
>- 	compat/vis.c \
>- 	compat/unvis.c \
>- 	compat/imsg-buffer.c \
>Index: files/patch-hostname.diff
>===================================================================
>RCS file: files/patch-hostname.diff
>diff -N files/patch-hostname.diff
>--- files/patch-hostname.diff	11 Jul 2011 10:49:06 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,32 +0,0 @@
>---- status.c.orig	2011/04/18 20:49:05	1.73
>-+++ status.c	2011/04/24 22:32:07	1.74
>-@@ -1,4 +1,4 @@
>--/* $OpenBSD: status.c,v 1.73 2011/04/18 19:49:05 nicm Exp $ */
>-+/* $OpenBSD: status.c,v 1.74 2011/04/24 21:32:07 nicm Exp $ */
>- 
>- /*
>-  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
>-@@ -408,6 +408,13 @@ status_replace1(struct client *c, struct session *s, s
>- 	case 'H':
>- 		if (gethostname(tmp, sizeof tmp) != 0)
>- 			fatal("gethostname failed");
>-+		ptr = tmp;
>-+		goto do_replace;
>-+	case 'h':
>-+		if (gethostname(tmp, sizeof tmp) != 0)
>-+			fatal("gethostname failed");
>-+		if ((ptr = strchr(tmp, '.')) != NULL)
>-+			*ptr = '\0';
>- 		ptr = tmp;
>- 		goto do_replace;
>- 	case 'I':
>---- tmux.1.orig	2011/04/19 22:31:33	1.223
>-+++ tmux.1	2011/04/24 22:32:07	1.224
>-@@ -2005,6 +2005,7 @@ may contain any of the following special character seq
>- .It Li "#(shell-command)" Ta "First line of the command's output"
>- .It Li "#[attributes]" Ta "Colour or attribute change"
>- .It Li "#H" Ta "Hostname of local host"
>-+.It Li "#h" Ta "Hostname of local host without the domain name"
>- .It Li "#F" Ta "Current window flag"
>- .It Li "#I" Ta "Current window index"
>- .It Li "#P" Ta "Current pane index"

Actions: View | Diff

Attachments on bug 158946: 116922