Here is an update to Pidgin 2.5.3. Please test.
Index: Makefile =================================================================== RCS file: /cvs/ports/net/pidgin/Makefile,v retrieving revision 1.32 diff -u -p -r1.32 Makefile --- Makefile 23 Oct 2008 02:55:43 -0000 1.32 +++ Makefile 22 Dec 2008 06:48:56 -0000 @@ -4,14 +4,14 @@ SHARED_ONLY= Yes COMMENT= multi-protocol instant messaging client -DISTNAME= pidgin-2.5.2 +DISTNAME= pidgin-2.5.3 CATEGORIES= net SHARED_LIBS+= jabber 0.0 SHARED_LIBS+= oscar 0.0 -SHARED_LIBS+= purple 4.2 -SHARED_LIBS+= purple-client 4.2 -SHARED_LIBS+= gnt 4.2 +SHARED_LIBS+= purple 4.3 +SHARED_LIBS+= purple-client 4.3 +SHARED_LIBS+= gnt 4.3 HOMEPAGE= http://pidgin.im/ @@ -25,8 +25,8 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ Xext Xfixes Xi Xinerama Xrandr Xrender Xss atk-1.0 \ c cairo crypto dbus-1 expat fontconfig freetype \ - glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \ - m ncurses panel pango-1.0 pangocairo-1.0 \ + gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \ + gthread-2.0 m ncurses panel pango-1.0 pangocairo-1.0 \ pangoft2-1.0 pcre pixman-1 png pthread ssl stdc++ z MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/} @@ -43,7 +43,7 @@ LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0 startup-notification-1::devel/startup-notification \ silc.>=7,silcclient.>=5::devel/silc-toolkit \ meanwhile::net/meanwhile \ - gadu::net/libgadu \ + gadu.>=4::net/libgadu \ xml2::textproc/libxml \ dbus-glib-1::x11/dbus-glib @@ -94,7 +94,7 @@ INSTALL_STRIP= .if ${FLAVOR:L:Mgtkspell} LIB_DEPENDS+= gtkspell::textproc/gtkspell -WANTLIB+= aspell +WANTLIB+= enchant .else CONFIGURE_ARGS+=--disable-gtkspell .endif Index: distinfo =================================================================== RCS file: /cvs/ports/net/pidgin/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- distinfo 23 Oct 2008 02:55:43 -0000 1.15 +++ distinfo 22 Dec 2008 02:50:21 -0000 @@ -1,5 +1,5 @@ -MD5 (pidgin-2.5.2.tar.gz) = OtgxM6I4EIfL3d9Cul1uzw== -RMD160 (pidgin-2.5.2.tar.gz) = J5UAizIpRImwjwPDw2RPj8Q6d2c= -SHA1 (pidgin-2.5.2.tar.gz) = iM3jw8RdOfpsizZldKfCNDQ0iOg= -SHA256 (pidgin-2.5.2.tar.gz) = TUMn7HnQs2FjjoM46zLv/HLg4h6xkSlPqBciNITyhNY= -SIZE (pidgin-2.5.2.tar.gz) = 11642659 +MD5 (pidgin-2.5.3.tar.gz) = R8bs1Fs6YseoJvfOsmY/uA== +RMD160 (pidgin-2.5.3.tar.gz) = 6Pa8eC+ve6Ca+z//QCpbm7uHEIM= +SHA1 (pidgin-2.5.3.tar.gz) = Nt3RfMXMCwJPJF11shLfv51cKRQ= +SHA256 (pidgin-2.5.3.tar.gz) = 1q8MqS5Gzj5l1+lWc9heI1OrkWzTLoqglioGgZtwMxQ= +SIZE (pidgin-2.5.3.tar.gz) = 11874548 Index: patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/net/pidgin/patches/patch-configure_ac,v retrieving revision 1.14 diff -u -p -r1.14 patch-configure_ac --- patches/patch-configure_ac 23 Oct 2008 02:55:44 -0000 1.14 +++ patches/patch-configure_ac 22 Dec 2008 05:09:19 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-configure_ac,v 1.14 2008/10/23 02:55:44 brad Exp $ ---- configure.ac.orig Sat Oct 18 22:40:48 2008 -+++ configure.ac Tue Oct 21 20:18:41 2008 +--- configure.ac.orig Sat Dec 20 19:38:16 2008 ++++ configure.ac Sun Dec 21 23:49:41 2008 @@ -671,6 +671,7 @@ if test "x$enable_consoleui" = "xyes"; then # ncursesw was not found. Look for plain old ncurses enable_consoleui=yes @@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.14 2008 AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS) if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then -@@ -1603,6 +1604,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C +@@ -1606,6 +1607,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C dnl These two are inverses of each other <-- stolen from evolution! @@ -30,7 +30,7 @@ $OpenBSD: patch-configure_ac,v 1.14 2008 AC_ARG_ENABLE(gnutls, [ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support [default=yes]], [enable_gnutls="$enableval"], -@@ -1613,11 +1619,99 @@ AC_ARG_ENABLE(nss, +@@ -1616,11 +1622,99 @@ AC_ARG_ENABLE(nss, [enable_nss="$enableval"], [enable_nss="yes"]) @@ -132,7 +132,7 @@ $OpenBSD: patch-configure_ac,v 1.14 2008 if test "x$enable_gnutls" != "xno"; then enable_gnutls="no" prefix=`eval echo $prefix` -@@ -1981,17 +2075,31 @@ fi +@@ -1984,17 +2078,31 @@ 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.12 diff -u -p -r1.12 patch-finch_libgnt_Makefile_in --- patches/patch-finch_libgnt_Makefile_in 23 Oct 2008 02:55:44 -0000 1.12 +++ patches/patch-finch_libgnt_Makefile_in 22 Dec 2008 05:09:19 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-finch_libgnt_Makefile_in,v 1.12 2008/10/23 02:55:44 brad Exp $ ---- finch/libgnt/Makefile.in.orig Sun Oct 19 10:37:54 2008 -+++ finch/libgnt/Makefile.in Tue Oct 21 20:18:41 2008 -@@ -460,7 +460,7 @@ target_cpu = @target_cpu@ +--- finch/libgnt/Makefile.in.orig Sat Dec 20 19:38:39 2008 ++++ finch/libgnt/Makefile.in Sun Dec 21 23:49:41 2008 +@@ -458,7 +458,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ EXTRA_DIST = genmarshal Index: patches/patch-finch_plugins_Makefile_in =================================================================== RCS file: /cvs/ports/net/pidgin/patches/patch-finch_plugins_Makefile_in,v retrieving revision 1.12 diff -u -p -r1.12 patch-finch_plugins_Makefile_in --- patches/patch-finch_plugins_Makefile_in 23 Oct 2008 02:55:44 -0000 1.12 +++ patches/patch-finch_plugins_Makefile_in 22 Dec 2008 05:09:19 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-finch_plugins_Makefile_in,v 1.12 2008/10/23 02:55:44 brad Exp $ ---- finch/plugins/Makefile.in.orig Sun Oct 19 10:37:55 2008 -+++ finch/plugins/Makefile.in Tue Oct 21 20:18:41 2008 +--- finch/plugins/Makefile.in.orig Sat Dec 20 19:38:40 2008 ++++ finch/plugins/Makefile.in Sun Dec 21 23:49:42 2008 @@ -76,7 +76,8 @@ am__gnthistory_la_SOURCES_DIST = gnthistory.c @plugins_t...@am_gnthistory_la_objects = gnthistory.lo gnthistory_la_OBJECTS = $(am_gnthistory_la_OBJECTS) @@ -11,7 +11,7 @@ $OpenBSD: patch-finch_plugins_Makefile_i am__gntlastlog_la_SOURCES_DIST = lastlog.c @plugins_t...@am_gntlastlog_la_objects = lastlog.lo gntlastlog_la_OBJECTS = $(am_gntlastlog_la_OBJECTS) -@@ -493,7 +494,7 @@ grouping_la_LDFLAGS = -module -avoid-version +@@ -491,7 +492,7 @@ grouping_la_LDFLAGS = -module -avoid-version @plugins_t...@gntclipboard_la_libadd = $(GLIB_LIBS) $(X11_LIBS) @plugins_t...@gntgf_la_libadd = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la @plugins_t...@gnthistory_la_libadd = $(GLIB_LIBS) Index: patches/patch-libpurple_plugins_ssl_Makefile_am =================================================================== RCS file: /cvs/ports/net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_am,v retrieving revision 1.2 diff -u -p -r1.2 patch-libpurple_plugins_ssl_Makefile_am --- patches/patch-libpurple_plugins_ssl_Makefile_am 1 Oct 2007 22:03:29 -0000 1.2 +++ patches/patch-libpurple_plugins_ssl_Makefile_am 22 Dec 2008 05:09:18 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_am,v 1.2 2007/10/01 22:03:29 merdely Exp $ ---- libpurple/plugins/ssl/Makefile.am.orig Sat Sep 29 12:39:06 2007 -+++ libpurple/plugins/ssl/Makefile.am Sat Sep 29 20:53:53 2007 +--- libpurple/plugins/ssl/Makefile.am.orig Sat Dec 20 19:38:16 2008 ++++ libpurple/plugins/ssl/Makefile.am Mon Dec 22 00:09:09 2008 @@ -4,6 +4,7 @@ EXTRA_DIST = \ plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) @@ -9,8 +9,23 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma ssl_gnutls_la_LDFLAGS = -module -avoid-version ssl_nss_la_LDFLAGS = -module -avoid-version -@@ -15,10 +16,12 @@ plugin_LTLIBRARIES = \ - ssl-nss.la +@@ -13,6 +14,11 @@ if PLUGINS + # if USE_GNUTLS && USE_NSS + # but only support testing a single variable. Hence: + ++if USE_OPENSSL ++plugin_LTLIBRARIES = \ ++ ssl.la \ ++ ssl-openssl.la ++else + if USE_GNUTLS + if USE_NSS + plugin_LTLIBRARIES = \ +@@ -34,12 +40,15 @@ plugin_LTLIBRARIES = \ + ssl.la + endif + endif ++endif ssl_la_SOURCES = ssl.c +ssl_openssl_la_SOURCES = ssl-openssl.c @@ -22,7 +37,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS) ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS) -@@ -33,5 +36,6 @@ AM_CPPFLAGS = \ +@@ -54,5 +63,6 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(PLUGIN_CFLAGS) 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.12 diff -u -p -r1.12 patch-libpurple_plugins_ssl_Makefile_in --- patches/patch-libpurple_plugins_ssl_Makefile_in 23 Oct 2008 02:55:44 -0000 1.12 +++ patches/patch-libpurple_plugins_ssl_Makefile_in 22 Dec 2008 05:09:18 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.12 2008/10/23 02:55:44 brad Exp $ ---- libpurple/plugins/ssl/Makefile.in.orig Sun Oct 19 10:37:59 2008 -+++ libpurple/plugins/ssl/Makefile.in Tue Oct 21 20:18:41 2008 +--- libpurple/plugins/ssl/Makefile.in.orig Sat Dec 20 19:38:42 2008 ++++ libpurple/plugins/ssl/Makefile.in Mon Dec 22 00:04:48 2008 @@ -57,6 +57,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)" pluginLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(plugin_LTLIBRARIES) @@ -14,7 +14,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma @plugins_t...@ssl_gnutls_la_dependencies = $(am__DEPENDENCIES_1) \ @PLUGINS_TRUE@ $(am__DEPENDENCIES_1) am__ssl_gnutls_la_SOURCES_DIST = ssl-gnutls.c -@@ -87,7 +93,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CF +@@ -107,7 +113,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CF $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \ $(ssl_la_SOURCES) @@ -23,7 +23,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma $(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST) ETAGS = etags CTAGS = ctags -@@ -206,6 +212,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@ +@@ -221,6 +227,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@ GNT_MICRO_VERSION = @GNT_MICRO_VERSION@ GNT_MINOR_VERSION = @GNT_MINOR_VERSION@ GNT_VERSION = @GNT_VERSION@ @@ -32,18 +32,30 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ -@@ -459,17 +467,21 @@ EXTRA_DIST = \ +@@ -477,6 +485,7 @@ EXTRA_DIST = \ plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) ssl_la_LDFLAGS = -module -avoid-version +ssl_openssl_la_LDFLAGS = -module -avoid-version ssl_gnutls_la_LDFLAGS = -module -avoid-version ssl_nss_la_LDFLAGS = -module -avoid-version - @plugins_t...@plugin_ltlibraries = \ - @PLUGINS_TRUE@ ssl.la \ -...@plugins_true@ ssl-openssl.la \ - @PLUGINS_TRUE@ ssl-gnutls.la \ - @PLUGINS_TRUE@ ssl-nss.la + @PLUGINS_TRUE@@USE_GNUTLS_FALSE@@use_nss_fa...@plugin_ltlibraries = \ +@@ -490,19 +499,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version + @PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl.la \ + @PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl-gnutls.la + +...@plugins_true@@USE_OPENSSL_TRUE@@use_gnutls_fa...@plugin_ltlibraries = \ +...@plugins_true@@USE_OPENSSL_TRUE@@USE_GNUTLS_FALSE@ ssl.la \ +...@plugins_true@@USE_OPENSSL_TRUE@@USE_GNUTLS_FALSE@ ssl-openssl.la + + # I'm sorry to report that Automake Conditionals don't support + # if USE_GNUTLS && USE_NSS + # but only support testing a single variable. Hence: + @PLUGINS_TRUE@@USE_GNUTLS_TRUE@@use_nss_t...@plugin_ltlibraries = \ + @PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl.la \ +...@plugins_true@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl-openssl.la \ + @PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl-gnutls.la \ + @PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl-nss.la @plugins_t...@ssl_la_sources = ssl.c +...@plugins_true@ssl_openssl_la_SOURCES = ssl-openssl.c @@ -54,7 +66,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma @plugins_t...@ssl_gnutls_la_libadd = $(GLIB_LIBS) $(GNUTLS_LIBS) @plugins_t...@ssl_nss_la_libadd = $(GLIB_LIBS) $(NSS_LIBS) AM_CPPFLAGS = \ -@@ -481,6 +493,7 @@ AM_CPPFLAGS = \ +@@ -514,6 +529,7 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(PLUGIN_CFLAGS) @@ -62,7 +74,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 -@@ -543,6 +556,8 @@ clean-pluginLTLIBRARIES: +@@ -576,6 +592,8 @@ clean-pluginLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done @@ -71,7 +83,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES) $(LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_LDFLAGS) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS) ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES) -@@ -557,6 +572,7 @@ distclean-compile: +@@ -590,6 +608,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/ssl....@am__quote@ Index: patches/patch-libpurple_protocols_gg_Makefile_am =================================================================== RCS file: /cvs/ports/net/pidgin/patches/patch-libpurple_protocols_gg_Makefile_am,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-libpurple_protocols_gg_Makefile_am --- patches/patch-libpurple_protocols_gg_Makefile_am 12 May 2007 15:19:36 -0000 1.1.1.1 +++ patches/patch-libpurple_protocols_gg_Makefile_am 22 Dec 2008 05:09:18 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-libpurple_protocols_gg_Makefile_am,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $ ---- libpurple/protocols/gg/Makefile.am.orig Sat Oct 28 12:49:22 2006 -+++ libpurple/protocols/gg/Makefile.am Sat Oct 28 12:50:21 2006 -@@ -66,7 +66,7 @@ pkg_LTLIBRARIES = libgg.la - noinst_LIBRARIES = - +--- libpurple/protocols/gg/Makefile.am.orig Sat Dec 20 19:38:16 2008 ++++ libpurple/protocols/gg/Makefile.am Sun Dec 21 23:49:42 2008 +@@ -62,7 +62,7 @@ else + st = $(GADU_CFLAGS) + pkg_LTLIBRARIES = libgg.la libgg_la_SOURCES = $(GGSOURCES) -libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS) +libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS) $(LIBGADU_LIBS) 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.12 diff -u -p -r1.12 patch-libpurple_protocols_gg_Makefile_in --- patches/patch-libpurple_protocols_gg_Makefile_in 23 Oct 2008 02:55:44 -0000 1.12 +++ patches/patch-libpurple_protocols_gg_Makefile_in 22 Dec 2008 05:09:18 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.12 2008/10/23 02:55:44 brad Exp $ ---- libpurple/protocols/gg/Makefile.in.orig Sun Oct 19 10:38:01 2008 -+++ libpurple/protocols/gg/Makefile.in Tue Oct 21 20:18:41 2008 -@@ -529,7 +529,7 @@ libgg_la_LDFLAGS = -module -avoid-version - @static_gg_t...@libgg_a_cflags = $(AM_CFLAGS) - @static_gg_t...@libgg_a_libadd = $(GADU_LIBS) +--- libpurple/protocols/gg/Makefile.in.orig Sat Dec 20 19:38:43 2008 ++++ libpurple/protocols/gg/Makefile.in Sun Dec 21 23:52:11 2008 +@@ -507,7 +507,7 @@ libgg_la_LDFLAGS = -module -avoid-version @static_gg_fa...@libgg_la_sources = $(GGSOURCES) + @static_gg_t...@libgg_la_sources = $(GGSOURCES) + @static_gg_t...@libgg_la_cflags = $(AM_CFLAGS) -...@static_gg_false@libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS) +...@static_gg_false@libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS) $(LIBGADU_LIBS) + @static_gg_t...@libgg_la_libadd = $(GADU_LIBS) + @static_gg_fa...@pkg_ltlibraries = libgg.la AM_CPPFLAGS = \ - -I$(top_srcdir)/libpurple \ - -I$(top_builddir)/libpurple \ Index: patches/patch-libpurple_protocols_oscar_Makefile_am =================================================================== RCS file: /cvs/ports/net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_am,v retrieving revision 1.4 diff -u -p -r1.4 patch-libpurple_protocols_oscar_Makefile_am --- patches/patch-libpurple_protocols_oscar_Makefile_am 1 Oct 2007 22:03:29 -0000 1.4 +++ patches/patch-libpurple_protocols_oscar_Makefile_am 22 Dec 2008 05:09:18 -0000 @@ -1,16 +1,16 @@ $OpenBSD: patch-libpurple_protocols_oscar_Makefile_am,v 1.4 2007/10/01 22:03:29 merdely Exp $ ---- libpurple/protocols/oscar/Makefile.am.orig Thu Jun 14 23:11:58 2007 -+++ libpurple/protocols/oscar/Makefile.am Fri Jun 15 13:53:22 2007 -@@ -65,10 +65,10 @@ liboscar_la_SOURCES = $(OSCARSOURCES) +--- libpurple/protocols/oscar/Makefile.am.orig Sat Dec 20 19:38:16 2008 ++++ libpurple/protocols/oscar/Makefile.am Sun Dec 21 23:55:19 2008 +@@ -64,10 +64,10 @@ liboscar_la_SOURCES = $(OSCARSOURCES) liboscar_la_LIBADD = $(GLIB_LIBS) - libaim_la_SOURCES = libaim.c --libaim_la_LIBADD = liboscar.la -+libaim_la_LIBADD = liboscar.la -Wl,-rpath,$(pkgdir) + libaim_la_SOURCES = libaim.c +-libaim_la_LIBADD = liboscar.la ++libaim_la_LIBADD = liboscar.la -Wl,-rpath,$(pkgdir) - libicq_la_SOURCES = libicq.c --libicq_la_LIBADD = liboscar.la -+libicq_la_LIBADD = liboscar.la -Wl,-rpath,$(pkgdir) + libicq_la_SOURCES = libicq.c +-libicq_la_LIBADD = liboscar.la ++libicq_la_LIBADD = liboscar.la -Wl,-rpath,$(pkgdir) endif 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.12 diff -u -p -r1.12 patch-libpurple_protocols_oscar_Makefile_in --- patches/patch-libpurple_protocols_oscar_Makefile_in 23 Oct 2008 02:55:44 -0000 1.12 +++ patches/patch-libpurple_protocols_oscar_Makefile_in 22 Dec 2008 05:09:18 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.12 2008/10/23 02:55:44 brad Exp $ ---- libpurple/protocols/oscar/Makefile.in.orig Sun Oct 19 10:38:07 2008 -+++ libpurple/protocols/oscar/Makefile.in Tue Oct 21 20:18:41 2008 -@@ -575,9 +575,9 @@ libicq_la_LDFLAGS = -module -avoid-version - @static_oscar_fa...@liboscar_la_sources = $(OSCARSOURCES) +--- libpurple/protocols/oscar/Makefile.in.orig Sat Dec 20 19:38:45 2008 ++++ libpurple/protocols/oscar/Makefile.in Sun Dec 21 23:49:43 2008 +@@ -538,9 +538,9 @@ libicq_la_LDFLAGS = -module -avoid-version + @static_oscar_fa...@pkg_ltlibraries = liboscar.la libaim.la libicq.la @static_oscar_fa...@liboscar_la_libadd = $(GLIB_LIBS) @static_oscar_fa...@libaim_la_sources = libaim.c -...@static_oscar_false@libaim_la_LIBADD = liboscar.la Index: patches/patch-pidgin_gtkdialogs_c =================================================================== RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_gtkdialogs_c,v retrieving revision 1.12 diff -u -p -r1.12 patch-pidgin_gtkdialogs_c --- patches/patch-pidgin_gtkdialogs_c 23 Oct 2008 02:55:44 -0000 1.12 +++ patches/patch-pidgin_gtkdialogs_c 22 Dec 2008 05:09:24 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-pidgin_gtkdialogs_c,v 1.12 2008/10/23 02:55:44 brad Exp $ ---- pidgin/gtkdialogs.c.orig Sat Oct 18 22:40:48 2008 -+++ pidgin/gtkdialogs.c Tue Oct 21 20:18:41 2008 -@@ -614,6 +614,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br +--- pidgin/gtkdialogs.c.orig Sat Dec 20 19:38:16 2008 ++++ pidgin/gtkdialogs.c Sun Dec 21 23:49:43 2008 +@@ -572,6 +572,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.9 diff -u -p -r1.9 patch-pidgin_gtknotify_c --- patches/patch-pidgin_gtknotify_c 13 Sep 2008 22:04:40 -0000 1.9 +++ patches/patch-pidgin_gtknotify_c 22 Dec 2008 05:09:18 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-pidgin_gtknotify_c,v 1.9 2008/09/13 22:04:40 brad Exp $ ---- pidgin/gtknotify.c.orig Sun Aug 31 00:36:31 2008 -+++ pidgin/gtknotify.c Sun Aug 31 18:21:13 2008 -@@ -1051,7 +1051,16 @@ uri_command(const char *command, gboolean sync) +--- pidgin/gtknotify.c.orig Sat Dec 20 19:38:16 2008 ++++ pidgin/gtknotify.c Sun Dec 21 23:49:44 2008 +@@ -1048,7 +1048,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.17 diff -u -p -r1.17 PLIST --- pkg/PLIST 23 Oct 2008 02:55:44 -0000 1.17 +++ pkg/PLIST 22 Dec 2008 06:01:02 -0000 @@ -272,10 +272,6 @@ lib/purple-2/offlinemsg.la lib/purple-2/offlinemsg.so lib/purple-2/psychic.la lib/purple-2/psychic.so -lib/purple-2/ssl-gnutls.la -lib/purple-2/ssl-gnutls.so -lib/purple-2/ssl-nss.la -lib/purple-2/ssl-nss.so lib/purple-2/ssl-openssl.la lib/purple-2/ssl-openssl.so lib/purple-2/ssl.la @@ -349,8 +345,6 @@ 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/ -share/locale/ps/LC_MESSAGES/ share/locale/ps/LC_MESSAGES/pidgin.mo share/locale/pt/LC_MESSAGES/pidgin.mo share/locale/pt_BR/LC_MESSAGES/pidgin.mo @@ -361,8 +355,6 @@ share/locale/sk/LC_MESSAGES/pidgin.mo share/locale/sl/LC_MESSAGES/pidgin.mo share/locale/sq/LC_MESSAGES/pidgin.mo share/locale/sr/LC_MESSAGES/pidgin.mo -share/locale/s...@latin/ -share/locale/s...@latin/LC_MESSAGES/ share/locale/s...@latin/LC_MESSAGES/pidgin.mo share/locale/sv/LC_MESSAGES/pidgin.mo share/locale/ta/LC_MESSAGES/pidgin.mo @@ -670,6 +662,48 @@ share/pixmaps/pidgin/emotes/default/yawn share/pixmaps/pidgin/emotes/default/yin-yang.png share/pixmaps/pidgin/emotes/none/ share/pixmaps/pidgin/emotes/none/theme +share/pixmaps/pidgin/emotes/small/ +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/ share/pixmaps/pidgin/protocols/16/ @@ -736,6 +770,8 @@ share/pixmaps/pidgin/status/11/offline.p share/pixmaps/pidgin/status/11/person.png share/pixmaps/pidgin/status/11/rtl/ 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/ share/pixmaps/pidgin/status/16/available.png share/pixmaps/pidgin/status/16/away.png @@ -787,14 +823,15 @@ 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/ 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/ share/pixmaps/pidgin/toolbar/16/ share/pixmaps/pidgin/toolbar/16/change-bgcolor.png @@ -866,6 +903,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 -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
