summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authorahoka <ahoka@pkgsrc.org>2008-12-21 14:08:39 +0000
committerahoka <ahoka@pkgsrc.org>2008-12-21 14:08:39 +0000
commit08a594ade4e54eae9641201a968e43d8233b2d85 (patch)
treef6b199637883c1a432ac6f4aba0b41b6a52c4803 /chat
parent12cf24611d4bf63eb831151c7d80b9b9308403d8 (diff)
downloadpkgsrc-08a594ade4e54eae9641201a968e43d8233b2d85.tar.gz
Move the avahi option to libpurple where it belongs.
Bump.
Diffstat (limited to 'chat')
-rw-r--r--chat/libpurple/Makefile.common4
-rw-r--r--chat/libpurple/PLIST3
-rw-r--r--chat/libpurple/options.mk13
-rw-r--r--chat/pidgin/options.mk11
4 files changed, 16 insertions, 15 deletions
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 5fef6525967..cfb27935ea8 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2008/12/21 00:12:10 ahoka Exp $
+# $NetBSD: Makefile.common,v 1.23 2008/12/21 14:08:39 ahoka Exp $
#
# used by chat/finch/Makefile
# used by chat/libpurple/Makefile
@@ -6,7 +6,7 @@
# used by chat/pidgin-silc/Makefile
PIDGIN_VERSION= 2.5.1
-PKGREVISION= 1
+PKGREVISION= 2
DISTNAME= pidgin-${PIDGIN_VERSION}
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index 61f272a6020..90307a23aae 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2008/09/16 19:54:21 abs Exp $
+@comment $NetBSD: PLIST,v 1.15 2008/12/21 14:08:39 ahoka Exp $
include/libpurple/account.h
include/libpurple/accountopt.h
include/libpurple/blist.h
@@ -58,6 +58,7 @@ lib/purple-2/buddynote.la
lib/purple-2/idle.la
lib/purple-2/joinpart.la
lib/purple-2/libaim.la
+${PLIST.avahi}lib/purple-2/libbonjour.la
lib/purple-2/libgg.la
lib/purple-2/libicq.la
lib/purple-2/libirc.la
diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk
index b05252a76b8..754ecd8075f 100644
--- a/chat/libpurple/options.mk
+++ b/chat/libpurple/options.mk
@@ -1,12 +1,17 @@
-# $NetBSD: options.mk,v 1.9 2008/12/21 00:12:10 ahoka Exp $
+# $NetBSD: options.mk,v 1.10 2008/12/21 14:08:39 ahoka Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple
-PKG_SUPPORTED_OPTIONS+= gnutls perl tcl debug dbus sasl
-PKG_SUGGESTED_OPTIONS+= gnutls dbus
+PKG_SUPPORTED_OPTIONS+= gnutls perl tcl debug dbus sasl avahi
+PKG_SUGGESTED_OPTIONS+= gnutls dbus avahi
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= dbus
+PLIST_VARS+= dbus avahi
+
+.if !empty(PKG_OPTIONS:Mavahi)
+PLIST.avahi= yes
+. include "../../net/avahi/buildlink3.mk"
+.endif
.if !empty(PKG_OPTIONS:Mgnutls)
CONFIGURE_ARGS+= --enable-gnutls
diff --git a/chat/pidgin/options.mk b/chat/pidgin/options.mk
index ec603efeff3..20c45be51a4 100644
--- a/chat/pidgin/options.mk
+++ b/chat/pidgin/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2008/12/21 00:12:10 ahoka Exp $
+# $NetBSD: options.mk,v 1.6 2008/12/21 14:08:39 ahoka Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.pidgin
-PKG_SUPPORTED_OPTIONS+= dbus debug gstreamer gtkspell avahi
-PKG_SUGGESTED_OPTIONS+= gtkspell dbus gstreamer avahi
+PKG_SUPPORTED_OPTIONS+= dbus debug gstreamer gtkspell
+PKG_SUGGESTED_OPTIONS+= gtkspell dbus gstreamer
.include "../../mk/bsd.options.mk"
@@ -15,11 +15,6 @@ PLIST.dbus= yes
. include "../../sysutils/dbus-glib/buildlink3.mk"
.endif
-.if !empty(PKG_OPTIONS:Mavahi)
-PLIST.avahi= yes
-. include "../../net/avahi/buildlink3.mk"
-.endif
-
.if !empty(PKG_OPTIONS:Mgtkspell)
CONFIGURE_ARGS+= --enable-gtkspell
. include "../../textproc/gtkspell/buildlink3.mk"