Date: Wed, 1 Apr 2009 12:30:03 GMT From: Nikos Ntarmos <ntarmos@cs.uoi.gr> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/133231: [PATCH] x11-wm/awesome: add D-Bus option Message-ID: <200904011230.n31CU3uN033046@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/133231; it has been noted by GNATS. From: Nikos Ntarmos <ntarmos@cs.uoi.gr> To: bug-followup@FreeBSD.ORG Cc: Subject: Re: ports/133231: [PATCH] x11-wm/awesome: add D-Bus option Date: Wed, 1 Apr 2009 15:23:58 +0300 --AqsLC8rIMeq19msA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The patch looks good to me but the portrevision will require a bump. Please used the attached diff instead (the same as the one submitted by Pierre plus a hunk for the portrevision). Thanks. \n\n --AqsLC8rIMeq19msA Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="awesome-dbus-option-portrevision.diff" --- Makefile.orig +++ Makefile @@ -7,6 +7,7 @@ PORTNAME= awesome PORTVERSION= 3.2 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ \ http://redundancy.redundancy.org/mirror/ @@ -22,7 +23,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 \ @@ -43,6 +43,8 @@ MANCOMPRESSED= yes PORTDOCS= AUTHORS BUGS LICENSE README +OPTIONS+= DBUS "Enable D-BUS support" On + .include <bsd.port.pre.mk> .if (exists(${LOCALBASE}/libdata/pkgconfig/cairo.pc) && \ @@ -50,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) --AqsLC8rIMeq19msA--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904011230.n31CU3uN033046>