From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 31 00:20:03 2009 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 1801B1065673 for ; Tue, 31 Mar 2009 00:20:03 +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 E6ED48FC0A for ; Tue, 31 Mar 2009 00:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n2V0K29V026780 for ; Tue, 31 Mar 2009 00:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n2V0K273026779; Tue, 31 Mar 2009 00:20:02 GMT (envelope-from gnats) Resent-Date: Tue, 31 Mar 2009 00:20:02 GMT Resent-Message-Id: <200903310020.n2V0K273026779@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, Pierre Guinoiseau Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6BD6106566C for ; Tue, 31 Mar 2009 00:11:50 +0000 (UTC) (envelope-from geekounet@poildetroll.net) Received: from tritus.poildetroll.net (tritus.poildetroll.net [81.93.245.19]) by mx1.freebsd.org (Postfix) with ESMTP id 812E58FC0C for ; Tue, 31 Mar 2009 00:11:50 +0000 (UTC) (envelope-from geekounet@poildetroll.net) Received: from kyleck.poildetroll.net (kyleck.poildetroll.net [81.93.245.30]) by tritus.poildetroll.net (Postfix) with SMTP id E4DE84F2 for ; Tue, 31 Mar 2009 01:59:05 +0200 (CEST) Received: by kyleck.poildetroll.net (sSMTP sendmail emulation); Tue, 31 Mar 2009 01:59:05 +0200 Message-Id: <20090330235905.E4DE84F2@tritus.poildetroll.net> Date: Tue, 31 Mar 2009 01:59:05 +0200 From: "Pierre Guinoiseau" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/133231: [PATCH] x11-wm/awesome: add D-Bus option X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Pierre Guinoiseau List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Mar 2009 00:20:03 -0000 >Number: 133231 >Category: ports >Synopsis: [PATCH] x11-wm/awesome: add D-Bus option >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: Tue Mar 31 00:20:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Pierre Guinoiseau >Release: FreeBSD 8.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD Korriban.poildetroll.net 8.0-CURRENT FreeBSD 8.0-CURRENT #0 r190410: Wed Mar 25 16:21:58 CET 2009 root@Korriban.poildetroll.net:/usr/obj/usr/src/sys/KORRIBAN amd64 >Description: The following patch makes D-BUS support optional for x11-wm/awesome, which can be useful to some users, and also fix a tr related warning portlint was complaining about. >How-To-Repeat: >Fix: --- awesome-dbus-option.diff begins here --- diff -ruN --exclude=CVS /usr/ports/x11-wm/awesome.orig/Makefile /usr/ports/x11-wm/awesome/Makefile --- /usr/ports/x11-wm/awesome.orig/Makefile 2009-03-24 22:34:12.000000000 +0100 +++ /usr/ports/x11-wm/awesome/Makefile 2009-03-31 01:15:54.000000000 +0200 @@ -22,7 +22,6 @@ xcb-util>=0.3.3:${PORTSDIR}/x11/xcb-util \ xproto>=7.0.11:${PORTSDIR}/x11/xproto LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ - dbus-1.3:${PORTSDIR}/devel/dbus \ ev.3:${PORTSDIR}/devel/libev \ freetype.9:${PORTSDIR}/print/freetype2 \ xcb.2:${PORTSDIR}/x11/libxcb \ @@ -44,6 +43,8 @@ MANCOMPRESSED= yes PORTDOCS= AUTHORS BUGS LICENSE README +OPTIONS+= DBUS "Enable D-BUS support" On + .include .if (exists(${LOCALBASE}/libdata/pkgconfig/cairo.pc) && \ @@ -51,12 +52,19 @@ IGNORE= cannot find dependency: The cairo exists but not with XCB support. Please reinstall graphics/cairo with XCB support .endif +.ifdef(WITH_DBUS) +LIB_DEPENDS += dbus-1.3:${PORTSDIR}/devel/dbus +CMAKE_ARGS += -DWITH_DBUS=YES +.else +CMAKE_ARGS += -DWITH_DBUS=NO +.endif + pre-configure: @${REINPLACE_CMD} \ -e 's/"generate luadoc" ON/\"generate luadoc" OFF/g' \ ${WRKSRC}/awesomeConfig.cmake @${REINPLACE_CMD} \ - -e 's,tr ,env LC_ALL="C" tr ,g' \ + -e 's,tr ,env LC_ALL="C" ${TR} ,g' \ -e 's,gperf,${LOCALBASE}/bin/gperf,g' \ ${WRKSRC}/build-utils/gperf.sh .if defined(NOPORTDOCS) --- awesome-dbus-option.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: