summaryrefslogtreecommitdiff
path: root/chat/pidgin
diff options
context:
space:
mode:
authorwiz <wiz>2016-01-14 23:12:41 +0000
committerwiz <wiz>2016-01-14 23:12:41 +0000
commit523a485d987477ae7ddd52ae7b32c9ad5398ffdb (patch)
tree3b65471ea0302a3a5b301bd361d63067453ff537 /chat/pidgin
parentfa2f5f429c972f10707c3926ca52798b9f33efe9 (diff)
downloadpkgsrc-523a485d987477ae7ddd52ae7b32c9ad5398ffdb.tar.gz
farstream is not optional either.
Perhaps it can be made to be so again, and that would be good. Anyone interested?
Diffstat (limited to 'chat/pidgin')
-rw-r--r--chat/pidgin/Makefile3
-rw-r--r--chat/pidgin/options.mk19
2 files changed, 5 insertions, 17 deletions
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index ab3f5a0caea..f0d248605d7 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2016/01/13 22:25:38 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2016/01/14 23:12:41 wiz Exp $
COMMENT= Multi-protocol Instant Messaging client GTK frontend
@@ -26,6 +26,7 @@ INSTALL_DIRS= pidgin doc
# was an option, but is not as of 2.10.12
. include "../../multimedia/gstreamer1/buildlink3.mk"
. include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+. include "../../chat/farstream/buildlink3.mk"
.include "../../chat/libpurple/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/chat/pidgin/options.mk b/chat/pidgin/options.mk
index 51d1a37264c..692fd98cd45 100644
--- a/chat/pidgin/options.mk
+++ b/chat/pidgin/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.15 2016/01/13 22:26:53 wiz Exp $
+# $NetBSD: options.mk,v 1.16 2016/01/14 23:12:41 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.pidgin
-PKG_SUPPORTED_OPTIONS+= dbus debug gtkspell farstream x11
-PKG_SUGGESTED_OPTIONS+= dbus gtkspell farstream x11
+PKG_SUPPORTED_OPTIONS+= dbus debug gtkspell x11
+PKG_SUGGESTED_OPTIONS+= dbus gtkspell x11
.include "../../mk/bsd.options.mk"
@@ -15,19 +15,6 @@ PLIST.dbus= yes
. include "../../sysutils/dbus-glib/buildlink3.mk"
.endif
-# voice/video support requires both farstream
-.if !empty(PKG_OPTIONS:Mfarstream)
-CONFIGURE_ARGS+= --enable-vv
-PLIST.vv= yes
-.else
-CONFIGURE_ARGS+= --disable-vv
-.endif
-
-.if !empty(PKG_OPTIONS:Mfarstream)
-CONFIGURE_ARGS+= --enable-farstream
-. include "../../chat/farstream/buildlink3.mk"
-.endif
-
.if !empty(PKG_OPTIONS:Mgtkspell)
CONFIGURE_ARGS+= --enable-gtkspell
. include "../../textproc/gtkspell/buildlink3.mk"