diff options
| author | bapt <bapt@FreeBSD.org> | 2014-07-24 21:32:58 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-07-24 21:32:58 +0800 |
| commit | a8844613fabe6f02880be5a2bbab4d9af2853c2d (patch) | |
| tree | ffddb673c48038e781d69f6c3d08ec8855ad33a5 /sysutils/tmux | |
| parent | 12f33c255d02d5e8b350ff2daf6aa8ed112b6508 (diff) | |
| download | freebsd-ports-gnome-a8844613fabe6f02880be5a2bbab4d9af2853c2d.tar.gz freebsd-ports-gnome-a8844613fabe6f02880be5a2bbab4d9af2853c2d.tar.zst freebsd-ports-gnome-a8844613fabe6f02880be5a2bbab4d9af2853c2d.zip | |
Only use libevent2
Remove libevent as libevent2 is providing a good compatibility interface as well
as providing better performances.
Remove custom patches from libevent2 and install libevent2 the regular way
Mark ports abusing private fields of the libevent1 API as broken
Import a patch from fedora to have honeyd working with libevent2
Remove most of the patches necessary to find the custom installation we used to
have for libevent2
With hat: portmgr
Diffstat (limited to 'sysutils/tmux')
| -rw-r--r-- | sysutils/tmux/Makefile | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile index 6af2cce560a3..95b5707e608d 100644 --- a/sysutils/tmux/Makefile +++ b/sysutils/tmux/Makefile @@ -3,7 +3,7 @@ PORTNAME= tmux DISTVERSION= 1.9a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} @@ -26,9 +26,8 @@ PLIST_DIRSTRY= etc/bash_completion.d PORTDOCS= CHANGES FAQ README TODO PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS EXAMPLES LIBEVENT2 LIBEVENT_STATIC BACKSPACE +OPTIONS_DEFINE= DOCS EXAMPLES LIBEVENT_STATIC BACKSPACE -LIBEVENT2_DESC= Use libevent version 2 LIBEVENT_STATIC_DESC= Build with static libevent BACKSPACE_DESC= Build with tty/keys patch @@ -39,8 +38,9 @@ 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 + +LIBEVENT_STATIC_LIB_DEPENDS_OFF= libevent.so:${PORTSDIR}/devel/libevent2 +LIBEVENT_STATIC_BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2 # 1.9a was released as an errata to 1.9 # this port was never updated to 1.9 @@ -52,11 +52,7 @@ post-patch: @${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' ${WRKSRC}/CHANGES .if ${PORT_OPTIONS:MLIBEVENT_STATIC} -.if ${PORT_OPTIONS:MLIBEVENT2} -LESTATIC= ${LOCALBASE}/lib/event2/libevent.a -.else LESTATIC= ${LOCALBASE}/lib/libevent.a -.endif post-configure: ${REINPLACE_CMD} -e '/LIBS/s|-levent[^[:blank:]]*|${LESTATIC}|' \ ${WRKSRC}/${MAKEFILE} |