From 7b7e4d7ead6607dc4d67992aaeb5b477daebcb98 Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 17 Jan 2007 05:35:08 +0000 Subject: * Correct D-BUS dependency check to match OPTIONS * Fix a portlint warning PR: 108027 Submitted by: Sean Farley --- net-im/libgaim/Makefile | 4 ++-- net-im/libpurple/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-im/libgaim/Makefile b/net-im/libgaim/Makefile index 5ba51378a44..2f69103631f 100644 --- a/net-im/libgaim/Makefile +++ b/net-im/libgaim/Makefile @@ -91,7 +91,7 @@ PLIST_SUB+= EVO="@comment not installed: " .endif .if defined(WITH_GTKUI) && !defined(WITHOUT_GSTREAMER) -USE_GSTREAMER+= core good +USE_GSTREAMER+= core good .else CONFIGURE_ARGS+=--disable-gstreamer .endif @@ -174,7 +174,7 @@ LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao \ CONFIGURE_ARGS+= --disable-audio .endif -.if defined(WITH_DBUS) +.if !defined(WITHOUT_DBUS) LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib .if !defined(GAIM_SLAVE) RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index 5ba51378a44..2f69103631f 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -91,7 +91,7 @@ PLIST_SUB+= EVO="@comment not installed: " .endif .if defined(WITH_GTKUI) && !defined(WITHOUT_GSTREAMER) -USE_GSTREAMER+= core good +USE_GSTREAMER+= core good .else CONFIGURE_ARGS+=--disable-gstreamer .endif @@ -174,7 +174,7 @@ LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao \ CONFIGURE_ARGS+= --disable-audio .endif -.if defined(WITH_DBUS) +.if !defined(WITHOUT_DBUS) LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib .if !defined(GAIM_SLAVE) RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus -- cgit