summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-11-08 16:25:26 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-11-08 16:25:26 +0800
commitf0378631dea65796dde69a3b48502559f6ef03df (patch)
tree5dd21fc991f1ed02334f9b165a75cc42d0f1cedb
parentfc579bf3ce37a0775d41342d589861a7f4df236d (diff)
downloadmarcuscom-ports-f0378631dea65796dde69a3b48502559f6ef03df.tar
marcuscom-ports-f0378631dea65796dde69a3b48502559f6ef03df.tar.gz
marcuscom-ports-f0378631dea65796dde69a3b48502559f6ef03df.tar.bz2
marcuscom-ports-f0378631dea65796dde69a3b48502559f6ef03df.tar.lz
marcuscom-ports-f0378631dea65796dde69a3b48502559f6ef03df.tar.xz
marcuscom-ports-f0378631dea65796dde69a3b48502559f6ef03df.tar.zst
marcuscom-ports-f0378631dea65796dde69a3b48502559f6ef03df.zip
Remove broken messages. Fix location of cheese port.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18862 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--net-im/empathy/Makefile12
1 files changed, 5 insertions, 7 deletions
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index a92288248..f0cb9af98 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -55,12 +55,12 @@ CONFIGURE_ARGS= --disable-Werror \
GLIB_SCHEMAS= org.gnome.Empathy.gschema.xml
OPTIONS_DEFINE= JABBER MSN IRC SALUT HAZE MAP CHEESE
-OPTIONS_DEFAULT=JABBER IRC MAP
+OPTIONS_DEFAULT=JABBER MSN IRC SALU MAP
JABBER_DESC= Enable jabber (XMPP) client support
-MSN_DESC= Enable MSN client support (broken)
+MSN_DESC= Enable MSN client support
IRC_DESC= Enable IRC client support
SALUT_DESC= Enable link-local (serverless) XMPP support
-HAZE_DESC= Enable libpurple protocol integration (broken)
+HAZE_DESC= Enable libpurple protocol integration
MAP_DESC= Enable graphical map support
CHEESE_DESC= Enable cheese camera support
NST_DESC= Enable Nautilus SendTo plugin
@@ -72,7 +72,6 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-gabble:${PORTSDIR}/net-im/telepathy
.endif
.if ${PORT_OPTIONS:MMSN}
-BROKEN= conflict in dependancies
RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-butterfly:${PORTSDIR}/net-im/telepathy-butterfly
.endif
@@ -85,7 +84,6 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-
.endif
.if !defined(WITHOUT_HAZE)
-BROKEN= conflict in dependancies
RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-haze
.endif
@@ -110,8 +108,8 @@ PLIST_SUB+= MAP="@comment "
.endif
.if ${PORT_OPTIONS:MCHEESE}
-BUILD_DEPENDS+= cheese>=3.0.0:${PORTSDIR}/multimedia/cheese3
-RUN_DEPENDS+= cheese>=3.0.0:${PORTSDIR}/multimedia/cheese3
+BUILD_DEPENDS+= cheese>=3.0.0:${PORTSDIR}/multimedia/cheese
+RUN_DEPENDS+= cheese>=3.0.0:${PORTSDIR}/multimedia/cheese
CONFIGURE_ARGS+=--with-cheese
.else
CONFIGURE_ARGS+=--without-cheese