Sun Dec 21 14:08:39 2008 UTC ()
Move the avahi option to libpurple where it belongs.
Bump.


(ahoka)
diff -r1.22 -r1.23 pkgsrc/chat/libpurple/Makefile.common
diff -r1.14 -r1.15 pkgsrc/chat/libpurple/PLIST
diff -r1.9 -r1.10 pkgsrc/chat/libpurple/options.mk
diff -r1.5 -r1.6 pkgsrc/chat/pidgin/options.mk
cvs diff -r1.22 -r1.23 pkgsrc/chat/libpurple/Makefile.common (expand / switch to unified diff)

--- pkgsrc/chat/libpurple/Makefile.common 2008/12/21 00:12:10 1.22
+++ pkgsrc/chat/libpurple/Makefile.common 2008/12/21 14:08:39 1.23
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile.common,v 1.22 2008/12/21 00:12:10 ahoka Exp $ 1# $NetBSD: Makefile.common,v 1.23 2008/12/21 14:08:39 ahoka Exp $
2# 2#
3# used by chat/finch/Makefile 3# used by chat/finch/Makefile
4# used by chat/libpurple/Makefile 4# used by chat/libpurple/Makefile
5# used by chat/pidgin/Makefile 5# used by chat/pidgin/Makefile
6# used by chat/pidgin-silc/Makefile 6# used by chat/pidgin-silc/Makefile
7 7
8PIDGIN_VERSION= 2.5.1 8PIDGIN_VERSION= 2.5.1
9PKGREVISION= 1 9PKGREVISION= 2
10DISTNAME= pidgin-${PIDGIN_VERSION} 10DISTNAME= pidgin-${PIDGIN_VERSION}
11CATEGORIES= chat 11CATEGORIES= chat
12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/} 12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://www.pidgin.im/ 16HOMEPAGE= http://www.pidgin.im/
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_TOOLS+= pkg-config gmake 20USE_TOOLS+= pkg-config gmake
21USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
22 22
cvs diff -r1.14 -r1.15 pkgsrc/chat/libpurple/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/libpurple/PLIST 2008/09/16 19:54:21 1.14
+++ pkgsrc/chat/libpurple/PLIST 2008/12/21 14:08:39 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.14 2008/09/16 19:54:21 abs Exp $ 1@comment $NetBSD: PLIST,v 1.15 2008/12/21 14:08:39 ahoka Exp $
2include/libpurple/account.h 2include/libpurple/account.h
3include/libpurple/accountopt.h 3include/libpurple/accountopt.h
4include/libpurple/blist.h 4include/libpurple/blist.h
5include/libpurple/buddyicon.h 5include/libpurple/buddyicon.h
6include/libpurple/certificate.h 6include/libpurple/certificate.h
7include/libpurple/cipher.h 7include/libpurple/cipher.h
8include/libpurple/circbuffer.h 8include/libpurple/circbuffer.h
9include/libpurple/cmds.h 9include/libpurple/cmds.h
10include/libpurple/connection.h 10include/libpurple/connection.h
11include/libpurple/conversation.h 11include/libpurple/conversation.h
12include/libpurple/core.h 12include/libpurple/core.h
13include/libpurple/dbus-maybe.h 13include/libpurple/dbus-maybe.h
14include/libpurple/debug.h 14include/libpurple/debug.h
@@ -48,26 +48,27 @@ include/libpurple/stun.h @@ -48,26 +48,27 @@ include/libpurple/stun.h
48include/libpurple/upnp.h 48include/libpurple/upnp.h
49include/libpurple/util.h 49include/libpurple/util.h
50include/libpurple/value.h 50include/libpurple/value.h
51include/libpurple/version.h 51include/libpurple/version.h
52include/libpurple/whiteboard.h 52include/libpurple/whiteboard.h
53include/libpurple/xmlnode.h 53include/libpurple/xmlnode.h
54lib/libpurple.la 54lib/libpurple.la
55lib/pkgconfig/purple.pc 55lib/pkgconfig/purple.pc
56lib/purple-2/autoaccept.la 56lib/purple-2/autoaccept.la
57lib/purple-2/buddynote.la 57lib/purple-2/buddynote.la
58lib/purple-2/idle.la 58lib/purple-2/idle.la
59lib/purple-2/joinpart.la 59lib/purple-2/joinpart.la
60lib/purple-2/libaim.la 60lib/purple-2/libaim.la
 61${PLIST.avahi}lib/purple-2/libbonjour.la
61lib/purple-2/libgg.la 62lib/purple-2/libgg.la
62lib/purple-2/libicq.la 63lib/purple-2/libicq.la
63lib/purple-2/libirc.la 64lib/purple-2/libirc.la
64lib/purple-2/libjabber.la 65lib/purple-2/libjabber.la
65lib/purple-2/libmsn.la 66lib/purple-2/libmsn.la
66lib/purple-2/libmyspace.la 67lib/purple-2/libmyspace.la
67lib/purple-2/libnovell.la 68lib/purple-2/libnovell.la
68lib/purple-2/liboscar.la 69lib/purple-2/liboscar.la
69lib/purple-2/libqq.la 70lib/purple-2/libqq.la
70lib/purple-2/libsimple.la 71lib/purple-2/libsimple.la
71lib/purple-2/libxmpp.la 72lib/purple-2/libxmpp.la
72lib/purple-2/libyahoo.la 73lib/purple-2/libyahoo.la
73lib/purple-2/libzephyr.la 74lib/purple-2/libzephyr.la
cvs diff -r1.9 -r1.10 pkgsrc/chat/libpurple/options.mk (expand / switch to unified diff)

--- pkgsrc/chat/libpurple/options.mk 2008/12/21 00:12:10 1.9
+++ pkgsrc/chat/libpurple/options.mk 2008/12/21 14:08:39 1.10
@@ -1,22 +1,27 @@ @@ -1,22 +1,27 @@
1# $NetBSD: options.mk,v 1.9 2008/12/21 00:12:10 ahoka Exp $ 1# $NetBSD: options.mk,v 1.10 2008/12/21 14:08:39 ahoka Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple 3PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple
4PKG_SUPPORTED_OPTIONS+= gnutls perl tcl debug dbus sasl 4PKG_SUPPORTED_OPTIONS+= gnutls perl tcl debug dbus sasl avahi
5PKG_SUGGESTED_OPTIONS+= gnutls dbus 5PKG_SUGGESTED_OPTIONS+= gnutls dbus avahi
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= dbus 9PLIST_VARS+= dbus avahi
 10
 11.if !empty(PKG_OPTIONS:Mavahi)
 12PLIST.avahi= yes
 13. include "../../net/avahi/buildlink3.mk"
 14.endif
10 15
11.if !empty(PKG_OPTIONS:Mgnutls) 16.if !empty(PKG_OPTIONS:Mgnutls)
12CONFIGURE_ARGS+= --enable-gnutls 17CONFIGURE_ARGS+= --enable-gnutls
13CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include 18CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
14CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib 19CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
15 20
16. include "../../security/gnutls/buildlink3.mk" 21. include "../../security/gnutls/buildlink3.mk"
17.else 22.else
18CONFIGURE_ARGS+= --enable-nss 23CONFIGURE_ARGS+= --enable-nss
19CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr 24CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
20CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr 25CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr
21CONFIGURE_ARGS+= --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss 26CONFIGURE_ARGS+= --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss
22CONFIGURE_ARGS+= --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss 27CONFIGURE_ARGS+= --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss
cvs diff -r1.5 -r1.6 pkgsrc/chat/pidgin/options.mk (expand / switch to unified diff)

--- pkgsrc/chat/pidgin/options.mk 2008/12/21 00:12:10 1.5
+++ pkgsrc/chat/pidgin/options.mk 2008/12/21 14:08:39 1.6
@@ -1,35 +1,30 @@ @@ -1,35 +1,30 @@
1# $NetBSD: options.mk,v 1.5 2008/12/21 00:12:10 ahoka Exp $ 1# $NetBSD: options.mk,v 1.6 2008/12/21 14:08:39 ahoka Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.pidgin 3PKG_OPTIONS_VAR= PKG_OPTIONS.pidgin
4PKG_SUPPORTED_OPTIONS+= dbus debug gstreamer gtkspell avahi 4PKG_SUPPORTED_OPTIONS+= dbus debug gstreamer gtkspell
5PKG_SUGGESTED_OPTIONS+= gtkspell dbus gstreamer avahi 5PKG_SUGGESTED_OPTIONS+= gtkspell dbus gstreamer
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= dbus 9PLIST_VARS+= dbus
10 10
11.if !empty(PKG_OPTIONS:Mdbus) 11.if !empty(PKG_OPTIONS:Mdbus)
12CONFIGURE_ARGS+= --enable-dbus 12CONFIGURE_ARGS+= --enable-dbus
13PLIST.dbus= yes 13PLIST.dbus= yes
14. include "../../sysutils/dbus/buildlink3.mk" 14. include "../../sysutils/dbus/buildlink3.mk"
15. include "../../sysutils/dbus-glib/buildlink3.mk" 15. include "../../sysutils/dbus-glib/buildlink3.mk"
16.endif 16.endif
17 17
18.if !empty(PKG_OPTIONS:Mavahi) 
19PLIST.avahi= yes 
20. include "../../net/avahi/buildlink3.mk" 
21.endif 
22 
23.if !empty(PKG_OPTIONS:Mgtkspell) 18.if !empty(PKG_OPTIONS:Mgtkspell)
24CONFIGURE_ARGS+= --enable-gtkspell 19CONFIGURE_ARGS+= --enable-gtkspell
25. include "../../textproc/gtkspell/buildlink3.mk" 20. include "../../textproc/gtkspell/buildlink3.mk"
26.else 21.else
27CONFIGURE_ARGS+= --disable-gtkspell 22CONFIGURE_ARGS+= --disable-gtkspell
28.endif 23.endif
29 24
30.if !empty(PKG_OPTIONS:Mgstreamer) 25.if !empty(PKG_OPTIONS:Mgstreamer)
31CONFIGURE_ARGS+= --enable-gstreamer 26CONFIGURE_ARGS+= --enable-gstreamer
32. include "../../multimedia/gstreamer0.10/buildlink3.mk" 27. include "../../multimedia/gstreamer0.10/buildlink3.mk"
33.endif 28.endif
34 29
35.if !empty(PKG_OPTIONS:Mdebug) 30.if !empty(PKG_OPTIONS:Mdebug)