ports/133231: [PATCH] x11-wm/awesome: add D-Bus option

[Pierre Guinoiseau]

>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 <geekounet at poildetroll.net>
>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 at 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 <bsd.port.pre.mk>
 
 .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: