Date: Tue, 22 May 2007 12:39:17 +0200 (CEST) From: Henrik Brix Andersen <henrik@brixandersen.dk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: rnoland@2hip.net Subject: ports/112857: [patch] Make dbus support optional in x11-wm/beryl-plugins Message-ID: <20070522103917.3878911421@lothlorien.brixandersen.dk> Resent-Message-ID: <200705221040.l4MAe4ip004599@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 112857
>Category: ports
>Synopsis: [patch] Make dbus support optional in x11-wm/beryl-plugins
>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 May 22 10:40:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Henrik Brix Andersen
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
pil.dk
>Environment:
System: FreeBSD lothlorien.brixandersen.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #35: Tue May 22 12:04:50 CEST 2007 root@lothlorien.brixandersen.dk:/usr/obj/usr/src/sys/LOTHLORIEN i386
>Description:
Currently, the x11-wm/beryl-plugins port has a hard dependency on
devel/dbus although the dbus plug-in is optional.
>How-To-Repeat:
$ cd /usr/ports/x11-wm/beryl-plugins
$ make run-depends-list
>Fix:
The patch below makes dbus support optional.
--- beryl-plugins.patch begins here ---
diff -urp /usr/ports/x11-wm/beryl-plugins/Makefile x11-wm/beryl-plugins/Makefile
--- /usr/ports/x11-wm/beryl-plugins/Makefile Sat May 19 22:32:29 2007
+++ x11-wm/beryl-plugins/Makefile Mon May 21 22:44:10 2007
@@ -18,8 +18,7 @@ COMMENT= Plugins for Beryl Composite/Win
# XXX - Might depends on graphics/libsvg-cairo instead.
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/beryl.pc:${PORTSDIR}/x11-wm/beryl-core \
- ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/beryl.pc:${PORTSDIR}/x11-wm/beryl-core
RUN_DEPENDS= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
@@ -35,4 +34,17 @@ CONFIGURE_TARGET= --build=${ARCH}-portbl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-.include <bsd.port.mk>
+OPTIONS= DBUS "Enable dbus support" On
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_DBUS)
+CONFIGURE_ARGS= --enable-dbus
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
+PLIST_SUB= DBUS=""
+.else
+CONFIGURE_ARGS= --disable-dbus
+PLIST_SUB= DBUS="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff -urp /usr/ports/x11-wm/beryl-plugins/pkg-plist x11-wm/beryl-plugins/pkg-plist
--- /usr/ports/x11-wm/beryl-plugins/pkg-plist Sat May 19 22:32:29 2007
+++ x11-wm/beryl-plugins/pkg-plist Mon May 21 22:43:37 2007
@@ -97,9 +97,9 @@ lib/beryl/libimgjpeg.a
lib/beryl/libannotate.so
lib/beryl/libannotate.la
lib/beryl/libannotate.a
-lib/beryl/libdbus.so
-lib/beryl/libdbus.la
-lib/beryl/libdbus.a
+%%DBUS%%lib/beryl/libdbus.so
+%%DBUS%%lib/beryl/libdbus.la
+%%DBUS%%lib/beryl/libdbus.a
share/locale/es/LC_MESSAGES/beryl-plugins.mo
share/locale/fr/LC_MESSAGES/beryl-plugins.mo
share/locale/nl/LC_MESSAGES/beryl-plugins.mo
--- beryl-plugins.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070522103917.3878911421>