Here is an update to Pidgin 2.3.0.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 27 Oct 2007 16:57:20 -0000 1.12
+++ Makefile 26 Nov 2007 21:27:19 -0000
@@ -4,7 +4,7 @@ SHARED_ONLY= Yes
COMMENT= multi-protocol instant messaging client
-DISTNAME= pidgin-2.2.2
+DISTNAME= pidgin-2.3.0
SHARED_LIBS += jabber 0.0 # .0.0
SHARED_LIBS += oscar 0.0 # .0.0
SHARED_LIBS += purple 1.0 # .1.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/pidgin/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 27 Oct 2007 16:57:20 -0000 1.6
+++ distinfo 26 Nov 2007 20:41:46 -0000
@@ -1,5 +1,5 @@
-MD5 (pidgin-2.2.2.tar.gz) = 17gUyvcWlVaZPY3Cs4G4UA==
-RMD160 (pidgin-2.2.2.tar.gz) = 0t7MrDURwfUt9W53zG4d36qaTY0=
-SHA1 (pidgin-2.2.2.tar.gz) = v97g/agJBd7YRGE7qlu7qk7fJW4=
-SHA256 (pidgin-2.2.2.tar.gz) = HjLoXikIAtkbVQml1f14PH3I+3YAQF1awqVoBSAk0Pg=
-SIZE (pidgin-2.2.2.tar.gz) = 12882496
+MD5 (pidgin-2.3.0.tar.gz) = 32N9WGcr43LBKnKGYvTtaA==
+RMD160 (pidgin-2.3.0.tar.gz) = J1QQxNg3/JX82pqs84z+EA+Nc/E=
+SHA1 (pidgin-2.3.0.tar.gz) = mKzCE8QG7hKtmKSGzFc6vH2MLjc=
+SHA256 (pidgin-2.3.0.tar.gz) = x2EC21x/8Gn6TMAO+uJVuj08ydU83iwcCLRY6jAa3vk=
+SIZE (pidgin-2.3.0.tar.gz) = 13255252
Index: patches/patch-config_h_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-config_h_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-config_h_in
--- patches/patch-config_h_in 1 Oct 2007 22:03:29 -0000 1.5
+++ patches/patch-config_h_in 26 Nov 2007 21:07:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-config_h_in,v 1.5 2007/10/01 22:03:29 merdely Exp $
---- config.h.in.orig Sun Jul 29 08:34:20 2007
-+++ config.h.in Tue Jul 31 17:43:25 2007
-@@ -154,6 +154,12 @@
+--- config.h.in.orig Sat Nov 24 14:06:47 2007
++++ config.h.in Mon Nov 26 16:06:45 2007
+@@ -160,6 +160,12 @@
/* Define to 1 if you have the <nss.h> header file. */
#undef HAVE_NSS_H
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-configure_ac,v
retrieving revision 1.6
diff -u -p -r1.6 patch-configure_ac
--- patches/patch-configure_ac 27 Oct 2007 16:57:20 -0000 1.6
+++ patches/patch-configure_ac 26 Nov 2007 21:07:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.6 2007/10/27 16:57:20 steven Exp $
---- configure.ac.orig Tue Oct 23 16:55:47 2007
-+++ configure.ac Thu Oct 25 23:31:32 2007
-@@ -572,6 +572,7 @@ if test "x$enable_consoleui" = "xyes"; then
+--- configure.ac.orig Sat Nov 24 14:05:48 2007
++++ configure.ac Mon Nov 26 16:06:45 2007
+@@ -610,6 +610,7 @@ if test "x$enable_consoleui" = "xyes"; then
# ncursesw was not found. Look for plain old ncurses
enable_consoleui=yes
AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"],
[enable_consoleui=no])
@@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2007/
AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS
-lpanel"], [enable_consoleui=no])
AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have
wide-character support.])
if test x"$ac_ncurses_includes" != "x"; then
-@@ -785,7 +786,7 @@ else
+@@ -823,7 +824,7 @@ else
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
@@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2007/
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], ,
$SILC_LIBS)
if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
-@@ -1458,8 +1459,13 @@ dnl ##################################################
+@@ -1510,8 +1511,13 @@ dnl ##################################################
dnl These two are inverses of each other <-- stolen from evolution!
@@ -33,7 +33,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2007/
[enable_gnutls="$enableval"],
[enable_gnutls="yes"])
-@@ -1471,6 +1477,90 @@ AC_ARG_ENABLE(nss,
+@@ -1523,6 +1529,90 @@ AC_ARG_ENABLE(nss,
msg_ssl="None. MSN, Novell Groupwise and Google Talk will not work without
GnuTLS or NSS. OpenSSL is NOT usable!"
dnl #
@@ -124,7 +124,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2007/
dnl # Check for GnuTLS if it's specified.
dnl #
if test "x$enable_gnutls" != "xno"; then
-@@ -1825,12 +1915,20 @@ fi
+@@ -1877,12 +1967,20 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")
Index: patches/patch-finch_libgnt_Makefile_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-finch_libgnt_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-finch_libgnt_Makefile_in
--- patches/patch-finch_libgnt_Makefile_in 1 Oct 2007 22:03:29 -0000
1.5
+++ patches/patch-finch_libgnt_Makefile_in 26 Nov 2007 21:07:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.5 2007/10/01 22:03:29 merdely Exp
$
---- finch/libgnt/Makefile.in.orig Sat Sep 29 12:40:53 2007
-+++ finch/libgnt/Makefile.in Sat Sep 29 20:18:28 2007
-@@ -351,7 +351,7 @@ target_vendor = @target_vendor@
+--- finch/libgnt/Makefile.in.orig Sat Nov 24 14:07:07 2007
++++ finch/libgnt/Makefile.in Mon Nov 26 16:06:45 2007
+@@ -354,7 +354,7 @@ target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = genmarshal pygnt
Index: patches/patch-finch_plugins_Makefile_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-finch_plugins_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-finch_plugins_Makefile_in
--- patches/patch-finch_plugins_Makefile_in 1 Oct 2007 22:03:29 -0000
1.5
+++ patches/patch-finch_plugins_Makefile_in 26 Nov 2007 21:07:06 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-finch_plugins_Makefile_in,v 1.5 2007/10/01 22:03:29 merdely
Exp $
---- finch/plugins/Makefile.in.orig Sat Sep 29 12:40:53 2007
-+++ finch/plugins/Makefile.in Sat Sep 29 20:18:28 2007
+--- finch/plugins/Makefile.in.orig Sat Nov 24 14:07:07 2007
++++ finch/plugins/Makefile.in Mon Nov 26 16:06:45 2007
@@ -81,7 +81,8 @@ gnthistory_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(gnthistory_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -11,7 +11,7 @@ $OpenBSD: patch-finch_plugins_Makefile_i
am__gntlastlog_la_SOURCES_DIST = lastlog.c
@[EMAIL PROTECTED] = lastlog.lo
gntlastlog_la_OBJECTS = $(am_gntlastlog_la_OBJECTS)
-@@ -377,7 +378,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-version
+@@ -380,7 +381,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-version
@[EMAIL PROTECTED] = $(X11_CFLAGS)
@[EMAIL PROTECTED] = $(X11_CFLAGS)
@[EMAIL PROTECTED] = $(GLIB_LIBS) $(X11_LIBS)
Index: patches/patch-libpurple_plugins_ssl_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-libpurple_plugins_ssl_Makefile_in
--- patches/patch-libpurple_plugins_ssl_Makefile_in 1 Oct 2007 22:03:29
-0000 1.5
+++ patches/patch-libpurple_plugins_ssl_Makefile_in 26 Nov 2007 21:07:05
-0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.5 2007/10/01 22:03:29
merdely Exp $
---- libpurple/plugins/ssl/Makefile.in.orig Sat Sep 29 12:40:55 2007
-+++ libpurple/plugins/ssl/Makefile.in Sat Sep 29 20:26:12 2007
+--- libpurple/plugins/ssl/Makefile.in.orig Sat Nov 24 14:07:09 2007
++++ libpurple/plugins/ssl/Makefile.in Mon Nov 26 16:06:45 2007
@@ -53,6 +53,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
pluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(plugin_LTLIBRARIES)
@@ -32,7 +32,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GREP = @GREP@
-@@ -353,17 +361,21 @@ EXTRA_DIST = \
+@@ -356,17 +364,21 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
ssl_la_LDFLAGS = -module -avoid-version
@@ -54,7 +54,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
@[EMAIL PROTECTED] = $(GLIB_LIBS) $(GNUTLS_LIBS)
@[EMAIL PROTECTED] = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
-@@ -375,6 +387,7 @@ AM_CPPFLAGS = \
+@@ -378,6 +390,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS)
@@ -62,7 +62,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
all: all-am
-@@ -437,6 +450,8 @@ clean-pluginLTLIBRARIES:
+@@ -440,6 +453,8 @@ clean-pluginLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@@ -71,7 +71,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES)
$(ssl_gnutls_la_LINK) $(am_ssl_gnutls_la_rpath)
$(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES)
-@@ -451,6 +466,7 @@ distclean-compile:
+@@ -454,6 +469,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
Index: patches/patch-libpurple_protocols_gg_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/pidgin/patches/patch-libpurple_protocols_gg_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-libpurple_protocols_gg_Makefile_in
--- patches/patch-libpurple_protocols_gg_Makefile_in 1 Oct 2007 22:03:29
-0000 1.5
+++ patches/patch-libpurple_protocols_gg_Makefile_in 26 Nov 2007 21:07:08
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.5 2007/10/01 22:03:29
merdely Exp $
---- libpurple/protocols/gg/Makefile.in.orig Sat Sep 29 12:40:56 2007
-+++ libpurple/protocols/gg/Makefile.in Sat Sep 29 20:18:28 2007
-@@ -417,7 +417,7 @@ libgg_la_LDFLAGS = -module -avoid-version
+--- libpurple/protocols/gg/Makefile.in.orig Sat Nov 24 14:07:11 2007
++++ libpurple/protocols/gg/Makefile.in Mon Nov 26 16:06:45 2007
+@@ -420,7 +420,7 @@ libgg_la_LDFLAGS = -module -avoid-version
@[EMAIL PROTECTED] = $(AM_CFLAGS)
@[EMAIL PROTECTED] = $(GADU_LIBS)
@[EMAIL PROTECTED] = $(GGSOURCES)
Index: patches/patch-libpurple_protocols_oscar_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-libpurple_protocols_oscar_Makefile_in
--- patches/patch-libpurple_protocols_oscar_Makefile_in 1 Oct 2007 22:03:30
-0000 1.5
+++ patches/patch-libpurple_protocols_oscar_Makefile_in 26 Nov 2007 21:07:05
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.5 2007/10/01
22:03:30 merdely Exp $
---- libpurple/protocols/oscar/Makefile.in.orig Sat Sep 29 12:40:57 2007
-+++ libpurple/protocols/oscar/Makefile.in Sat Sep 29 20:18:28 2007
-@@ -466,9 +466,9 @@ libicq_la_LDFLAGS = -module -avoid-version
+--- libpurple/protocols/oscar/Makefile.in.orig Sat Nov 24 14:07:14 2007
++++ libpurple/protocols/oscar/Makefile.in Mon Nov 26 16:06:45 2007
+@@ -469,9 +469,9 @@ libicq_la_LDFLAGS = -module -avoid-version
@[EMAIL PROTECTED] = $(OSCARSOURCES)
@[EMAIL PROTECTED] = $(GLIB_LIBS)
@[EMAIL PROTECTED] = libaim.c
Index: patches/patch-pidgin_Makefile_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-pidgin_Makefile_in
--- patches/patch-pidgin_Makefile_in 1 Oct 2007 22:03:30 -0000 1.4
+++ patches/patch-pidgin_Makefile_in 26 Nov 2007 21:07:05 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_Makefile_in,v 1.4 2007/10/01 22:03:30 merdely Exp $
---- pidgin/Makefile.in.orig Sat Sep 29 12:41:00 2007
-+++ pidgin/Makefile.in Sat Sep 29 20:19:16 2007
-@@ -105,7 +105,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+--- pidgin/Makefile.in.orig Sat Nov 24 14:07:17 2007
++++ pidgin/Makefile.in Mon Nov 26 16:06:45 2007
+@@ -107,7 +107,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: patches/patch-pidgin_gtkdialogs_c
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_gtkdialogs_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-pidgin_gtkdialogs_c
--- patches/patch-pidgin_gtkdialogs_c 1 Oct 2007 22:03:30 -0000 1.5
+++ patches/patch-pidgin_gtkdialogs_c 26 Nov 2007 21:07:05 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.5 2007/10/01 22:03:30 merdely Exp $
---- pidgin/gtkdialogs.c.orig Sat Sep 29 12:39:14 2007
-+++ pidgin/gtkdialogs.c Sat Sep 29 20:18:28 2007
-@@ -609,6 +609,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
+--- pidgin/gtkdialogs.c.orig Sat Nov 24 14:06:02 2007
++++ pidgin/gtkdialogs.c Mon Nov 26 16:06:34 2007
+@@ -611,6 +611,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif
Index: patches/patch-pidgin_gtknotify_c
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_gtknotify_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-pidgin_gtknotify_c
--- patches/patch-pidgin_gtknotify_c 1 Oct 2007 22:03:30 -0000 1.5
+++ patches/patch-pidgin_gtknotify_c 26 Nov 2007 21:07:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtknotify_c,v 1.5 2007/10/01 22:03:30 merdely Exp $
---- pidgin/gtknotify.c.orig Sat Sep 29 12:39:14 2007
-+++ pidgin/gtknotify.c Sat Sep 29 20:18:28 2007
-@@ -1010,7 +1010,16 @@ uri_command(const char *command, gboolean sync)
+--- pidgin/gtknotify.c.orig Sat Nov 24 14:06:02 2007
++++ pidgin/gtknotify.c Mon Nov 26 16:06:34 2007
+@@ -1014,7 +1014,16 @@ uri_command(const char *command, gboolean sync)
g_error_free(error);
}
else
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/pidgin/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 27 Oct 2007 16:57:20 -0000 1.6
+++ pkg/PLIST 26 Nov 2007 21:26:18 -0000
@@ -93,6 +93,7 @@ include/libpurple/prefs.h
include/libpurple/privacy.h
include/libpurple/proxy.h
include/libpurple/prpl.h
+include/libpurple/purple.h
include/libpurple/request.h
include/libpurple/roomlist.h
include/libpurple/savedstatuses.h
@@ -155,6 +156,7 @@ include/pidgin/gtkstatusbox.h
include/pidgin/gtkthemes.h
include/pidgin/gtkutils.h
include/pidgin/gtkwhiteboard.h
+include/pidgin/minidialog.h
include/pidgin/pidgin.h
include/pidgin/pidgincombobox.h
include/pidgin/pidginstock.h
@@ -282,7 +284,6 @@ share/icons/hicolor/22x22/apps/pidgin.pn
share/icons/hicolor/24x24/apps/pidgin.png
share/icons/hicolor/32x32/apps/pidgin.png
share/icons/hicolor/48x48/apps/pidgin.png
-share/icons/hicolor/scalable/apps/pidgin.svg
share/locale/af/LC_MESSAGES/pidgin.mo
share/locale/am/LC_MESSAGES/pidgin.mo
share/locale/ar/LC_MESSAGES/pidgin.mo
@@ -358,6 +359,7 @@ share/locale/te/LC_MESSAGES/pidgin.mo
share/locale/th/LC_MESSAGES/pidgin.mo
share/locale/tr/LC_MESSAGES/pidgin.mo
share/locale/uk/LC_MESSAGES/pidgin.mo
+share/locale/ur/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
@@ -410,6 +412,7 @@ share/pixmaps/pidgin/dialogs/64/warning.
share/pixmaps/pidgin/emblems/
share/pixmaps/pidgin/emblems/16/
share/pixmaps/pidgin/emblems/16/aol-client.png
+share/pixmaps/pidgin/emblems/16/birthday.png
share/pixmaps/pidgin/emblems/16/blocked.png
share/pixmaps/pidgin/emblems/16/bot.png
share/pixmaps/pidgin/emblems/16/external.png
@@ -421,6 +424,7 @@ share/pixmaps/pidgin/emblems/16/half-ope
share/pixmaps/pidgin/emblems/16/hiptop.png
share/pixmaps/pidgin/emblems/16/male.png
share/pixmaps/pidgin/emblems/16/mobile.png
+share/pixmaps/pidgin/emblems/16/music.png
share/pixmaps/pidgin/emblems/16/not-authorized.png
share/pixmaps/pidgin/emblems/16/operator.png
share/pixmaps/pidgin/emblems/16/qq-member.png
@@ -683,6 +687,8 @@ share/pixmaps/pidgin/status/11/busy.png
share/pixmaps/pidgin/status/11/chat.png
share/pixmaps/pidgin/status/11/extended-away.png
share/pixmaps/pidgin/status/11/invisible.png
+share/pixmaps/pidgin/status/11/log-in.png
+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/
