diff options
| author | wen <wen@FreeBSD.org> | 2011-05-25 08:29:33 +0800 |
|---|---|---|
| committer | wen <wen@FreeBSD.org> | 2011-05-25 08:29:33 +0800 |
| commit | ddcf604a5dc970f062993ffaf2f1602c23943088 (patch) | |
| tree | 23e2515aa70570f6123d58aabebb20b7e5353b40 /sysutils | |
| parent | 0bdb92f79a0d0fa7f392539f062fd2164f406e8b (diff) | |
| download | freebsd-ports-gnome-ddcf604a5dc970f062993ffaf2f1602c23943088.tar.gz freebsd-ports-gnome-ddcf604a5dc970f062993ffaf2f1602c23943088.tar.zst freebsd-ports-gnome-ddcf604a5dc970f062993ffaf2f1602c23943088.zip | |
- Fix tmux.conf location [1]
- Support libevent2 [1]
- Add an option to use patch-tty-key.c [2]
PR: ports/155909 [1],
ports/153942 [2]
Submitted by: mm@ [1],
Brandon Low <lostlogic@lostlogicx.com> [2],
randy.belk@gmail.com(via email) [2]
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/tmux/Makefile | 50 | ||||
| -rw-r--r-- | sysutils/tmux/files/extra-patch-tty-keys.c (renamed from sysutils/tmux/files/patch-tty-keys.c) | 0 |
2 files changed, 38 insertions, 12 deletions
diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile index b1554bf9d320..30059b8639f2 100644 --- a/sysutils/tmux/Makefile +++ b/sysutils/tmux/Makefile @@ -7,7 +7,7 @@ PORTNAME= tmux PORTVERSION= 1.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -23,12 +23,10 @@ PLIST_FILES= bin/tmux PORTDOCS= CHANGES FAQ NOTES PORTEXAMPLES= * -CFLAGS+= -I${LOCALBASE}/include -#LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" - -OPTIONS= KQUEUE "Build without define HAVE_BROKEN_KQUEUE " On \ - LIBEVENT_STATIC "Build with static libevent" Off +OPTIONS= KQUEUE "Build without define HAVE_BROKEN_KQUEUE " On \ + 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: @@ -36,10 +34,32 @@ OPTIONS= KQUEUE "Build without define HAVE_BROKEN_KQUEUE " On \ .include <bsd.port.pre.mk> +.if defined(WITH_LIBEVENT2) +CFLAGS+= -I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib/event2 +.else +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +.endif + +MAKE_ENV+= LDFLAGS="${LDFLAGS}" + .if defined(WITH_LIBEVENT_STATIC) -BUILD_DEPENDS+= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent +. 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 +. 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 +. endif .endif .if !defined(WITHOUT_KQUEUE) @@ -52,13 +72,19 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-kqueue EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fb7 .endif +.if defined(WITH_BACKSPACE) +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tty-keys.c +.endif + post-patch: - @${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \ + @${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|LDFLAGS+=|#LDFLAGS+=|g' \ ${WRKSRC}/Makefile -.if defined(WITH_LIBEVENT_STATIC) - @${REINPLACE_CMD} -e 's|-levent|${LOCALBASE}/lib/libevent.a|g' \ + @${REINPLACE_CMD} -e 's|-levent|${_LEVENT_LIB}|g' \ ${WRKSRC}/configure -.endif do-install: @${INSTALL_PROGRAM} ${WRKSRC}/tmux ${PREFIX}/bin diff --git a/sysutils/tmux/files/patch-tty-keys.c b/sysutils/tmux/files/extra-patch-tty-keys.c index 6a8bf625c9cc..6a8bf625c9cc 100644 --- a/sysutils/tmux/files/patch-tty-keys.c +++ b/sysutils/tmux/files/extra-patch-tty-keys.c |