summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chat/finch/Makefile4
-rw-r--r--chat/libpurple/Makefile.common6
-rw-r--r--chat/libpurple/PLIST5
-rw-r--r--chat/libpurple/distinfo13
-rw-r--r--chat/libpurple/patches/patch-aa22
-rw-r--r--chat/libpurple/patches/patch-ae15
-rw-r--r--chat/libpurple/patches/patch-ag17
-rw-r--r--chat/pidgin-sametime/Makefile4
-rw-r--r--chat/pidgin-silc/Makefile4
-rw-r--r--chat/pidgin-silc/distinfo13
-rw-r--r--chat/pidgin/PLIST50
11 files changed, 78 insertions, 75 deletions
diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index 1159eac45f7..7c205e0c2fd 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/11/02 13:02:51 obache Exp $
+# $NetBSD: Makefile,v 1.16 2008/12/22 18:47:44 jmcneill Exp $
#
PKGNAME= finch-${PIDGIN_VERSION}
@@ -9,7 +9,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../chat/libpurple/Makefile.common"
-USE_TOOLS+= msgfmt
+USE_TOOLS+= msgfmt perl
PKGCONFIG_OVERRIDE+= finch/finch.pc.in
PKGCONFIG_OVERRIDE+= finch/libgnt/gnt.pc.in
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 | \
diff --git a/chat/pidgin-sametime/Makefile b/chat/pidgin-sametime/Makefile
index f3214d3e8cb..8ecc7813a82 100644
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/07/11 07:39:20 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2008/12/22 18:47:44 jmcneill Exp $
#
PKGNAME= pidgin-sametime-${PIDGIN_VERSION}
@@ -8,7 +8,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../chat/libpurple/Makefile.common"
-USE_TOOLS+= msgfmt
+USE_TOOLS+= msgfmt perl
CONFIGURE_ARGS+= --enable-meanwhile
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index b60d5687fa6..7478b5004bc 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/07/11 07:39:21 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2008/12/22 18:47:44 jmcneill Exp $
#
PKGNAME= pidgin-silc-${PIDGIN_VERSION}
@@ -8,7 +8,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../chat/libpurple/Makefile.common"
-USE_TOOLS+= msgfmt
+USE_TOOLS+= msgfmt perl
BUILD_DIRS= libpurple/protocols/silc
diff --git a/chat/pidgin-silc/distinfo b/chat/pidgin-silc/distinfo
index 86180548d48..fa77b26c94b 100644
--- a/chat/pidgin-silc/distinfo
+++ b/chat/pidgin-silc/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.15 2008/09/26 00:45:33 obache Exp $
+$NetBSD: distinfo,v 1.16 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 (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 (silc-toolkit-1.1.7.tar.gz) = a25918e83d5070ff75b7d6f296698dada76a92ca
RMD160 (silc-toolkit-1.1.7.tar.gz) = 783297f44d577d5ec7dcff7952996944e4b1d5c6
Size (silc-toolkit-1.1.7.tar.gz) = 2678989 bytes
-SHA1 (patch-aa) = b8b0ecb358cc053c1034768b3f80e0e1ae523aa2
-SHA1 (patch-ae) = ff4f2d738656c6f23c423046f746b9ed2878c415
-SHA1 (patch-ag) = fa71295e848f1b06f318f06fab8fcc90110c20a3
+SHA1 (patch-aa) = 5e12c4ce353811387595c35590ecd9d1fa415be7
+SHA1 (patch-ae) = 33d7197c76cee9eca51faceda2af681079198676
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST
index 4840580362c..9a79c50ef81 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2008/09/16 19:59:46 abs Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/12/22 18:47:44 jmcneill Exp $
bin/pidgin
include/pidgin/eggtrayicon.h
include/pidgin/gtkaccount.h
@@ -356,6 +356,47 @@ share/pixmaps/pidgin/emotes/default/worship.png
share/pixmaps/pidgin/emotes/default/yawn.png
share/pixmaps/pidgin/emotes/default/yin-yang.png
share/pixmaps/pidgin/emotes/none/theme
+share/pixmaps/pidgin/emotes/small/angel.png
+share/pixmaps/pidgin/emotes/small/angry.png
+share/pixmaps/pidgin/emotes/small/beer.png
+share/pixmaps/pidgin/emotes/small/camera.png
+share/pixmaps/pidgin/emotes/small/cigarette.png
+share/pixmaps/pidgin/emotes/small/coffee.png
+share/pixmaps/pidgin/emotes/small/confused.png
+share/pixmaps/pidgin/emotes/small/console.png
+share/pixmaps/pidgin/emotes/small/cool.png
+share/pixmaps/pidgin/emotes/small/cross.png
+share/pixmaps/pidgin/emotes/small/crying.png
+share/pixmaps/pidgin/emotes/small/devil.png
+share/pixmaps/pidgin/emotes/small/dont-know.png
+share/pixmaps/pidgin/emotes/small/grin.png
+share/pixmaps/pidgin/emotes/small/hug-left.png
+share/pixmaps/pidgin/emotes/small/hug-right.png
+share/pixmaps/pidgin/emotes/small/kiss.png
+share/pixmaps/pidgin/emotes/small/love.png
+share/pixmaps/pidgin/emotes/small/meeting.png
+share/pixmaps/pidgin/emotes/small/musical-note.png
+share/pixmaps/pidgin/emotes/small/nerdy.png
+share/pixmaps/pidgin/emotes/small/neutral.png
+share/pixmaps/pidgin/emotes/small/party.png
+share/pixmaps/pidgin/emotes/small/phone.png
+share/pixmaps/pidgin/emotes/small/plate.png
+share/pixmaps/pidgin/emotes/small/question.png
+share/pixmaps/pidgin/emotes/small/sad.png
+share/pixmaps/pidgin/emotes/small/shame.png
+share/pixmaps/pidgin/emotes/small/shock.png
+share/pixmaps/pidgin/emotes/small/sick.png
+share/pixmaps/pidgin/emotes/small/silent.png
+share/pixmaps/pidgin/emotes/small/sleepy.png
+share/pixmaps/pidgin/emotes/small/smile-big.png
+share/pixmaps/pidgin/emotes/small/smile.png
+share/pixmaps/pidgin/emotes/small/theme
+share/pixmaps/pidgin/emotes/small/thinking.png
+share/pixmaps/pidgin/emotes/small/tongue.png
+share/pixmaps/pidgin/emotes/small/tv.png
+share/pixmaps/pidgin/emotes/small/uhm-yeah.png
+share/pixmaps/pidgin/emotes/small/wink.png
+share/pixmaps/pidgin/emotes/small/yawn.png
share/pixmaps/pidgin/logo.png
share/pixmaps/pidgin/protocols/16/aim.png
share/pixmaps/pidgin/protocols/16/bonjour.png
@@ -415,6 +456,8 @@ share/pixmaps/pidgin/status/11/log-out.png
share/pixmaps/pidgin/status/11/offline.png
share/pixmaps/pidgin/status/11/person.png
share/pixmaps/pidgin/status/11/rtl/extended-away.png
+share/pixmaps/pidgin/status/11/rtl/log-in.png
+share/pixmaps/pidgin/status/11/rtl/log-out.png
share/pixmaps/pidgin/status/16/available.png
share/pixmaps/pidgin/status/16/away.png
share/pixmaps/pidgin/status/16/busy.png
@@ -459,13 +502,14 @@ share/pixmaps/pidgin/status/48/away.png
share/pixmaps/pidgin/status/48/busy.png
share/pixmaps/pidgin/status/48/chat.png
share/pixmaps/pidgin/status/48/extended-away.png
+share/pixmaps/pidgin/status/48/invisible.png
share/pixmaps/pidgin/status/48/log-in.png
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/status/48/rtl/log-in.png
+share/pixmaps/pidgin/status/48/rtl/log-out.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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 03:11:44 +0000