Update to 2.4.2. See http://developer.pidgin.im/wiki/ChangeLog for the list

of changes.

6 files changed, 21 insertions, 8 deletions

diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index 07b4a2fc774a..af1a6f4385cd 100644
--- a/net-im/finch/Makefile
+++ b/net-im/finch/Makefile
@@ -24,6 +24,7 @@ PIDGIN_SLAVE=	yes
 WITH_CONSOLEUI=	yes
 
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-gtkui
+CONFIGURE_ARGS=	--disable-gtkui \
+		--disable-nm
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index d1d409607a61..32755dfe7c25 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.4.1
-PORTREVISION?=	2
+PORTVERSION=	2.4.2
+PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pidgin
@@ -23,7 +23,8 @@ USE_GNOME?=	gnomeprefix gnomehack intlhack glib20 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-gtkui \
 		--disable-consoleui \
-		--with-dynamic_prpls=${PRPL_MODULES}
+		--with-dynamic_prpls=${PRPL_MODULES} \
+		--disable-nm
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		PTHREAD_LIB="${PTHREAD_LIBS}"
@@ -82,6 +83,7 @@ GCONF_SCHEMAS=	purple.schemas
 .if defined(WITH_GTKUI) && ${HAVE_GNOME:Mevolutiondataserver}!=""
 USE_GNOME+=		evolutiondataserver
 PLIST_SUB+=		EVO=""
+CONFIGURE_ARGS+=	--enable-gevolution
 .else
 CONFIGURE_ARGS+=	--disable-gevolution
 PLIST_SUB+=		EVO="@comment not installed: "
@@ -95,6 +97,7 @@ CONFIGURE_ARGS+=--disable-gstreamer
 
 .if defined(WITH_GTKUI) && !defined(WITHOUT_CAP)
 LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+=--enable-cap
 PLIST_SUB+=	CAP=""
 .else
 CONFIGURE_ARGS+=--disable-cap
@@ -162,6 +165,7 @@ CONFIGURE_ARGS+=	--with-tclconfig=${LOCALBASE}/lib/tcl${TCLTK_VER} \
 CFLAGS+=		-I${LOCALBASE}/include/tk${TCLTK_VER} -I${LOCALBASE}/include/tcl${TCLTK_VER}
 PLIST_SUB+=		TCL:=""
 .else
+CONFIGURE_ARGS+=	--disable-tcl
 PLIST_SUB+=		TCL:="@comment not installed: "
 .endif
 
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index 2f1b4443d9a5..b5b110ecbf9e 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (pidgin-2.4.1.tar.bz2) = ff015bb8bbdcc6a9b4ac954c355179d7
-SHA256 (pidgin-2.4.1.tar.bz2) = a4fa66247266e8e7453e13322a30910b944e7a406fa30c56cb84be9816b253c7
-SIZE (pidgin-2.4.1.tar.bz2) = 9459078
+MD5 (pidgin-2.4.2.tar.bz2) = 2d10f9b6a5f0162cf88016ea2ca0a36d
+SHA256 (pidgin-2.4.2.tar.bz2) = 3f09878883c6980083e7774371ec57d8bdc320a325342965afb120d52780d15f
+SIZE (pidgin-2.4.2.tar.bz2) = 9376721
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 319282c1ae86..6d6cf75d75bd 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -182,6 +182,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
@@ -236,6 +237,8 @@ share/sounds/purple/send.wav
 @dirrmtry share/locale/si
 @dirrmtry share/locale/ps/LC_MESSAGES
 @dirrmtry share/locale/ps
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/my_MM/LC_MESSAGES
 @dirrmtry share/locale/my_MM
 @dirrmtry share/locale/lo/LC_MESSAGES
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 4904c722aecd..e9c06dd0802f 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -28,7 +28,8 @@ WITH_GTKUI=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20
 WANT_GNOME=	yes
-CONFIGURE_ARGS=	--disable-consoleui
+CONFIGURE_ARGS=	--disable-consoleui \
+		--disable-nm
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index 597b53bcbeb6..0cf7b99ff1eb 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -75,6 +75,8 @@ lib/pidgin/notify.la
 lib/pidgin/notify.so
 lib/pidgin/relnot.la
 lib/pidgin/relnot.so
+lib/pidgin/sendbutton.la
+lib/pidgin/sendbutton.so
 lib/pidgin/spellchk.la
 lib/pidgin/spellchk.so
 lib/pidgin/ticker.la
@@ -444,6 +446,8 @@ share/pixmaps/pidgin/status/48/log-out.png
 share/pixmaps/pidgin/status/48/offline.png
 share/pixmaps/pidgin/status/48/person.png
 share/pixmaps/pidgin/status/48/rtl/extended-away.png
+share/pixmaps/pidgin/status/48/rtl/login.png
+share/pixmaps/pidgin/status/48/rtl/logout.png
 share/pixmaps/pidgin/toolbar/16/change-bgcolor.png
 share/pixmaps/pidgin/toolbar/16/change-fgcolor.png
 share/pixmaps/pidgin/toolbar/16/emote-select.png