Update to 2.10.12. See https://developer.pidgin.im/wiki/ChangeLog

for changes in this release.

6 files changed, 41 insertions, 21 deletions

diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index 6d1e3bf46a14..f29431c7a4c7 100644
--- a/net-im/finch/Makefile
+++ b/net-im/finch/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports-stable/net-im/gaim-consoleui-devel/Makefile,v 1.2 2006/10/29 18:55:28 marcus Exp $
 
 PORTNAME=	finch
-PORTREVISION=	1
+PORTREVISION=	0
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Finch multi-protocol messaging client (Console UI)
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index c7dd47fb6be2..06fdc6b305ae 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.10.11
+PORTVERSION=	2.10.12
 PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
@@ -106,6 +106,21 @@ CONFIGURE_ARGS+=--with-ncurses-headers=${LOCALBASE}/include/ncurses/
 USES+=		ncurses
 .endif
 
+.if ${PORT_OPTIONS:MPERL}
+USES+=			perl5
+CONFIGURE_ARGS+=	--with-perl-lib=site
+PLIST_SUB+=		PERL:=""
+.if !defined(PIDGIN_SLAVE) || defined(WITH_GTKUI)
+PLIST_SUB+=		PERLMAN:=""
+.else
+PLIST_SUB+=		PERLMAN:="@comment not installed: "
+.endif
+.else
+CONFIGURE_ARGS+=	--disable-perl
+PLIST_SUB+=		PERL:="@comment not installed: " \
+			PERLMAN:="@comment not installed: "
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if !defined(PIDGIN_SLAVE)
@@ -208,21 +223,6 @@ CONFIGURE_ARGS+=	--disable-dbus
 PLIST_SUB+=		DBUS="@comment not installed: "
 .endif
 
-.if ${PORT_OPTIONS:MPERL}
-USES+=			perl5
-CONFIGURE_ARGS+=	--with-perl-lib=site
-PLIST_SUB+=		PERL:=""
-.if !defined(PIDGIN_SLAVE)
-PLIST_SUB+=		PERLMAN:=""
-.else
-PLIST_SUB+=		PERLMAN:="@comment not installed: "
-.endif
-.else
-CONFIGURE_ARGS+=	--disable-perl
-PLIST_SUB+=		PERL:="@comment not installed: " \
-			PERLMAN:="@comment not installed: "
-.endif
-
 .if ${PORT_OPTIONS:MSAMETIME}
 LIB_DEPENDS+=	libmeanwhile.so:${PORTSDIR}/net-im/meanwhile
 PLIST_SUB+=	SAMETIME=""
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index 63c5fd560aaf..23af95d8f674 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pidgin-2.10.11.tar.bz2) = f2ae211341fc77efb9945d40e9932aa535cdf3a6c8993fe7919fca8cc1c04007
-SIZE (pidgin-2.10.11.tar.bz2) = 9458050
+SHA256 (pidgin-2.10.12.tar.bz2) = 2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd
+SIZE (pidgin-2.10.12.tar.bz2) = 9837598
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 9dad7fcb2131..c91f3fa557a5 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -137,6 +137,7 @@ lib/purple-2/offlinemsg.so
 %%PERL:%%lib/purple-2/perl.a
 %%PERL:%%lib/purple-2/perl.so
 %%PERL:%%lib/purple-2/perl/Purple.pm
+%%PERL:%%lib/purple-2/perl/auto/Purple/.packlist
 %%PERL:%%lib/purple-2/perl/auto/Purple/Purple.so
 %%PERL:%%lib/purple-2/perl/auto/Purple/autosplit.ix
 lib/purple-2/psychic.a
@@ -154,11 +155,11 @@ lib/purple-2/statenotify.so
 %%DBUS%%lib/libpurple-client.a
 %%DBUS%%lib/libpurple-client.so
 %%DBUS%%lib/libpurple-client.so.0
-%%DBUS%%lib/libpurple-client.so.0.10.11
+%%DBUS%%lib/libpurple-client.so.0.10.12
 lib/libpurple.a
 lib/libpurple.so
 lib/libpurple.so.0
-lib/libpurple.so.0.10.11
+lib/libpurple.so.0.10.12
 libdata/pkgconfig/purple.pc
 %%CONSOLEUI%%man/man1/finch.1.gz
 %%GTKUI%%man/man1/pidgin.1.gz
@@ -167,12 +168,15 @@ share/aclocal/purple.m4
 share/locale/af/LC_MESSAGES/pidgin.mo
 share/locale/am/LC_MESSAGES/pidgin.mo
 share/locale/ar/LC_MESSAGES/pidgin.mo
+share/locale/as/LC_MESSAGES/pidgin.mo
 share/locale/ast/LC_MESSAGES/pidgin.mo
 share/locale/az/LC_MESSAGES/pidgin.mo
 share/locale/be@latin/LC_MESSAGES/pidgin.mo
 share/locale/bg/LC_MESSAGES/pidgin.mo
 share/locale/bn/LC_MESSAGES/pidgin.mo
 share/locale/bn_IN/LC_MESSAGES/pidgin.mo
+share/locale/br/LC_MESSAGES/pidgin.mo
+share/locale/brx/LC_MESSAGES/pidgin.mo
 share/locale/bs/LC_MESSAGES/pidgin.mo
 share/locale/ca/LC_MESSAGES/pidgin.mo
 share/locale/ca@valencia/LC_MESSAGES/pidgin.mo
@@ -186,6 +190,7 @@ share/locale/en_CA/LC_MESSAGES/pidgin.mo
 share/locale/en_GB/LC_MESSAGES/pidgin.mo
 share/locale/eo/LC_MESSAGES/pidgin.mo
 share/locale/es/LC_MESSAGES/pidgin.mo
+share/locale/es_AR/LC_MESSAGES/pidgin.mo
 share/locale/et/LC_MESSAGES/pidgin.mo
 share/locale/eu/LC_MESSAGES/pidgin.mo
 share/locale/fa/LC_MESSAGES/pidgin.mo
@@ -206,6 +211,7 @@ share/locale/kk/LC_MESSAGES/pidgin.mo
 share/locale/ko/LC_MESSAGES/pidgin.mo
 share/locale/km/LC_MESSAGES/pidgin.mo
 share/locale/kn/LC_MESSAGES/pidgin.mo
+share/locale/ks/LC_MESSAGES/pidgin.mo
 share/locale/ku/LC_MESSAGES/pidgin.mo
 share/locale/ku_IQ/LC_MESSAGES/pidgin.mo
 share/locale/lt/LC_MESSAGES/pidgin.mo
@@ -213,8 +219,10 @@ share/locale/lv/LC_MESSAGES/pidgin.mo
 share/locale/mai/LC_MESSAGES/pidgin.mo
 share/locale/mhr/LC_MESSAGES/pidgin.mo
 share/locale/mk/LC_MESSAGES/pidgin.mo
+share/locale/ml/LC_MESSAGES/pidgin.mo
 share/locale/mn/LC_MESSAGES/pidgin.mo
 share/locale/mr/LC_MESSAGES/pidgin.mo
+share/locale/ms_MY/LC_MESSAGES/pidgin.mo
 share/locale/my_MM/LC_MESSAGES/pidgin.mo
 share/locale/nb/LC_MESSAGES/pidgin.mo
 share/locale/ne/LC_MESSAGES/pidgin.mo
@@ -229,6 +237,7 @@ share/locale/pt/LC_MESSAGES/pidgin.mo
 share/locale/pt_BR/LC_MESSAGES/pidgin.mo
 share/locale/ro/LC_MESSAGES/pidgin.mo
 share/locale/ru/LC_MESSAGES/pidgin.mo
+share/locale/sd/LC_MESSAGES/pidgin.mo
 share/locale/si/LC_MESSAGES/pidgin.mo
 share/locale/sk/LC_MESSAGES/pidgin.mo
 share/locale/sl/LC_MESSAGES/pidgin.mo
@@ -244,6 +253,7 @@ share/locale/tr/LC_MESSAGES/pidgin.mo
 share/locale/tt/LC_MESSAGES/pidgin.mo
 share/locale/uk/LC_MESSAGES/pidgin.mo
 share/locale/ur/LC_MESSAGES/pidgin.mo
+share/locale/uz/LC_MESSAGES/pidgin.mo
 share/locale/vi/LC_MESSAGES/pidgin.mo
 share/locale/xh/LC_MESSAGES/pidgin.mo
 share/locale/zh_CN/LC_MESSAGES/pidgin.mo
@@ -255,6 +265,8 @@ share/purple/ca-certs/America_Online_Root_Certification_Authority_1.pem
 share/purple/ca-certs/Baltimore_CyberTrust_Root.pem
 share/purple/ca-certs/CAcert_Class3.pem
 share/purple/ca-certs/CAcert_Root.pem
+share/purple/ca-certs/Certum_Root_CA.pem
+share/purple/ca-certs/Certum_Trusted_Network_CA.pem
 share/purple/ca-certs/Deutsche_Telekom_Root_CA_2.pem
 share/purple/ca-certs/DigiCertHighAssuranceCA-3.pem
 share/purple/ca-certs/DigiCertHighAssuranceEVRootCA.pem
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index b0e73a12c51d..7e86482f7edb 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -29,6 +29,10 @@ CONFIGURE_ARGS=	--disable-consoleui \
 		--enable-screensaver \
 		--with-dynamic_prpls=${PRPL_MODULES:S/,$//}
 
+post-stage:
+	@${SED} -i '' -e 's|^${STAGEDIR}||g' \
+		${STAGEDIR}${PREFIX}/lib/pidgin/perl/auto/Pidgin/.packlist
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/pidgin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index fc20bb716998..a928d75e4f9b 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -49,6 +49,9 @@ include/pidgin/minidialog.h
 include/pidgin/pidgin.h
 include/pidgin/pidginstock.h
 include/pidgin/pidgintooltip.h
+%%PERL:%%lib/pidgin/perl/Pidgin.pm
+%%PERL:%%lib/pidgin/perl/auto/Pidgin/Pidgin.so
+%%PERL:%%lib/pidgin/perl/auto/Pidgin/.packlist
 %%CAP%%lib/pidgin/cap.so
 lib/pidgin/convcolors.so
 lib/pidgin/extplacement.so
@@ -73,6 +76,7 @@ lib/pidgin/xmppconsole.so
 lib/pidgin/xmppdisco.so
 libdata/pkgconfig/pidgin.pc
 man/man1/pidgin.1.gz
+%%PERLMAN:%%man/man3/Pidgin.3.gz
 share/appdata/pidgin.appdata.xml
 share/applications/pidgin.desktop
 share/icons/hicolor/16x16/apps/pidgin.png