Update to libpurple-2.4.2.

o In MySpaceIM, messages from spambots are discarded (Justin Williams)
o Strip mIRC formatting codes from quit and part messages.
o IRC now displays ban lists in-channel for joined channels.
o Fixed a bug where the list of loaded plugins would get removed when
  switching between different operating systems.
o Fix reception of IRC PART without a part message on Undernet
  (fixes a problem with litter in the channel user list).
o IRC no longer crashes on /list on servers which erroneously omit RPL_LISTSTART
o Update the NetworkManager support to use D-Bus directly, instead of
  libnm-glib. Hopefully it's stable now. It will now compile by default if you
  have D-Bus support and NetworkManager.h. (Elliott Sales de Andrade)
o MSN buddy list synchronization is now more forgiving, only asking about
  buddies who have disappeared completely from the server list and not those
  that have simply moved groups.
o IRC will now try to append 1-9 to your nick if it is in use, instead of
  substituting the last character with 1-9 where possible.
o Bonjour buddies will be saved persistently if they're moved out of the
  "Bonjour" group. (Eion Robb)

6 files changed, 48 insertions, 26 deletions

diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index 4ca042d1f2a..c3f89f41ca7 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2008/04/29 10:55:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2008/05/17 22:56:17 tnn Exp $
 #
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
-PKGREVISION=	1
 COMMENT=	Multi-protocol Instant Messaging client backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -20,10 +19,6 @@ GCONF_SCHEMAS+=	purple.schemas
 PKGCONFIG_OVERRIDE+=	gaim.pc.in
 PKGCONFIG_OVERRIDE+=	libpurple/purple.pc.in
 
-CONFIGURE_ARGS+=	--disable-gevolution
-CONFIGURE_ARGS+=	--disable-gtkui
-CONFIGURE_ARGS+=	--disable-consoleui
-
 .include "options.mk"
 
 BUILD_DIRS=	m4macros libpurple po share/ca-certs share/sounds
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index b94b040dcaa..e2a091d35db 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.14 2008/04/05 02:14:40 tnn Exp $
+# $NetBSD: Makefile.common,v 1.15 2008/05/17 22:56:17 tnn Exp $
 #
 # used by chat/finch/Makefile
+# used by chat/libpurple/Makefile
 # used by chat/pidgin/Makefile
 
-PIDGIN_VERSION=	2.4.1
+PIDGIN_VERSION=	2.4.2
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
@@ -19,3 +20,10 @@ USE_PKGLOCALEDIR=	yes
 
 PATCHDIR=		${.CURDIR}/../../chat/libpurple/patches
 DISTINFO_FILE?=		${.CURDIR}/../../chat/libpurple/distinfo
+
+CONFIGURE_ARGS+=	--disable-gevolution
+CONFIGURE_ARGS+=	--disable-gtkui
+CONFIGURE_ARGS+=	--disable-consoleui
+CONFIGURE_ARGS+=	--disable-meanwhile
+CONFIGURE_ARGS+=	--disable-gstreamer
+CONFIGURE_ARGS+=	--disable-avahi
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index 74217225226..114dc1395d9 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2008/04/29 10:55:02 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/05/17 22:56:17 tnn Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -125,6 +125,7 @@ share/locale/nb/LC_MESSAGES/pidgin.mo
 share/locale/ne/LC_MESSAGES/pidgin.mo
 share/locale/nl/LC_MESSAGES/pidgin.mo
 share/locale/nn/LC_MESSAGES/pidgin.mo
+share/locale/oc/LC_MESSAGES/pidgin.mo
 share/locale/pa/LC_MESSAGES/pidgin.mo
 share/locale/pl/LC_MESSAGES/pidgin.mo
 share/locale/ps/LC_MESSAGES/pidgin.mo
diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk
index 627b9fc82a6..42b8a6ab3f9 100644
--- a/chat/libpurple/buildlink3.mk
+++ b/chat/libpurple/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2008/04/05 02:14:40 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2008/05/17 22:56:17 tnn Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPURPLE_BUILDLINK3_MK:=	${LIBPURPLE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	libpurple
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpurple
 
 .if ${LIBPURPLE_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libpurple+=	libpurple>=2.4.1
+BUILDLINK_API_DEPENDS.libpurple+=	libpurple>=2.4.2
 BUILDLINK_PKGSRCDIR.libpurple?=	../../chat/libpurple
 .endif	# LIBPURPLE_BUILDLINK3_MK
 
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index 129e81f196e..d8183069035 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2008/04/05 02:14:40 tnn Exp $
+$NetBSD: distinfo,v 1.15 2008/05/17 22:56:17 tnn Exp $
 
-SHA1 (pidgin-2.4.1.tar.bz2) = 3c86d1ec487eade72d5d513dcd5bb491e50640d2
-RMD160 (pidgin-2.4.1.tar.bz2) = cd9de3b9260dcc4f2f2b11a5fb5d7b210f3a83c2
-Size (pidgin-2.4.1.tar.bz2) = 9459078 bytes
-SHA1 (patch-aa) = 3d3282be44c933d015c75b0785b4d5582c216383
+SHA1 (pidgin-2.4.2.tar.bz2) = 66c0aa58122f29c3a0262a555f05af46ca76fa77
+RMD160 (pidgin-2.4.2.tar.bz2) = 5609117af4cfd23bffdd4c071b5239750ad6bcfc
+Size (pidgin-2.4.2.tar.bz2) = 9376721 bytes
+SHA1 (patch-aa) = eb8f1bd893cbf21de47bd0671a45dc3fed9f3f63
 SHA1 (patch-ab) = 5f1fc87cc258de372fbdf521aeb6822f50506090
 SHA1 (patch-ae) = ff4f2d738656c6f23c423046f746b9ed2878c415
 SHA1 (patch-ag) = fa71295e848f1b06f318f06fab8fcc90110c20a3
diff --git a/chat/libpurple/patches/patch-aa b/chat/libpurple/patches/patch-aa
index 2f270565769..955eb529094 100644
--- a/chat/libpurple/patches/patch-aa
+++ b/chat/libpurple/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2007/09/30 13:47:03 tnn Exp $
+$NetBSD: patch-aa,v 1.8 2008/05/17 22:56:17 tnn Exp $
 
---- configure.orig	2007-09-29 18:40:51.000000000 +0200
+--- configure.orig	2008-05-16 20:53:50.000000000 +0200
 +++ configure
-@@ -19940,6 +19940,11 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -20047,6 +20047,11 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
  
  
  
@@ -14,24 +14,42 @@ $NetBSD: patch-aa,v 1.7 2007/09/30 13:47:03 tnn Exp $
  # Use the tools built into the package, not the ones that are installed.
  INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
  
-@@ -20173,6 +20178,7 @@ else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+@@ -20117,6 +20122,7 @@ echo "$as_me: error: XML::Parser perl mo
+    { (exit 1); exit 1; }; }
+    fi
  fi
 +fi # pkgsrc
  
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
  
- 
-@@ -28484,7 +28490,7 @@ if test "${ac_cv_lib_panel_update_panels
+@@ -28293,7 +28299,7 @@ if test "${ac_cv_lib_panelw_update_panel
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpanelw  $LIBS"
++LIBS="-lpanelw -lncursesw $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -28349,7 +28355,7 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_panelw_update_panels" >&5
+ echo "${ECHO_T}$ac_cv_lib_panelw_update_panels" >&6; }
+ if test $ac_cv_lib_panelw_update_panels = yes; then
+-  GNT_LIBS="$GNT_LIBS -lpanelw"
++  GNT_LIBS="$GNT_LIBS -lpanelw -lncursesw"
+ else
+   enable_consoleui=no
+ fi
+@@ -28647,7 +28653,7 @@ if test "${ac_cv_lib_panel_update_panels
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpanel  $LIBS"
-+LIBS="-lpanel -lncurses  $LIBS"
++LIBS="-lpanel -lncurses $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28540,7 +28546,7 @@ fi
+@@ -28703,7 +28709,7 @@ fi
  { echo "$as_me:$LINENO: result: $ac_cv_lib_panel_update_panels" >&5
  echo "${ECHO_T}$ac_cv_lib_panel_update_panels" >&6; }
  if test $ac_cv_lib_panel_update_panels = yes; then