From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 24 10:20:01 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 992BD106567E for ; Thu, 24 Mar 2011 10:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5492F8FC08 for ; Thu, 24 Mar 2011 10:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p2OAK1Sv088092 for ; Thu, 24 Mar 2011 10:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p2OAK1U9088091; Thu, 24 Mar 2011 10:20:01 GMT (envelope-from gnats) Resent-Date: Thu, 24 Mar 2011 10:20:01 GMT Resent-Message-Id: <201103241020.p2OAK1U9088091@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Matuska Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7980B106566B; Thu, 24 Mar 2011 10:17:06 +0000 (UTC) (envelope-from mm@mail2.vx.sk) Received: from mail2.vx.sk (mail2.vx.sk [IPv6:2a01:4f8:100:84a3::3]) by mx1.freebsd.org (Postfix) with ESMTP id 1ACA68FC17; Thu, 24 Mar 2011 10:17:06 +0000 (UTC) Received: from neo.vx.sk (localhost [127.0.0.1]) by mail2.vx.sk (Postfix) with ESMTP id 018AE279E5; Thu, 24 Mar 2011 11:17:04 +0100 (CET) Received: from mail2.vx.sk ([127.0.0.1]) by neo.vx.sk (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id LqISvZjNKMRy; Thu, 24 Mar 2011 11:12:03 +0100 (CET) Received: by mail2.vx.sk (Postfix, from userid 1001) id 09DA2279D9; Thu, 24 Mar 2011 11:12:02 +0100 (CET) Message-Id: <20110324101203.09DA2279D9@mail2.vx.sk> Date: Thu, 24 Mar 2011 11:12:02 +0100 (CET) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: wen@FreeBSD.org Subject: ports/155909: [PATCH] sysutils/tmux: fix tmux.conf location, support libevent2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Mar 2011 10:20:01 -0000 >Number: 155909 >Category: ports >Synopsis: [PATCH] sysutils/tmux: fix tmux.conf location, support libevent2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 24 10:20:00 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 8.2-STABLE amd64 >Organization: >Environment: System: FreeBSD neo.vx.sk 8.2-STABLE FreeBSD 8.2-STABLE #0 r219122M: Wed Mar 2 00:08:08 >Description: - tmux.conf should be read from ${PREFIX}/etc/tmux.conf - add support for linking against libevent2 (static and dynamic) Port maintainer (wen@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- tmux-1.4_5.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/tmux/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- Makefile 3 Mar 2011 08:16:59 -0000 1.26 +++ Makefile 24 Mar 2011 10:09:39 -0000 @@ -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,9 @@ 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 # 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 +33,32 @@ .include +.if defined(WITH_LIBEVENT2) +CFLAGS+= -I${LOCALBASE}/include/event2/compat +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) @@ -53,12 +72,14 @@ .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 --- tmux-1.4_5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: