From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 27 11:10:08 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 372D81065675 for ; Sun, 27 Feb 2011 11:10:08 +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 0C1648FC19 for ; Sun, 27 Feb 2011 11:10:08 +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 p1RBA7d1004146 for ; Sun, 27 Feb 2011 11:10:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1RBA7F6004145; Sun, 27 Feb 2011 11:10:07 GMT (envelope-from gnats) Resent-Date: Sun, 27 Feb 2011 11:10:07 GMT Resent-Message-Id: <201102271110.p1RBA7F6004145@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 8DA661065677; Sun, 27 Feb 2011 11:01:57 +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 D3D618FC14; Sun, 27 Feb 2011 11:01:56 +0000 (UTC) Received: from neo.vx.sk (localhost [127.0.0.1]) by mail2.vx.sk (Postfix) with ESMTP id B28A0E791A; Sun, 27 Feb 2011 12:01:55 +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 9kRu-A5-lzEM; Sun, 27 Feb 2011 11:56:53 +0100 (CET) Received: by mail2.vx.sk (Postfix, from userid 1001) id 8E1F9E78FA; Sun, 27 Feb 2011 11:56:53 +0100 (CET) Message-Id: <20110227105653.8E1F9E78FA@mail2.vx.sk> Date: Sun, 27 Feb 2011 11:56:53 +0100 (CET) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: wen@FreeBSD.org Subject: ports/155080: [PATCH] sysutils/tmux: add LIBEVENT_STATIC to OPTIONS 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: Sun, 27 Feb 2011 11:10:08 -0000 >Number: 155080 >Category: ports >Synopsis: [PATCH] sysutils/tmux: add LIBEVENT_STATIC to OPTIONS >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: Sun Feb 27 11:10:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 8.2-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD neo.vx.sk 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #1 r217725M: Sat Jan 22 22:59:27 CET >Description: Add optional linkage on static libevent (enables dependency-free package). Port maintainer (wen@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- tmux-1.4_4.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/tmux/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- Makefile 21 Feb 2011 10:43:38 -0000 1.25 +++ Makefile 27 Feb 2011 10:55:19 -0000 @@ -7,15 +7,13 @@ PORTNAME= tmux PORTVERSION= 1.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= wen@FreeBSD.org COMMENT= A Terminal Multiplexer -LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent - HAS_CONFIGURE= yes MAN1= tmux.1 @@ -29,7 +27,8 @@ #LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -OPTIONS= KQUEUE "Build without define HAVE_BROKEN_KQUEUE " On +OPTIONS= KQUEUE "Build without define HAVE_BROKEN_KQUEUE " On \ + 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: @@ -37,6 +36,12 @@ .include +.if defined(WITH_LIBEVENT_STATIC) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent +.else +LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent +.endif + .if !defined(WITHOUT_KQUEUE) .if ${OSVERSION} < 702104 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-kqueue_and_fb7 @@ -50,6 +55,10 @@ post-patch: @${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \ ${WRKSRC}/Makefile +.if defined(WITH_LIBEVENT_STATIC) + @${REINPLACE_CMD} -e 's|-levent|${LOCALBASE}/lib/libevent.a|g' \ + ${WRKSRC}/configure +.endif do-install: @${INSTALL_PROGRAM} ${WRKSRC}/tmux ${PREFIX}/bin --- tmux-1.4_4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: