diff options
Diffstat (limited to 'chat/libpurple')
-rw-r--r-- | chat/libpurple/Makefile.common | 6 | ||||
-rw-r--r-- | chat/libpurple/PLIST | 5 | ||||
-rw-r--r-- | chat/libpurple/distinfo | 13 | ||||
-rw-r--r-- | chat/libpurple/patches/patch-aa | 22 | ||||
-rw-r--r-- | chat/libpurple/patches/patch-ae | 15 | ||||
-rw-r--r-- | chat/libpurple/patches/patch-ag | 17 |
6 files changed, 19 insertions, 59 deletions
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common index cfb27935ea8..fcc15cf9e3f 100644 --- a/chat/libpurple/Makefile.common +++ b/chat/libpurple/Makefile.common @@ -1,12 +1,12 @@ -# $NetBSD: Makefile.common,v 1.23 2008/12/21 14:08:39 ahoka Exp $ +# $NetBSD: Makefile.common,v 1.24 2008/12/22 18:47:43 jmcneill Exp $ # # used by chat/finch/Makefile # used by chat/libpurple/Makefile # used by chat/pidgin/Makefile +# used by chat/pidgin-sametime/Makefile # used by chat/pidgin-silc/Makefile -PIDGIN_VERSION= 2.5.1 -PKGREVISION= 2 +PIDGIN_VERSION= 2.5.3 DISTNAME= pidgin-${PIDGIN_VERSION} CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/} diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST index 90307a23aae..c0c94101299 100644 --- a/chat/libpurple/PLIST +++ b/chat/libpurple/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2008/12/21 14:08:39 ahoka Exp $ +@comment $NetBSD: PLIST,v 1.16 2008/12/22 18:47:44 jmcneill Exp $ include/libpurple/account.h include/libpurple/accountopt.h include/libpurple/blist.h @@ -77,7 +77,6 @@ lib/purple-2/newline.la lib/purple-2/offlinemsg.la lib/purple-2/psychic.la lib/purple-2/ssl-gnutls.la -lib/purple-2/ssl-nss.la lib/purple-2/ssl.la lib/purple-2/statenotify.la share/aclocal/purple.m4 @@ -123,6 +122,7 @@ share/locale/ku/LC_MESSAGES/pidgin.mo share/locale/lo/LC_MESSAGES/pidgin.mo share/locale/lt/LC_MESSAGES/pidgin.mo share/locale/mk/LC_MESSAGES/pidgin.mo +share/locale/mn/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 @@ -158,6 +158,7 @@ share/purple/ca-certs/CAcert_Class3.pem share/purple/ca-certs/CAcert_Root.pem share/purple/ca-certs/Equifax_Secure_CA.pem share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem +share/purple/ca-certs/Microsoft_Internet_Authority.pem share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem share/purple/ca-certs/StartCom_Free_SSL_CA.pem share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo index 194a749d2fb..f477397f65c 100644 --- a/chat/libpurple/distinfo +++ b/chat/libpurple/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.18 2008/09/16 19:54:21 abs Exp $ +$NetBSD: distinfo,v 1.19 2008/12/22 18:47:44 jmcneill Exp $ -SHA1 (pidgin-2.5.1.tar.bz2) = 8b7be1be4d549d9c0e34c820c8a285aab5e116d7 -RMD160 (pidgin-2.5.1.tar.bz2) = d9f927db55ecc55a2e66b064612774575b82b062 -Size (pidgin-2.5.1.tar.bz2) = 8952067 bytes -SHA1 (patch-aa) = b8b0ecb358cc053c1034768b3f80e0e1ae523aa2 -SHA1 (patch-ae) = ff4f2d738656c6f23c423046f746b9ed2878c415 -SHA1 (patch-ag) = fa71295e848f1b06f318f06fab8fcc90110c20a3 +SHA1 (pidgin-2.5.3.tar.bz2) = bd3f6eca0a0c9b221be8a664e904450db8589314 +RMD160 (pidgin-2.5.3.tar.bz2) = c139b2746f2557f5f132e6460f5bff7009fd8259 +Size (pidgin-2.5.3.tar.bz2) = 8393073 bytes +SHA1 (patch-aa) = 5e12c4ce353811387595c35590ecd9d1fa415be7 +SHA1 (patch-ae) = 33d7197c76cee9eca51faceda2af681079198676 diff --git a/chat/libpurple/patches/patch-aa b/chat/libpurple/patches/patch-aa index fb0a80f79e4..e0e3a34409b 100644 --- a/chat/libpurple/patches/patch-aa +++ b/chat/libpurple/patches/patch-aa @@ -1,27 +1,7 @@ -$NetBSD: patch-aa,v 1.10 2008/09/16 19:54:21 abs Exp $ +$NetBSD: patch-aa,v 1.11 2008/12/22 18:47:44 jmcneill Exp $ --- configure.orig 2008-08-31 05:38:17.000000000 +0100 +++ configure -@@ -20181,6 +20181,11 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %. - - - -+INTLTOOL_EXTRACT=intltool-extract -+INTLTOOL_MERGE=intltool-merge -+INTLTOOL_UPDATE=intltool-update -+# disable pidgin's builtin intltool -+if test -n ""; then - # Use the tools built into the package, not the ones that are installed. - INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' - -@@ -20251,6 +20256,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 - @@ -29014,7 +29020,7 @@ if test "${ac_cv_lib_panelw_update_panel echo $ECHO_N "(cached) $ECHO_C" >&6 else diff --git a/chat/libpurple/patches/patch-ae b/chat/libpurple/patches/patch-ae index 7ecba8b150d..231efc0b072 100644 --- a/chat/libpurple/patches/patch-ae +++ b/chat/libpurple/patches/patch-ae @@ -1,14 +1,11 @@ -$NetBSD: patch-ae,v 1.2 2007/09/30 13:47:03 tnn Exp $ +$NetBSD: patch-ae,v 1.3 2008/12/22 18:47:44 jmcneill Exp $ - man pages for pidgin or finch only in the respective packages - ---- doc/Makefile.in.orig 2007-09-29 18:40:53.000000000 +0200 -+++ doc/Makefile.in -@@ -300,7 +300,8 @@ target_os = @target_os@ +--- doc/Makefile.in.orig 2008-12-20 19:38:39.000000000 -0500 ++++ doc/Makefile.in 2008-12-22 12:54:04.000000000 -0500 +@@ -415,6 +415,8 @@ + target_os = @target_os@ target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --man_MANS = pidgin.1 finch.1 + man_MANS = pidgin.1 finch.1 +@ENABLE_GTK_TRUE@man_MANS = pidgin.1 +@ENABLE_GNT_TRUE@man_MANS += finch.1 EXTRA_DIST = \ diff --git a/chat/libpurple/patches/patch-ag b/chat/libpurple/patches/patch-ag deleted file mode 100644 index 03933300490..00000000000 --- a/chat/libpurple/patches/patch-ag +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2007/09/30 13:47:03 tnn Exp $ - - The default rule has a broken syntax for some reason, when not using - the intltool that comes bundled with pidgin. - ---- libpurple/gconf/Makefile.in.orig 2007-09-29 18:40:54.000000000 +0200 -+++ libpurple/gconf/Makefile.in -@@ -496,7 +496,8 @@ uninstall-am: uninstall-schemaDATA - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-schemaDATA - --@INTLTOOL_SCHEMAS_RULE@ -+%.schemas: %.schemas.in -+ LC_ALL=C intltool-merge -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ - - @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: - @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \ |