From 09058368cfb669c80d77a21f8434ec7431655373 Mon Sep 17 00:00:00 2001 From: steven Date: Wed, 30 May 2007 15:09:07 +0000 Subject: [PATCH] remove gaim and plugins. superseded by pidgin and equivalent plugins. ok brad, alek --- net/gaim-icb/Makefile | 27 - net/gaim-icb/distinfo | 5 - net/gaim-icb/pkg/DESCR | 1 - net/gaim-icb/pkg/PLIST | 3 - net/gaim-tlen/Makefile | 27 - net/gaim-tlen/distinfo | 5 - net/gaim-tlen/pkg/DESCR | 1 - net/gaim-tlen/pkg/PLIST | 3 - net/gaim/Makefile | 103 --- net/gaim/distinfo | 5 - net/gaim/files/ssl-openssl.c | 341 -------- net/gaim/patches/patch-config_h_in | 16 - net/gaim/patches/patch-configure_ac | 148 ---- .../patches/patch-console_libgnt_Makefile_am | 11 - .../patches/patch-console_libgnt_Makefile_in | 12 - .../patches/patch-console_plugins_Makefile_am | 12 - .../patches/patch-console_plugins_Makefile_in | 22 - net/gaim/patches/patch-gaim_service_in | 9 - net/gaim/patches/patch-gtk_Makefile_in | 12 - net/gaim/patches/patch-gtk_gtkdialogs_c | 16 - net/gaim/patches/patch-gtk_gtkmain_c | 20 - net/gaim/patches/patch-gtk_gtknotify_c | 20 - net/gaim/patches/patch-libgaim_gaim-remote | 9 - .../patches/patch-libgaim_gaim-url-handler | 9 - .../patch-libgaim_plugins_ssl_Makefile_am | 31 - .../patch-libgaim_plugins_ssl_Makefile_in | 82 -- .../patch-libgaim_protocols_gg_Makefile_am | 12 - .../patch-libgaim_protocols_gg_Makefile_in | 12 - .../patch-libgaim_protocols_oscar_Makefile_am | 16 - .../patch-libgaim_protocols_oscar_Makefile_in | 15 - net/gaim/pkg/DESCR | 23 - net/gaim/pkg/PLIST | 812 ------------------ security/gaim-otr/Makefile | 36 - security/gaim-otr/distinfo | 5 - security/gaim-otr/patches/patch-gtk-dialog_c | 129 --- security/gaim-otr/patches/patch-otr-plugin_c | 239 ------ security/gaim-otr/pkg/DESCR | 16 - security/gaim-otr/pkg/PLIST | 4 - x11/gaim-guifications/Makefile | 38 - x11/gaim-guifications/distinfo | 5 - x11/gaim-guifications/patches/patch-configure | 12 - .../patches/patch-src_gf_action_c | 12 - x11/gaim-guifications/pkg/DESCR | 4 - x11/gaim-guifications/pkg/MESSAGE | 2 - x11/gaim-guifications/pkg/PLIST | 73 -- 45 files changed, 2415 deletions(-) delete mode 100644 net/gaim-icb/Makefile delete mode 100644 net/gaim-icb/distinfo delete mode 100644 net/gaim-icb/pkg/DESCR delete mode 100644 net/gaim-icb/pkg/PLIST delete mode 100644 net/gaim-tlen/Makefile delete mode 100644 net/gaim-tlen/distinfo delete mode 100644 net/gaim-tlen/pkg/DESCR delete mode 100644 net/gaim-tlen/pkg/PLIST delete mode 100644 net/gaim/Makefile delete mode 100644 net/gaim/distinfo delete mode 100644 net/gaim/files/ssl-openssl.c delete mode 100644 net/gaim/patches/patch-config_h_in delete mode 100644 net/gaim/patches/patch-configure_ac delete mode 100644 net/gaim/patches/patch-console_libgnt_Makefile_am delete mode 100644 net/gaim/patches/patch-console_libgnt_Makefile_in delete mode 100644 net/gaim/patches/patch-console_plugins_Makefile_am delete mode 100644 net/gaim/patches/patch-console_plugins_Makefile_in delete mode 100644 net/gaim/patches/patch-gaim_service_in delete mode 100644 net/gaim/patches/patch-gtk_Makefile_in delete mode 100644 net/gaim/patches/patch-gtk_gtkdialogs_c delete mode 100644 net/gaim/patches/patch-gtk_gtkmain_c delete mode 100644 net/gaim/patches/patch-gtk_gtknotify_c delete mode 100644 net/gaim/patches/patch-libgaim_gaim-remote delete mode 100644 net/gaim/patches/patch-libgaim_gaim-url-handler delete mode 100644 net/gaim/patches/patch-libgaim_plugins_ssl_Makefile_am delete mode 100644 net/gaim/patches/patch-libgaim_plugins_ssl_Makefile_in delete mode 100644 net/gaim/patches/patch-libgaim_protocols_gg_Makefile_am delete mode 100644 net/gaim/patches/patch-libgaim_protocols_gg_Makefile_in delete mode 100644 net/gaim/patches/patch-libgaim_protocols_oscar_Makefile_am delete mode 100644 net/gaim/patches/patch-libgaim_protocols_oscar_Makefile_in delete mode 100644 net/gaim/pkg/DESCR delete mode 100644 net/gaim/pkg/PLIST delete mode 100644 security/gaim-otr/Makefile delete mode 100644 security/gaim-otr/distinfo delete mode 100644 security/gaim-otr/patches/patch-gtk-dialog_c delete mode 100644 security/gaim-otr/patches/patch-otr-plugin_c delete mode 100644 security/gaim-otr/pkg/DESCR delete mode 100644 security/gaim-otr/pkg/PLIST delete mode 100644 x11/gaim-guifications/Makefile delete mode 100644 x11/gaim-guifications/distinfo delete mode 100644 x11/gaim-guifications/patches/patch-configure delete mode 100644 x11/gaim-guifications/patches/patch-src_gf_action_c delete mode 100644 x11/gaim-guifications/pkg/DESCR delete mode 100644 x11/gaim-guifications/pkg/MESSAGE delete mode 100644 x11/gaim-guifications/pkg/PLIST diff --git a/net/gaim-icb/Makefile b/net/gaim-icb/Makefile deleted file mode 100644 index 550307898f0..00000000000 --- a/net/gaim-icb/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $OpenBSD: Makefile,v 1.11 2007/02/04 22:21:51 alek Exp $ - -SHARED_ONLY= Yes - -COMMENT= "ICB protocol plugin for GAIM" - -DISTNAME= gaim-icb-20070203 -CATEGORIES= net - -HOMEPAGE= http://nic.com.pl/~alek/gaim-icb/ - -MAINTAINER= Aleksander Piotrowski - -# BSD -PERMIT_PACKAGE_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes - -MASTER_SITES= ${HOMEPAGE} - -BUILD_DEPENDS= :gaim-2.0.0beta6:net/gaim -RUN_DEPENDS= :gaim-2.0.0beta6:net/gaim - -NO_REGRESS= Yes - -.include diff --git a/net/gaim-icb/distinfo b/net/gaim-icb/distinfo deleted file mode 100644 index c05ec37fc91..00000000000 --- a/net/gaim-icb/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -MD5 (gaim-icb-20070203.tar.gz) = tVtAhQvfpgi4gqo7KSsijA== -RMD160 (gaim-icb-20070203.tar.gz) = blqI3eLqFWj/xtpIJGB3oRK7QCU= -SHA1 (gaim-icb-20070203.tar.gz) = +TTqKVco145lxDxJgYyxceM4v9g= -SHA256 (gaim-icb-20070203.tar.gz) = PW8Xk52Pq4CXrLOZD2Z66ybyI2knDjQ8lXRcFtpbaGU= -SIZE (gaim-icb-20070203.tar.gz) = 15787 diff --git a/net/gaim-icb/pkg/DESCR b/net/gaim-icb/pkg/DESCR deleted file mode 100644 index e714de0dc58..00000000000 --- a/net/gaim-icb/pkg/DESCR +++ /dev/null @@ -1 +0,0 @@ -This package contains an ICB protocol plugin for GAIM. diff --git a/net/gaim-icb/pkg/PLIST b/net/gaim-icb/pkg/PLIST deleted file mode 100644 index dc2644aaae0..00000000000 --- a/net/gaim-icb/pkg/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.3 2006/10/31 19:43:48 alek Exp $ -lib/gaim/libicb.so -share/pixmaps/gaim/status/default/icb.png diff --git a/net/gaim-tlen/Makefile b/net/gaim-tlen/Makefile deleted file mode 100644 index 88ed2b5c050..00000000000 --- a/net/gaim-tlen/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $OpenBSD: Makefile,v 1.5 2007/02/04 22:19:10 alek Exp $ - -SHARED_ONLY= Yes - -COMMENT= "Tlen.pl protocol plugin for GAIM" - -DISTNAME= gaim-tlen-20070203 -CATEGORIES= net - -HOMEPAGE= http://nic.com.pl/~alek/gaim-tlen/ - -MAINTAINER= Aleksander Piotrowski - -# BSD -PERMIT_PACKAGE_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes - -MASTER_SITES= ${HOMEPAGE} - -BUILD_DEPENDS= :gaim-2.0.0beta6:net/gaim -RUN_DEPENDS= :gaim-2.0.0beta6:net/gaim - -NO_REGRESS= Yes - -.include diff --git a/net/gaim-tlen/distinfo b/net/gaim-tlen/distinfo deleted file mode 100644 index 64d34af7cc8..00000000000 --- a/net/gaim-tlen/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -MD5 (gaim-tlen-20070203.tar.gz) = N8ATDt00fO+Ng/EP165lBA== -RMD160 (gaim-tlen-20070203.tar.gz) = YUYnWq4LR4tdFmlwa63Prrp9Jh0= -SHA1 (gaim-tlen-20070203.tar.gz) = zqnGbKg+BRq+CmAZf5DYcQI+m9E= -SHA256 (gaim-tlen-20070203.tar.gz) = jYdTCZySFo05Pe4ePvy6mReGmGbDwEq2bnSH5whe6sQ= -SIZE (gaim-tlen-20070203.tar.gz) = 33297 diff --git a/net/gaim-tlen/pkg/DESCR b/net/gaim-tlen/pkg/DESCR deleted file mode 100644 index 14674b0961b..00000000000 --- a/net/gaim-tlen/pkg/DESCR +++ /dev/null @@ -1 +0,0 @@ -This package contains Tlen.pl protocol plugin for GAIM. diff --git a/net/gaim-tlen/pkg/PLIST b/net/gaim-tlen/pkg/PLIST deleted file mode 100644 index 9849394ff66..00000000000 --- a/net/gaim-tlen/pkg/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/11/01 01:59:26 alek Exp $ -lib/gaim/libtlen.so -share/pixmaps/gaim/status/default/tlen.png diff --git a/net/gaim/Makefile b/net/gaim/Makefile deleted file mode 100644 index 8b49078c22d..00000000000 --- a/net/gaim/Makefile +++ /dev/null @@ -1,103 +0,0 @@ -# $OpenBSD: Makefile,v 1.105 2007/05/15 09:59:32 steven Exp $ - -SHARED_ONLY= Yes - -COMMENT= "multi-protocol instant messaging client" - -DISTNAME= gaim-2.0.0beta6 -PKGNAME= ${DISTNAME}p6 -SHARED_LIBS= gaim 0.0 \ - gaim-client 0.0 \ - gnt 0.0 \ - oscar 0.0 -CATEGORIES= net - -HOMEPAGE= http://gaim.sourceforge.net/ - -MAINTAINER= Brad Smith - -# GPL -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -WANTLIB= glib-2.0 ICE SM X11 Xext Xrender Xss \ - atk-1.0 c crypto dbus-1 expat fontconfig freetype \ - gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 \ - ssl pangocairo-1.0 cairo glitz png \ - pangoft2-1.0 z pthread m ncurses panel stdc++ - -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/} - -MODULES= devel/gettext lang/python - -BUILD_DEPENDS+= :p5-XML-Parser-*:textproc/p5-XML-Parser -RUN_DEPENDS+= :dbus-python-*:x11/dbus-python \ - :py-gtk2-*:x11/py-gtk2 -LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ - startup-notification-1::devel/startup-notification \ - silc,silcclient::devel/silc-toolkit \ - meanwhile::net/meanwhile \ - gadu::net/libgadu \ - xml2::textproc/libxml \ - dbus-glib-1::x11/dbus-glib - -USE_X11= Yes -USE_LIBTOOL= Yes -LIBTOOL_FLAGS+= --tag=disable-static -USE_GMAKE= Yes -SEPARATE_BUILD= simple -CONFIGURE_STYLE= autoconf -AUTOCONF_VERSION= 2.59 -CONFIGURE_ARGS+= --disable-gevolution \ - --disable-gnutls \ - --disable-nss \ - --disable-perl \ - --disable-tcl \ - --disable-tk \ - --disable-cap \ - --disable-schemas-install \ - --enable-openssl \ - --enable-consoleui \ - --with-python=${MODPY_BIN} - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -FLAVORS= audio debug gtkspell -FLAVOR?= - -.if ${FLAVOR:L:Maudio} -LIB_DEPENDS+= gstreamer-0.10:gstreamer-0.10.*:multimedia/gstreamer-0.10/core -.else -CONFIGURE_ARGS+= --disable-gstreamer -# --disable-gstreamer is not sufficient -MAKE_FLAGS+= GSTREAMER_CFLAGS= GSTREAMER_LIBS= -.endif - -.if ${FLAVOR:L:Mdebug} -CFLAGS= -O0 -CONFIGURE_ARGS+=--enable-debug - -INSTALL_STRIP= -.endif - -.if ${FLAVOR:L:Mgtkspell} -LIB_DEPENDS+= gtkspell::textproc/gtkspell -WANTLIB+= aspell -.else -CONFIGURE_ARGS+=--disable-gtkspell -.endif - -PYTHON_SCRIPTS= gaim-remote gaim-url-handler - -post-extract: - @cp -f ${FILESDIR}/ssl-openssl.c ${WRKSRC}/libgaim/plugins/ssl - -post-install: - perl -pi -e 's,/bin/bash,/bin/sh,g' ${PREFIX}/bin/gaim-send* -.for f in ${PYTHON_SCRIPTS} - perl -pi -e 's#%python%#${MODPY_BIN}#g' ${PREFIX}/bin/${f} -.endfor - -.include diff --git a/net/gaim/distinfo b/net/gaim/distinfo deleted file mode 100644 index 6fc85f9ce7e..00000000000 --- a/net/gaim/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -MD5 (gaim-2.0.0beta6.tar.gz) = DHUg1M4INwTRlsBMY9zRag== -RMD160 (gaim-2.0.0beta6.tar.gz) = ZtLeUZmobNivKC8sQ1uwvmeyAVs= -SHA1 (gaim-2.0.0beta6.tar.gz) = YucsnLkqb47XpuQL2Yf3M/ZcTME= -SHA256 (gaim-2.0.0beta6.tar.gz) = N9M68aNEf9lEIlTny+nA9v2iuLq6qlKAugg82cvoZUM= -SIZE (gaim-2.0.0beta6.tar.gz) = 9266980 diff --git a/net/gaim/files/ssl-openssl.c b/net/gaim/files/ssl-openssl.c deleted file mode 100644 index df1a93b17bd..00000000000 --- a/net/gaim/files/ssl-openssl.c +++ /dev/null @@ -1,341 +0,0 @@ -/* $OpenBSD: ssl-openssl.c,v 1.10 2006/10/31 19:32:51 brad Exp $ */ - -/* - * OpenSSL SSL-plugin for gaim - * - * Copyright (c) 2004 Brad Smith - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "internal.h" -#include "debug.h" -#include "plugin.h" -#include "sslconn.h" -#include "version.h" - -#define SSL_OPENSSL_PLUGIN_ID "ssl-openssl" - -#ifdef HAVE_OPENSSL - -#include -#include - -typedef struct -{ - SSL *ssl; - SSL_CTX *ssl_ctx; - guint handshake_handler; -} GaimSslOpensslData; - -#define GAIM_SSL_OPENSSL_DATA(gsc) ((GaimSslOpensslData *)gsc->private_data) - -/* - * ssl_openssl_init_openssl - * - * load the error strings we might want to use eventually, and init the - * openssl library - */ -static void -ssl_openssl_init_openssl(void) -{ - /* - * load the error number to string strings so that we can make sense - * of ssl issues while debugging this code - */ - SSL_load_error_strings(); - - /* - * we need to initialise the openssl library - * we do not seed the random number generator, although we probably - * should in gaim-win32. - */ - SSL_library_init(); -} - -/* - * ssl_openssl_init - */ -static gboolean -ssl_openssl_init(void) -{ - return (TRUE); -} - -/* - * ssl_openssl_uninit - * - * couldn't find anything to match the call to SSL_library_init in the man - * pages, i wonder if there actually is anything we need to call - */ -static void -ssl_openssl_uninit(void) -{ - ERR_free_strings(); -} - -/* - * ssl_openssl_handshake_cb - */ -static void -ssl_openssl_handshake_cb(gpointer data, gint source, GaimInputCondition cond) -{ - GaimSslConnection *gsc = (GaimSslConnection *)data; - GaimSslOpensslData *openssl_data = GAIM_SSL_OPENSSL_DATA(gsc); - int ret, ret2; - - gaim_debug_info("openssl", "Connecting\n"); - - /* - * do the negotiation that sets up the SSL connection between - * here and there. - */ - ret = SSL_connect(openssl_data->ssl); - if (ret <= 0) { - gaim_debug_info("openssl", "SSL_get_error\n"); - ret2 = SSL_get_error(openssl_data->ssl, ret); - - if (ret2 == SSL_ERROR_WANT_READ || ret2 == SSL_ERROR_WANT_WRITE) - return; - - gaim_debug_error("openssl", "SSL_connect failed\n"); - - if (gsc->error_cb != NULL) - gsc->error_cb(gsc, GAIM_SSL_HANDSHAKE_FAILED, - gsc->connect_cb_data); - - gaim_ssl_close(gsc); - return; - } - - gaim_input_remove(openssl_data->handshake_handler); - openssl_data->handshake_handler = 0; - - gaim_debug_info("openssl", "SSL_connect complete\n"); - - /* SSL connected now */ - gsc->connect_cb(gsc->connect_cb_data, gsc, cond); -} - -/* - * ssl_openssl_connect - * - * given a socket, put an openssl connection around it. - */ -static void -ssl_openssl_connect(GaimSslConnection *gsc) -{ - GaimSslOpensslData *openssl_data; - - /* - * allocate some memory to store variables for the openssl connection. - * the memory comes zero'd from g_new0 so we don't need to null the - * pointers held in this struct. - */ - openssl_data = g_new0(GaimSslOpensslData, 1); - gsc->private_data = openssl_data; - - /* - * allocate a new SSL_CTX object - */ - openssl_data->ssl_ctx = SSL_CTX_new(SSLv23_client_method()); - if (openssl_data->ssl_ctx == NULL) { - gaim_debug_error("openssl", "SSL_CTX_new failed\n"); - if (gsc->error_cb != NULL) - gsc->error_cb(gsc, GAIM_SSL_HANDSHAKE_FAILED, - gsc->connect_cb_data); - - gaim_ssl_close(gsc); - return; - } - - /* - * allocate a new SSL object - */ - openssl_data->ssl = SSL_new(openssl_data->ssl_ctx); - if (openssl_data->ssl == NULL) { - gaim_debug_error("openssl", "SSL_new failed\n"); - if (gsc->error_cb != NULL) - gsc->error_cb(gsc, GAIM_SSL_HANDSHAKE_FAILED, - gsc->connect_cb_data); - - gaim_ssl_close(gsc); - return; - } - - /* - * now we associate the file descriptor we have with the SSL connection - */ - if (SSL_set_fd(openssl_data->ssl, gsc->fd) == 0) { - gaim_debug_error("openssl", "SSL_set_fd failed\n"); - if (gsc->error_cb != NULL) - gsc->error_cb(gsc, GAIM_SSL_HANDSHAKE_FAILED, - gsc->connect_cb_data); - - gaim_ssl_close(gsc); - return; - } - - openssl_data->handshake_handler = gaim_input_add(gsc->fd, - GAIM_INPUT_READ, ssl_openssl_handshake_cb, gsc); - - ssl_openssl_handshake_cb(gsc, gsc->fd, GAIM_INPUT_READ); -} - -static void -ssl_openssl_close(GaimSslConnection *gsc) -{ - GaimSslOpensslData *openssl_data = GAIM_SSL_OPENSSL_DATA(gsc); - int i; - - if (openssl_data == NULL) - return; - - if (openssl_data->handshake_handler) - gaim_input_remove(openssl_data->handshake_handler); - - if (openssl_data->ssl != NULL) { - i = SSL_shutdown(openssl_data->ssl); - if (i == 0) - SSL_shutdown(openssl_data->ssl); - SSL_free(openssl_data->ssl); - } - - if (openssl_data->ssl_ctx != NULL) - SSL_CTX_free(openssl_data->ssl_ctx); - - g_free(openssl_data); - gsc->private_data = NULL; -} - -static size_t -ssl_openssl_read(GaimSslConnection *gsc, void *data, size_t len) -{ - GaimSslOpensslData *openssl_data = GAIM_SSL_OPENSSL_DATA(gsc); - ssize_t s; - int ret; - - s = SSL_read(openssl_data->ssl, data, len); - if (s <= 0) { - ret = SSL_get_error(openssl_data->ssl, s); - - if (ret == SSL_ERROR_WANT_READ || ret == SSL_ERROR_WANT_WRITE) { - errno = EAGAIN; - return (-1); - } - - gaim_debug_error("openssl", "receive failed: %d\n", s); - s = 0; - } - - return (s); -} - -static size_t -ssl_openssl_write(GaimSslConnection *gsc, const void *data, size_t len) -{ - GaimSslOpensslData *openssl_data = GAIM_SSL_OPENSSL_DATA(gsc); - ssize_t s = 0; - int ret; - - if (openssl_data != NULL) - s = SSL_write(openssl_data->ssl, data, len); - - if (s <= 0) { - ret = SSL_get_error(openssl_data->ssl, s); - - if (ret == SSL_ERROR_WANT_READ || ret == SSL_ERROR_WANT_WRITE) { - errno = EAGAIN; - return (-1); - } - - gaim_debug_error("openssl", "send failed: %d\n", s); - s = 0; - } - - return (s); -} - -static GaimSslOps ssl_ops = { - ssl_openssl_init, - ssl_openssl_uninit, - ssl_openssl_connect, - ssl_openssl_close, - ssl_openssl_read, - ssl_openssl_write -}; - -#endif /* HAVE_OPENSSL */ - -static gboolean -plugin_load(GaimPlugin *plugin) -{ -#ifdef HAVE_OPENSSL - if (!gaim_ssl_get_ops()) - gaim_ssl_set_ops(&ssl_ops); - - /* Init OpenSSL now so others can use it even if sslconn never does */ - ssl_openssl_init_openssl(); - - return (TRUE); -#else - return (FALSE); -#endif -} - -static gboolean -plugin_unload(GaimPlugin *plugin) -{ -#ifdef HAVE_OPENSSL - if (gaim_ssl_get_ops() == &ssl_ops) - gaim_ssl_set_ops(NULL); -#endif - - return (TRUE); -} - -static GaimPluginInfo info = { - GAIM_PLUGIN_MAGIC, - GAIM_MAJOR_VERSION, - GAIM_MINOR_VERSION, - GAIM_PLUGIN_STANDARD, /* type */ - NULL, /* ui_requirement */ - GAIM_PLUGIN_FLAG_INVISIBLE, /* flags */ - NULL, /* dependencies */ - GAIM_PRIORITY_DEFAULT, /* priority */ - - SSL_OPENSSL_PLUGIN_ID, /* id */ - N_("OpenSSL"), /* name */ - VERSION, /* version */ - - N_("Provides SSL support through OpenSSL."), /* description */ - N_("Provides SSL support through OpenSSL."), - "OpenSSL", - NULL, /* homepage */ - - plugin_load, /* load */ - plugin_unload, /* unload */ - NULL, /* destroy */ - - NULL, /* ui_info */ - NULL, /* extra_info */ - NULL, /* prefs_info */ - NULL /* actions */ -}; - -static void -init_plugin(GaimPlugin *plugin) -{ -} - -GAIM_INIT_PLUGIN(ssl_openssl, init_plugin, info) diff --git a/net/gaim/patches/patch-config_h_in b/net/gaim/patches/patch-config_h_in deleted file mode 100644 index 08c50b1201c..00000000000 --- a/net/gaim/patches/patch-config_h_in +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-config_h_in,v 1.8 2006/10/31 19:32:51 brad Exp $ ---- config.h.in.orig Wed Oct 18 15:59:47 2006 -+++ config.h.in Sat Oct 21 00:08:06 2006 -@@ -159,6 +159,12 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_NSS_H - -+/* Define if you have OpenSSL */ -+#undef HAVE_OPENSSL -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_OPENSSL_SSL_H -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_PATHS_H - diff --git a/net/gaim/patches/patch-configure_ac b/net/gaim/patches/patch-configure_ac deleted file mode 100644 index fcbdc785af9..00000000000 --- a/net/gaim/patches/patch-configure_ac +++ /dev/null @@ -1,148 +0,0 @@ -$OpenBSD: patch-configure_ac,v 1.3 2007/01/22 20:24:06 todd Exp $ ---- configure.ac.orig Thu Jan 18 23:28:24 2007 -+++ configure.ac Fri Jan 19 19:05:08 2007 -@@ -421,6 +421,7 @@ if test "x$enable_consoleui" = "xyes"; t - # ncursesw was not found. Look for plain old ncurses - enable_consoleui=yes - AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no]) -+ LIBS="${LIBS} -lncurses" - 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 -@@ -583,7 +584,7 @@ else - if test "$ac_silc_libs" != "no"; then - SILC_LIBS="-L$ac_silc_libs" - fi -- SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL" -+ SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -pthread $LIBDL" - AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS) - fi - AC_SUBST(SILC_LIBS) -@@ -1200,8 +1201,13 @@ dnl #################################### - - dnl These two are inverses of each other <-- stolen from evolution! - -+AC_ARG_ENABLE(openssl, -+ [ --enable-openssl=[yes,no] attempt to use OpenSSL for SSL support (preferred) [default=yes]], -+ [enable_openssl="$enableval"], -+ [enable_openssl="yes"]) -+ - AC_ARG_ENABLE(gnutls, -- [ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support (preferred) [default=yes]], -+ [ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support [default=yes]], - [enable_gnutls="$enableval"], - [enable_gnutls="yes"]) - -@@ -1213,6 +1219,90 @@ AC_ARG_ENABLE(nss, - msg_ssl="None (MSN and Google Talk will not work without SSL!)" - - dnl # -+dnl # Check for OpenSSL if it's specified. -+dnl # -+if test "x$enable_openssl" != "xno"; then -+ enale_openssl="no" -+ prefix=`eval echo $prefix` -+ -+ AC_ARG_WITH(openssl-includes, -+ [ --with-openssl-includes=PREFIX location of OpenSSL includes.], -+ [ with_openssl_includes="$withval" ], -+ [ with_openssl_includes="$prefix/include" ]) -+ -+ have_openssl_includes="no" -+ -+ if test "x$with_openssl_includes" != "xno"; then -+ CPPFLAGS_save="$CPPFLAGS" -+ -+ AC_MSG_CHECKING(for OpenSSL includes) -+ AC_MSG_RESULT("") -+ -+ CPPFLAGS="$CPPFLAGS -I$with_openssl_includes" -+ AC_CHECK_HEADERS(openssl/ssl.h, [ openssl_includes="yes" ]) -+ CPPFLAGS="$CPPFLAGS_save" -+ -+ if test "x$openssl_includes" != "xno" -a \ -+ "x$openssl_includes" != "x"; then -+ have_openssl_includes="yes" -+ -+ OPENSSL_CFLAGS="-I$with_openssl_includes" -+ else -+ OPENSSL_CFLAGS="" -+ fi -+ else -+ AC_MSG_CHECKING(for OpenSSL includes) -+ AC_MSG_RESULT(no) -+ fi -+ -+ AC_ARG_WITH(openssl-libs, -+ [AC_HELP_STRING([--with-openssl-libs=PREFIX], [location of OpenSSL libraries.])], -+ [ with_openssl_libs="$withval" ]) -+ -+ if test "x$with_openssl_libs" != "xno" -a \ -+ "x$have_openssl_includes" != "xno"; then -+ -+ LIBS_save="$LIBS" -+ -+ case $with_openssl_libs in -+ ""|-L*) ;; -+ *) with_openssl_libs="-L$with_openssl_libs" ;; -+ esac -+ -+ AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs, -+ [ -+ LIBS="$LIBS $with_openssl_libs -lssl -lcrypto" -+ AC_TRY_LINK_FUNC(SSL_library_init, openssl_libs="yes", openssl_libs="no") -+ LIBS="$LIBS_save" -+ ]) -+ -+ if test "x$openssl_libs" != "xno"; then -+ AC_DEFINE(HAVE_OPENSSL, 1, [Define if you have OpenSSL]) -+ AC_DEFINE(HAVE_SSL) -+ msg_openssl="OpenSSL" -+ OPENSSL_LIBS="$with_openssl_libs -lssl -lcrypto" -+ -+ enable_openssl="yes" -+ else -+ OPENSSL_CFLAGS="" -+ OPENSSL_LIBS="" -+ fi -+ else -+ AC_MSG_CHECKING(for OpenSSL libraries) -+ AC_MSG_RESULT(no) -+ fi -+else -+ OPENSSL_CFLAGS="" -+ OPENSSL_LIBS="" -+fi -+ -+AC_SUBST(OPENSSL_CFLAGS) -+AC_SUBST(OPENSSL_LIBS) -+ -+AM_CONDITIONAL(USE_OPENSSL, test "x$enable_openssl" = "xyes") -+ -+ -+dnl # - dnl # Check for GnuTLS if it's specified. - dnl # - if test "x$enable_gnutls" != "xno"; then -@@ -1565,12 +1655,20 @@ fi - - AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes") - --if test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x"; then -+if test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x" -a "x$msg_openssl" != "x"; then -+ msg_ssl="$msg_nss, $msg_gnutls, and $msg_openssl" -+elif test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x"; then - msg_ssl="$msg_nss and $msg_gnutls" -+elif test "x$msg_nss" != "x" -a "x$msg_openssl" != "x"; then -+ msg_ssl="$msg_nss and $msg_openssl" -+elif test "x$msg_gnutls" != "x" -a "x$msg_openssl" != "x"; then -+ msg_ssl="$msg_gnutls and $msg_openssl" - elif test "x$msg_nss" != "x"; then - msg_ssl=$msg_nss - elif test "x$msg_gnutls" != "x"; then - msg_ssl=$msg_gnutls -+elif test "x$msg_openssl" != "x"; then -+ msg_ssl=$msg_openssl - fi - - dnl ####################################################################### diff --git a/net/gaim/patches/patch-console_libgnt_Makefile_am b/net/gaim/patches/patch-console_libgnt_Makefile_am deleted file mode 100644 index a1c8437a508..00000000000 --- a/net/gaim/patches/patch-console_libgnt_Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-console_libgnt_Makefile_am,v 1.2 2007/01/22 20:24:06 todd Exp $ ---- console/libgnt/Makefile.am.orig Thu Jan 18 23:28:14 2007 -+++ console/libgnt/Makefile.am Fri Jan 19 19:05:08 2007 -@@ -1,6 +1,6 @@ - EXTRA_DIST=genmarshal - --SUBDIRS = . wms -+SUBDIRS = . - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = gnt.pc - diff --git a/net/gaim/patches/patch-console_libgnt_Makefile_in b/net/gaim/patches/patch-console_libgnt_Makefile_in deleted file mode 100644 index d26131fde87..00000000000 --- a/net/gaim/patches/patch-console_libgnt_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-console_libgnt_Makefile_in,v 1.3 2007/01/22 20:24:06 todd Exp $ ---- console/libgnt/Makefile.in.orig Thu Jan 18 23:28:50 2007 -+++ console/libgnt/Makefile.in Fri Jan 19 19:06:32 2007 -@@ -417,7 +417,7 @@ target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ - EXTRA_DIST = genmarshal --SUBDIRS = . wms -+SUBDIRS = . - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = gnt.pc - lib_LTLIBRARIES = libgnt.la diff --git a/net/gaim/patches/patch-console_plugins_Makefile_am b/net/gaim/patches/patch-console_plugins_Makefile_am deleted file mode 100644 index fdd86cfdd09..00000000000 --- a/net/gaim/patches/patch-console_plugins_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-console_plugins_Makefile_am,v 1.3 2007/01/22 20:24:06 todd Exp $ ---- console/plugins/Makefile.am.orig Thu Jan 18 23:28:14 2007 -+++ console/plugins/Makefile.am Fri Jan 19 19:07:47 2007 -@@ -19,7 +19,7 @@ gntgf_la_CFLAGS = $(X11_CFLAGS) - - gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/console/libgnt/libgnt.la - gnthistory_la_LIBADD = $(GLIB_LIBS) --gntlastlog_la_LIBADD = $(GLIB_LIBS) -+gntlastlog_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/console/libgnt/libgnt.la - - endif # PLUGINS - diff --git a/net/gaim/patches/patch-console_plugins_Makefile_in b/net/gaim/patches/patch-console_plugins_Makefile_in deleted file mode 100644 index 2db8cc5603e..00000000000 --- a/net/gaim/patches/patch-console_plugins_Makefile_in +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-console_plugins_Makefile_in,v 1.4 2007/01/22 20:24:06 todd Exp $ ---- console/plugins/Makefile.in.orig Fri Jan 19 19:08:05 2007 -+++ console/plugins/Makefile.in Fri Jan 19 19:10:13 2007 -@@ -69,7 +69,8 @@ am__gnthistory_la_SOURCES_DIST = gnthist - @PLUGINS_TRUE@am_gnthistory_la_OBJECTS = gnthistory.lo - gnthistory_la_OBJECTS = $(am_gnthistory_la_OBJECTS) - @PLUGINS_TRUE@am_gnthistory_la_rpath = -rpath $(plugindir) --@PLUGINS_TRUE@gntlastlog_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -+@PLUGINS_TRUE@gntlastlog_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+@PLUGINS_TRUE@ $(top_builddir)/console/libgnt/libgnt.la - am__gntlastlog_la_SOURCES_DIST = lastlog.c - @PLUGINS_TRUE@am_gntlastlog_la_OBJECTS = lastlog.lo - gntlastlog_la_OBJECTS = $(am_gntlastlog_la_OBJECTS) -@@ -428,7 +429,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-v - @PLUGINS_TRUE@gntgf_la_CFLAGS = $(X11_CFLAGS) - @PLUGINS_TRUE@gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/console/libgnt/libgnt.la - @PLUGINS_TRUE@gnthistory_la_LIBADD = $(GLIB_LIBS) --@PLUGINS_TRUE@gntlastlog_la_LIBADD = $(GLIB_LIBS) -+@PLUGINS_TRUE@gntlastlog_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/console/libgnt/libgnt.la - EXTRA_DIST = - AM_CPPFLAGS = \ - -DDATADIR=\"$(datadir)\" \ diff --git a/net/gaim/patches/patch-gaim_service_in b/net/gaim/patches/patch-gaim_service_in deleted file mode 100644 index 22cba180af2..00000000000 --- a/net/gaim/patches/patch-gaim_service_in +++ /dev/null @@ -1,9 +0,0 @@ -$OpenBSD: patch-gaim_service_in,v 1.1 2007/03/25 10:04:17 alek Exp $ ---- gaim.service.in.orig Thu Jan 18 23:28:24 2007 -+++ gaim.service.in Wed Mar 21 23:39:11 2007 -@@ -1,3 +1,3 @@ - [D-BUS Service] --Name=org.gaim.GaimService --Exec=@bindir@/gaim -+Name=net.sf.gaim.GaimService -+Exec=@prefix@/bin/gaim diff --git a/net/gaim/patches/patch-gtk_Makefile_in b/net/gaim/patches/patch-gtk_Makefile_in deleted file mode 100644 index 0119f4bae1b..00000000000 --- a/net/gaim/patches/patch-gtk_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-gtk_Makefile_in,v 1.2 2007/01/22 20:24:06 todd Exp $ ---- gtk/Makefile.in.orig Thu Jan 18 23:28:51 2007 -+++ gtk/Makefile.in Fri Jan 19 19:05:08 2007 -@@ -101,7 +101,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD - LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) -+CCLD = $(CXX) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(gaim_SOURCES) diff --git a/net/gaim/patches/patch-gtk_gtkdialogs_c b/net/gaim/patches/patch-gtk_gtkdialogs_c deleted file mode 100644 index 66887bf6cbf..00000000000 --- a/net/gaim/patches/patch-gtk_gtkdialogs_c +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-gtk_gtkdialogs_c,v 1.3 2007/01/22 20:24:06 todd Exp $ ---- gtk/gtkdialogs.c.orig Thu Jan 18 23:28:04 2007 -+++ gtk/gtkdialogs.c Fri Jan 19 19:05:08 2007 -@@ -521,6 +521,12 @@ g_string_append(str, "
Library - g_string_append(str, " GtkSpell: Disabled
"); - #endif - -+#ifdef HAVE_OPENSSL -+ g_string_append(str, " OpenSSL: Enabled
"); -+#else -+ g_string_append(str, " OpenSSL: Disabled
"); -+#endif -+ - #ifdef HAVE_GNUTLS - g_string_append(str, " GnuTLS: Enabled
"); - #else diff --git a/net/gaim/patches/patch-gtk_gtkmain_c b/net/gaim/patches/patch-gtk_gtkmain_c deleted file mode 100644 index 76655129314..00000000000 --- a/net/gaim/patches/patch-gtk_gtkmain_c +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-gtk_gtkmain_c,v 1.1 2006/10/31 19:32:51 brad Exp $ ---- gtk/gtkmain.c.orig Sat Oct 28 13:05:48 2006 -+++ gtk/gtkmain.c Sat Oct 28 13:07:47 2006 -@@ -86,6 +86,7 @@ static SnDisplay *sn_display = NULL; - #endif - - #ifdef HAVE_SIGNAL_H -+int real_status; - - /* - * Lists of signals we wish to catch and those we wish to ignore. -@@ -181,6 +182,8 @@ clean_pid() - do { - pid = waitpid(-1, &status, WNOHANG); - } while (pid != 0 && pid != (pid_t)-1); -+ -+ real_status = status; - - if ((pid == (pid_t) - 1) && (errno != ECHILD)) { - char errmsg[BUFSIZ]; diff --git a/net/gaim/patches/patch-gtk_gtknotify_c b/net/gaim/patches/patch-gtk_gtknotify_c deleted file mode 100644 index ec8c639ff25..00000000000 --- a/net/gaim/patches/patch-gtk_gtknotify_c +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-gtk_gtknotify_c,v 1.2 2007/01/22 20:24:06 todd Exp $ ---- gtk/gtknotify.c.orig Thu Jan 18 23:28:04 2007 -+++ gtk/gtknotify.c Fri Jan 19 19:05:08 2007 -@@ -915,7 +915,16 @@ uri_command(const char *command, gboolea - g_error_free(error); - } - else -+#if HAVE_SIGNAL_H -+ { -+ extern int real_status; -+ -+ if (WIFEXITED(real_status)) -+ ret = WEXITSTATUS(real_status); -+ } -+#else - ret = status; -+#endif - } - else - { diff --git a/net/gaim/patches/patch-libgaim_gaim-remote b/net/gaim/patches/patch-libgaim_gaim-remote deleted file mode 100644 index 5a12c1afacf..00000000000 --- a/net/gaim/patches/patch-libgaim_gaim-remote +++ /dev/null @@ -1,9 +0,0 @@ -$OpenBSD: patch-libgaim_gaim-remote,v 1.1 2007/02/07 01:07:18 todd Exp $ ---- libgaim/gaim-remote.orig Fri Feb 2 17:22:36 2007 -+++ libgaim/gaim-remote Fri Feb 2 17:22:59 2007 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!%python% - - import dbus - import re diff --git a/net/gaim/patches/patch-libgaim_gaim-url-handler b/net/gaim/patches/patch-libgaim_gaim-url-handler deleted file mode 100644 index de155303035..00000000000 --- a/net/gaim/patches/patch-libgaim_gaim-url-handler +++ /dev/null @@ -1,9 +0,0 @@ -$OpenBSD: patch-libgaim_gaim-url-handler,v 1.1 2007/02/07 01:07:18 todd Exp $ ---- libgaim/gaim-url-handler.orig Fri Feb 2 17:18:14 2007 -+++ libgaim/gaim-url-handler Fri Feb 2 17:19:23 2007 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!%python% - - import dbus - import re diff --git a/net/gaim/patches/patch-libgaim_plugins_ssl_Makefile_am b/net/gaim/patches/patch-libgaim_plugins_ssl_Makefile_am deleted file mode 100644 index f42e7932b54..00000000000 --- a/net/gaim/patches/patch-libgaim_plugins_ssl_Makefile_am +++ /dev/null @@ -1,31 +0,0 @@ -$OpenBSD: patch-libgaim_plugins_ssl_Makefile_am,v 1.1 2006/10/31 19:32:51 brad Exp $ ---- libgaim/plugins/ssl/Makefile.am.orig Fri Oct 20 21:45:25 2006 -+++ libgaim/plugins/ssl/Makefile.am Fri Oct 20 21:47:49 2006 -@@ -4,6 +4,7 @@ EXTRA_DIST = \ - plugindir = $(libdir)/gaim - - 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 - -@@ -15,10 +16,12 @@ plugin_LTLIBRARIES = \ - ssl-nss.la - - ssl_la_SOURCES = ssl.c -+ssl_openssl_la_SOURCES = ssl-openssl.c - ssl_gnutls_la_SOURCES = ssl-gnutls.c - ssl_nss_la_SOURCES = ssl-nss.c - - ssl_la_LIBADD = $(GLIB_LIBS) -+ssl_openssl_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS) - ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS) - ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS) - -@@ -32,4 +35,5 @@ AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(PLUGIN_CFLAGS) \ - $(NSS_CFLAGS) \ -- $(GNUTLS_CFLAGS) -+ $(GNUTLS_CFLAGS) \ -+ $(OPENSSL_CFLAGS) diff --git a/net/gaim/patches/patch-libgaim_plugins_ssl_Makefile_in b/net/gaim/patches/patch-libgaim_plugins_ssl_Makefile_in deleted file mode 100644 index 268ab5ba7c4..00000000000 --- a/net/gaim/patches/patch-libgaim_plugins_ssl_Makefile_in +++ /dev/null @@ -1,82 +0,0 @@ -$OpenBSD: patch-libgaim_plugins_ssl_Makefile_in,v 1.3 2007/01/22 20:24:06 todd Exp $ ---- libgaim/plugins/ssl/Makefile.in.orig Thu Jan 18 23:28:55 2007 -+++ libgaim/plugins/ssl/Makefile.in Fri Jan 19 19:05:08 2007 -@@ -57,6 +57,12 @@ am__installdirs = "$(DESTDIR)$(plugindir - pluginLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(plugin_LTLIBRARIES) - am__DEPENDENCIES_1 = -+@PLUGINS_TRUE@ssl_openssl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+@PLUGINS_TRUE@ $(am__DEPENDENCIES_1) -+am__ssl_openssl_la_SOURCES_DIST = ssl-openssl.c -+@PLUGINS_TRUE@am_ssl_openssl_la_OBJECTS = ssl-openssl.lo -+ssl_openssl_la_OBJECTS = $(am_ssl_openssl_la_OBJECTS) -+@PLUGINS_TRUE@am_ssl_openssl_la_rpath = -rpath $(plugindir) - @PLUGINS_TRUE@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 $ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \ - $(ssl_la_SOURCES) --DIST_SOURCES = $(am__ssl_gnutls_la_SOURCES_DIST) \ -+DIST_SOURCES = $(am__ssl_openssl_la_SOURCES_DIST) $(am__ssl_gnutls_la_SOURCES_DIST) \ - $(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST) - ETAGS = etags - CTAGS = ctags -@@ -194,6 +200,8 @@ GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ - GNT_CFLAGS = @GNT_CFLAGS@ - GNT_LIBS = @GNT_LIBS@ -+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ -+OPENSSL_LIBS = @OPENSSL_LIBS@ - GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ - GNUTLS_LIBS = @GNUTLS_LIBS@ - GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ -@@ -331,6 +339,8 @@ TCL_LIBS = @TCL_LIBS@ - TK_LIBS = @TK_LIBS@ - USE_GCONFTOOL_FALSE = @USE_GCONFTOOL_FALSE@ - USE_GCONFTOOL_TRUE = @USE_GCONFTOOL_TRUE@ -+USE_OPENSSL_FALSE = @USE_OPENSSL_FALSE@ -+USE_OPENSSL_TRUE = @USE_OPENSSL_TRUE@ - USE_GNUTLS_FALSE = @USE_GNUTLS_FALSE@ - USE_GNUTLS_TRUE = @USE_GNUTLS_TRUE@ - USE_INTERNAL_LIBGADU_FALSE = @USE_INTERNAL_LIBGADU_FALSE@ -@@ -417,17 +427,21 @@ EXTRA_DIST = \ - - plugindir = $(libdir)/gaim - 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_TRUE@plugin_LTLIBRARIES = \ - @PLUGINS_TRUE@ ssl.la \ -+@PLUGINS_TRUE@ ssl-openssl.la \ - @PLUGINS_TRUE@ ssl-gnutls.la \ - @PLUGINS_TRUE@ ssl-nss.la - - @PLUGINS_TRUE@ssl_la_SOURCES = ssl.c -+@PLUGINS_TRUE@ssl_openssl_la_SOURCES = ssl-openssl.c - @PLUGINS_TRUE@ssl_gnutls_la_SOURCES = ssl-gnutls.c - @PLUGINS_TRUE@ssl_nss_la_SOURCES = ssl-nss.c - @PLUGINS_TRUE@ssl_la_LIBADD = $(GLIB_LIBS) -+@PLUGINS_TRUE@ssl_openssl_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS) - @PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS) - @PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS) - AM_CPPFLAGS = \ -@@ -500,6 +514,8 @@ clean-pluginLTLIBRARIES: - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -+ssl-openssl.la: $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_DEPENDENCIES) -+ $(LINK) $(am_ssl_openssl_la_rpath) $(ssl_openssl_la_LDFLAGS) $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_LIBADD) $(LIBS) - 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) -@@ -513,6 +529,7 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl-openssl.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl-gnutls.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl-nss.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@ diff --git a/net/gaim/patches/patch-libgaim_protocols_gg_Makefile_am b/net/gaim/patches/patch-libgaim_protocols_gg_Makefile_am deleted file mode 100644 index 50671e0e861..00000000000 --- a/net/gaim/patches/patch-libgaim_protocols_gg_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libgaim_protocols_gg_Makefile_am,v 1.1 2006/10/31 19:32:51 brad Exp $ ---- libgaim/protocols/gg/Makefile.am.orig Sat Oct 28 12:49:22 2006 -+++ libgaim/protocols/gg/Makefile.am Sat Oct 28 12:50:21 2006 -@@ -66,7 +66,7 @@ pkg_LTLIBRARIES = libgg.la - noinst_LIBRARIES = - - libgg_la_SOURCES = $(GGSOURCES) --libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS) -+libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS) $(LIBGADU_LIBS) - - endif - diff --git a/net/gaim/patches/patch-libgaim_protocols_gg_Makefile_in b/net/gaim/patches/patch-libgaim_protocols_gg_Makefile_in deleted file mode 100644 index 704634d5adb..00000000000 --- a/net/gaim/patches/patch-libgaim_protocols_gg_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libgaim_protocols_gg_Makefile_in,v 1.3 2007/01/22 20:24:06 todd Exp $ ---- libgaim/protocols/gg/Makefile.in.orig Thu Jan 18 23:28:56 2007 -+++ libgaim/protocols/gg/Makefile.in Fri Jan 19 19:05:08 2007 -@@ -487,7 +487,7 @@ libgg_la_LDFLAGS = -module -avoid-versio - @STATIC_GG_TRUE@libgg_a_CFLAGS = $(AM_CFLAGS) - @STATIC_GG_TRUE@libgg_a_LIBADD = $(GADU_LIBS) - @STATIC_GG_FALSE@libgg_la_SOURCES = $(GGSOURCES) --@STATIC_GG_FALSE@libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS) -+@STATIC_GG_FALSE@libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS) $(LIBGADU_LIBS) - AM_CPPFLAGS = \ - -I$(top_srcdir)/libgaim \ - $(INTGG_CFLAGS) \ diff --git a/net/gaim/patches/patch-libgaim_protocols_oscar_Makefile_am b/net/gaim/patches/patch-libgaim_protocols_oscar_Makefile_am deleted file mode 100644 index 048adf428d4..00000000000 --- a/net/gaim/patches/patch-libgaim_protocols_oscar_Makefile_am +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-libgaim_protocols_oscar_Makefile_am,v 1.1 2007/01/22 20:24:06 todd Exp $ ---- libgaim/protocols/oscar/Makefile.am.orig Thu Jan 18 23:28:23 2007 -+++ libgaim/protocols/oscar/Makefile.am Fri Jan 19 22:02:01 2007 -@@ -70,10 +70,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) - - libicq_la_SOURCES = libicq.c --libicq_la_LIBADD = liboscar.la -+libicq_la_LIBADD = liboscar.la -Wl,-rpath,$(pkgdir) - - endif - diff --git a/net/gaim/patches/patch-libgaim_protocols_oscar_Makefile_in b/net/gaim/patches/patch-libgaim_protocols_oscar_Makefile_in deleted file mode 100644 index c719f26aa44..00000000000 --- a/net/gaim/patches/patch-libgaim_protocols_oscar_Makefile_in +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-libgaim_protocols_oscar_Makefile_in,v 1.1 2007/01/22 20:24:06 todd Exp $ ---- libgaim/protocols/oscar/Makefile.in.orig Thu Jan 18 23:28:58 2007 -+++ libgaim/protocols/oscar/Makefile.in Fri Jan 19 22:02:23 2007 -@@ -547,9 +547,9 @@ libicq_la_LDFLAGS = -module -avoid-versi - @STATIC_OSCAR_FALSE@liboscar_la_SOURCES = $(OSCARSOURCES) - @STATIC_OSCAR_FALSE@liboscar_la_LIBADD = $(GLIB_LIBS) - @STATIC_OSCAR_FALSE@libaim_la_SOURCES = libaim.c --@STATIC_OSCAR_FALSE@libaim_la_LIBADD = liboscar.la -+@STATIC_OSCAR_FALSE@libaim_la_LIBADD = liboscar.la -Wl,-rpath,$(pkgdir) - @STATIC_OSCAR_FALSE@libicq_la_SOURCES = libicq.c --@STATIC_OSCAR_FALSE@libicq_la_LIBADD = liboscar.la -+@STATIC_OSCAR_FALSE@libicq_la_LIBADD = liboscar.la -Wl,-rpath,$(pkgdir) - AM_CPPFLAGS = \ - -I$(top_srcdir)/libgaim \ - $(GLIB_CFLAGS) \ diff --git a/net/gaim/pkg/DESCR b/net/gaim/pkg/DESCR deleted file mode 100644 index 7157d8f3152..00000000000 --- a/net/gaim/pkg/DESCR +++ /dev/null @@ -1,23 +0,0 @@ -Gaim is a GTK+-based multi-protocol instant messaging client. It -is compatible with AIM, ICQ, MSN Messenger, Yahoo, IRC, Jabber, -Gadu-Gadu, Novell GroupWise, and Zephyr networks. - -Gaim supports many features of the various networks, such as file -transfer, away messages, typing notification, and MSN window closing -notification. It also goes beyond that and provides many unique -features. A few popular features are Buddy Pounces, which give the -ability to notify you, send a message, play a sound, or run a program -when a specific buddy goes away, signs online, or returns from idle; -and plugins, consisting of text replacement, a buddy ticker, extended -message notification, iconify on away, and more. - -Gaim integrates well with GNOME and KDE's system trays. This allows -you to work with Gaim without requiring the buddy list window to -be up at all times. - -Gaim is under constant development, and releases are usually frequent. - -Flavors: - audio - Build with gstreamer support - debug - Enable debugging - gtkspell - Build with spell checking support diff --git a/net/gaim/pkg/PLIST b/net/gaim/pkg/PLIST deleted file mode 100644 index 5d269cfe9a6..00000000000 --- a/net/gaim/pkg/PLIST +++ /dev/null @@ -1,812 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.50 2007/05/12 15:21:36 alek Exp $ -@conflict pidgin-* -bin/gaim -bin/gaim-client-example -bin/gaim-remote -bin/gaim-send -bin/gaim-send-async -bin/gaim-text -bin/gaim-url-handler -include/gaim/ -include/gaim/account.h -include/gaim/accountopt.h -include/gaim/blist.h -include/gaim/buddyicon.h -include/gaim/cipher.h -include/gaim/circbuffer.h -include/gaim/cmds.h -include/gaim/connection.h -include/gaim/conversation.h -include/gaim/core.h -include/gaim/dbus-bindings.h -include/gaim/dbus-define-api.h -include/gaim/dbus-gaim.h -include/gaim/dbus-maybe.h -include/gaim/dbus-server.h -include/gaim/dbus-useful.h -include/gaim/debug.h -include/gaim/desktopitem.h -include/gaim/dnsquery.h -include/gaim/dnssrv.h -include/gaim/eggtrayicon.h -include/gaim/eventloop.h -include/gaim/ft.h -include/gaim/gaim.h -include/gaim/gaimcombobox.h -include/gaim/gaimstock.h -include/gaim/gnt/ -include/gaim/gnt/gntaccount.h -include/gaim/gnt/gntblist.h -include/gaim/gnt/gntconn.h -include/gaim/gnt/gntconv.h -include/gaim/gnt/gntdebug.h -include/gaim/gnt/gntgaim.h -include/gaim/gnt/gntnotify.h -include/gaim/gnt/gntplugin.h -include/gaim/gnt/gntprefs.h -include/gaim/gnt/gntrequest.h -include/gaim/gnt/gntstatus.h -include/gaim/gnt/gntui.h -include/gaim/gtkaccount.h -include/gaim/gtkblist.h -include/gaim/gtkcelllayout.h -include/gaim/gtkcellrendererexpander.h -include/gaim/gtkcellrendererprogress.h -include/gaim/gtkcellview.h -include/gaim/gtkcellviewmenuitem.h -include/gaim/gtkconn.h -include/gaim/gtkconv.h -include/gaim/gtkconvwin.h -include/gaim/gtkdebug.h -include/gaim/gtkdialogs.h -include/gaim/gtkdnd-hints.h -include/gaim/gtkdocklet.h -include/gaim/gtkeventloop.h -include/gaim/gtkexpander.h -include/gaim/gtkft.h -include/gaim/gtkgaim.h -include/gaim/gtkidle.h -include/gaim/gtkimhtml.h -include/gaim/gtkimhtmltoolbar.h -include/gaim/gtklog.h -include/gaim/gtkmenutray.h -include/gaim/gtknickcolors.h -include/gaim/gtknotify.h -include/gaim/gtkplugin.h -include/gaim/gtkpluginpref.h -include/gaim/gtkpounce.h -include/gaim/gtkprefs.h -include/gaim/gtkprivacy.h -include/gaim/gtkrequest.h -include/gaim/gtkroomlist.h -include/gaim/gtksavedstatuses.h -include/gaim/gtkscrollbook.h -include/gaim/gtksession.h -include/gaim/gtksound.h -include/gaim/gtksourceiter.h -include/gaim/gtkstatusbox.h -include/gaim/gtkthemes.h -include/gaim/gtkutils.h -include/gaim/gtkwhiteboard.h -include/gaim/idle.h -include/gaim/imgstore.h -include/gaim/log.h -include/gaim/mime.h -include/gaim/network.h -include/gaim/notify.h -include/gaim/ntlm.h -include/gaim/plugin.h -include/gaim/pluginpref.h -include/gaim/pounce.h -include/gaim/prefs.h -include/gaim/privacy.h -include/gaim/proxy.h -include/gaim/prpl.h -include/gaim/request.h -include/gaim/roomlist.h -include/gaim/savedstatuses.h -include/gaim/server.h -include/gaim/signals.h -include/gaim/sound.h -include/gaim/sslconn.h -include/gaim/status.h -include/gaim/stringref.h -include/gaim/stun.h -include/gaim/upnp.h -include/gaim/util.h -include/gaim/value.h -include/gaim/version.h -include/gaim/whiteboard.h -include/gaim/xmlnode.h -include/gnt/ -include/gnt/gnt.h -include/gnt/gntbindable.h -include/gnt/gntbox.h -include/gnt/gntbutton.h -include/gnt/gntcheckbox.h -include/gnt/gntcolors.h -include/gnt/gntcombobox.h -include/gnt/gntentry.h -include/gnt/gntkeys.h -include/gnt/gntlabel.h -include/gnt/gntline.h -include/gnt/gntmarshal.h -include/gnt/gntmenu.h -include/gnt/gntmenuitem.h -include/gnt/gntmenuitemcheck.h -include/gnt/gntstyle.h -include/gnt/gnttextview.h -include/gnt/gnttree.h -include/gnt/gntutils.h -include/gnt/gntwidget.h -include/gnt/gntwindow.h -include/gnt/gntwm.h -lib/gaim/ -@comment lib/gaim/autoaccept.la -lib/gaim/autoaccept.so -@comment lib/gaim/autoreply.la -lib/gaim/autoreply.so -@comment lib/gaim/buddynote.la -lib/gaim/buddynote.so -@comment lib/gaim/convcolors.la -lib/gaim/convcolors.so -@comment lib/gaim/dbus-example.la -lib/gaim/dbus-example.so -@comment lib/gaim/extplacement.la -lib/gaim/extplacement.so -@comment lib/gaim/gaimrc.la -lib/gaim/gaimrc.so -@comment lib/gaim/gestures.la -lib/gaim/gestures.so -@comment lib/gaim/gntgf.la -lib/gaim/gntgf.so -@comment lib/gaim/gnthistory.la -lib/gaim/gnthistory.so -@comment lib/gaim/gntlastlog.la -lib/gaim/gntlastlog.so -@comment lib/gaim/history.la -lib/gaim/history.so -@comment lib/gaim/iconaway.la -lib/gaim/iconaway.so -@comment lib/gaim/idle.la -lib/gaim/idle.so -@comment lib/gaim/libaim.la -lib/gaim/libaim.so -@comment lib/gaim/libgg.la -lib/gaim/libgg.so -@comment lib/gaim/libicq.la -lib/gaim/libicq.so -@comment lib/gaim/libirc.la -lib/gaim/libirc.so -@comment lib/gaim/libjabber.la -lib/gaim/libjabber.so -@comment lib/gaim/libmsn.la -lib/gaim/libmsn.so -@comment lib/gaim/libnovell.la -lib/gaim/libnovell.so -lib/gaim/liboscar.la -@lib lib/gaim/liboscar.so.${LIBoscar_VERSION} -@comment lib/gaim/libqq.la -lib/gaim/libqq.so -@comment lib/gaim/libsametime.la -lib/gaim/libsametime.so -@comment lib/gaim/libsilcgaim.la -lib/gaim/libsilcgaim.so -@comment lib/gaim/libsimple.la -lib/gaim/libsimple.so -@comment lib/gaim/libyahoo.la -lib/gaim/libyahoo.so -@comment lib/gaim/libzephyr.la -lib/gaim/libzephyr.so -@comment lib/gaim/log_reader.la -lib/gaim/log_reader.so -@comment lib/gaim/markerline.la -lib/gaim/markerline.so -@comment lib/gaim/musicmessaging.la -lib/gaim/musicmessaging.so -@comment lib/gaim/newline.la -lib/gaim/newline.so -@comment lib/gaim/notify.la -lib/gaim/notify.so -@comment lib/gaim/offlinemsg.la -lib/gaim/offlinemsg.so -@comment lib/gaim/psychic.la -lib/gaim/psychic.so -@comment lib/gaim/relnot.la -lib/gaim/relnot.so -@comment lib/gaim/spellchk.la -lib/gaim/spellchk.so -@comment lib/gaim/ssl-gnutls.la -lib/gaim/ssl-gnutls.so -@comment lib/gaim/ssl-nss.la -lib/gaim/ssl-nss.so -@comment lib/gaim/ssl-openssl.la -lib/gaim/ssl-openssl.so -@comment lib/gaim/ssl.la -lib/gaim/ssl.so -@comment lib/gaim/statenotify.la -lib/gaim/statenotify.so -@comment lib/gaim/ticker.la -lib/gaim/ticker.so -@comment lib/gaim/timestamp.la -lib/gaim/timestamp.so -@comment lib/gaim/timestamp_format.la -lib/gaim/timestamp_format.so -@comment lib/gaim/xmppconsole.la -lib/gaim/xmppconsole.so -lib/libgaim-client.la -@lib lib/libgaim-client.so.${LIBgaim-client_VERSION} -lib/libgaim.la -@lib lib/libgaim.so.${LIBgaim_VERSION} -lib/libgnt.la -@lib lib/libgnt.so.${LIBgnt_VERSION} -lib/pkgconfig/gaim.pc -lib/pkgconfig/gnt.pc -@man man/man1/gaim-text.1 -@man man/man1/gaim.1 -share/aclocal/gaim.m4 -share/applications/ -share/applications/gaim.desktop -share/dbus-1/services/gaim.service -share/locale/am/LC_MESSAGES/gaim.mo -share/locale/ar/LC_MESSAGES/gaim.mo -share/locale/az/LC_MESSAGES/gaim.mo -share/locale/bg/LC_MESSAGES/gaim.mo -share/locale/bn/LC_MESSAGES/gaim.mo -share/locale/bs/LC_MESSAGES/gaim.mo -share/locale/ca/LC_MESSAGES/gaim.mo -share/locale/ca@valencia/ -share/locale/ca@valencia/LC_MESSAGES/ -share/locale/ca@valencia/LC_MESSAGES/gaim.mo -share/locale/cs/LC_MESSAGES/gaim.mo -share/locale/da/LC_MESSAGES/gaim.mo -share/locale/de/LC_MESSAGES/gaim.mo -share/locale/dz/LC_MESSAGES/gaim.mo -share/locale/el/LC_MESSAGES/gaim.mo -share/locale/en_AU/ -share/locale/en_AU/LC_MESSAGES/ -share/locale/en_AU/LC_MESSAGES/gaim.mo -share/locale/en_CA/LC_MESSAGES/gaim.mo -share/locale/en_GB/LC_MESSAGES/gaim.mo -share/locale/eo/LC_MESSAGES/gaim.mo -share/locale/es/LC_MESSAGES/gaim.mo -share/locale/et/LC_MESSAGES/gaim.mo -share/locale/eu/LC_MESSAGES/gaim.mo -share/locale/fa/LC_MESSAGES/gaim.mo -share/locale/fi/LC_MESSAGES/gaim.mo -share/locale/fr/LC_MESSAGES/gaim.mo -share/locale/gl/LC_MESSAGES/gaim.mo -share/locale/gu/LC_MESSAGES/gaim.mo -share/locale/he/LC_MESSAGES/gaim.mo -share/locale/hi/LC_MESSAGES/gaim.mo -share/locale/hu/LC_MESSAGES/gaim.mo -share/locale/it/LC_MESSAGES/gaim.mo -share/locale/ja/LC_MESSAGES/gaim.mo -share/locale/ka/LC_MESSAGES/gaim.mo -share/locale/ko/LC_MESSAGES/gaim.mo -share/locale/ku/LC_MESSAGES/gaim.mo -share/locale/lt/LC_MESSAGES/gaim.mo -share/locale/mk/LC_MESSAGES/gaim.mo -share/locale/my_MM/ -share/locale/my_MM/LC_MESSAGES/ -share/locale/my_MM/LC_MESSAGES/gaim.mo -share/locale/nb/LC_MESSAGES/gaim.mo -share/locale/ne/LC_MESSAGES/gaim.mo -share/locale/nl/LC_MESSAGES/gaim.mo -share/locale/nn/LC_MESSAGES/gaim.mo -share/locale/pa/LC_MESSAGES/gaim.mo -share/locale/pl/LC_MESSAGES/gaim.mo -share/locale/pt/LC_MESSAGES/gaim.mo -share/locale/pt_BR/LC_MESSAGES/gaim.mo -share/locale/ro/LC_MESSAGES/gaim.mo -share/locale/ru/LC_MESSAGES/gaim.mo -share/locale/sk/LC_MESSAGES/gaim.mo -share/locale/sl/LC_MESSAGES/gaim.mo -share/locale/sq/LC_MESSAGES/gaim.mo -share/locale/sr/LC_MESSAGES/gaim.mo -share/locale/sr@Latn/LC_MESSAGES/gaim.mo -share/locale/sv/LC_MESSAGES/gaim.mo -share/locale/ta/LC_MESSAGES/gaim.mo -share/locale/te/LC_MESSAGES/gaim.mo -share/locale/th/LC_MESSAGES/gaim.mo -share/locale/tr/LC_MESSAGES/gaim.mo -share/locale/uk/LC_MESSAGES/gaim.mo -share/locale/vi/LC_MESSAGES/gaim.mo -share/locale/xh/LC_MESSAGES/gaim.mo -share/locale/zh_CN/LC_MESSAGES/gaim.mo -share/locale/zh_TW/LC_MESSAGES/gaim.mo -share/pixmaps/ -share/pixmaps/gaim/ -share/pixmaps/gaim.png -share/pixmaps/gaim.svg -share/pixmaps/gaim/buddy_icons/ -share/pixmaps/gaim/buddy_icons/qq/ -share/pixmaps/gaim/buddy_icons/qq/qq_1.png -share/pixmaps/gaim/buddy_icons/qq/qq_10.png -share/pixmaps/gaim/buddy_icons/qq/qq_100.png -share/pixmaps/gaim/buddy_icons/qq/qq_11.png -share/pixmaps/gaim/buddy_icons/qq/qq_12.png -share/pixmaps/gaim/buddy_icons/qq/qq_13.png -share/pixmaps/gaim/buddy_icons/qq/qq_14.png -share/pixmaps/gaim/buddy_icons/qq/qq_15.png -share/pixmaps/gaim/buddy_icons/qq/qq_16.png -share/pixmaps/gaim/buddy_icons/qq/qq_17.png -share/pixmaps/gaim/buddy_icons/qq/qq_18.png -share/pixmaps/gaim/buddy_icons/qq/qq_19.png -share/pixmaps/gaim/buddy_icons/qq/qq_2.png -share/pixmaps/gaim/buddy_icons/qq/qq_20.png -share/pixmaps/gaim/buddy_icons/qq/qq_21.png -share/pixmaps/gaim/buddy_icons/qq/qq_22.png -share/pixmaps/gaim/buddy_icons/qq/qq_23.png -share/pixmaps/gaim/buddy_icons/qq/qq_24.png -share/pixmaps/gaim/buddy_icons/qq/qq_25.png -share/pixmaps/gaim/buddy_icons/qq/qq_26.png -share/pixmaps/gaim/buddy_icons/qq/qq_27.png -share/pixmaps/gaim/buddy_icons/qq/qq_28.png -share/pixmaps/gaim/buddy_icons/qq/qq_29.png -share/pixmaps/gaim/buddy_icons/qq/qq_3.png -share/pixmaps/gaim/buddy_icons/qq/qq_30.png -share/pixmaps/gaim/buddy_icons/qq/qq_31.png -share/pixmaps/gaim/buddy_icons/qq/qq_32.png -share/pixmaps/gaim/buddy_icons/qq/qq_33.png -share/pixmaps/gaim/buddy_icons/qq/qq_34.png -share/pixmaps/gaim/buddy_icons/qq/qq_35.png -share/pixmaps/gaim/buddy_icons/qq/qq_36.png -share/pixmaps/gaim/buddy_icons/qq/qq_37.png -share/pixmaps/gaim/buddy_icons/qq/qq_38.png -share/pixmaps/gaim/buddy_icons/qq/qq_39.png -share/pixmaps/gaim/buddy_icons/qq/qq_4.png -share/pixmaps/gaim/buddy_icons/qq/qq_40.png -share/pixmaps/gaim/buddy_icons/qq/qq_41.png -share/pixmaps/gaim/buddy_icons/qq/qq_42.png -share/pixmaps/gaim/buddy_icons/qq/qq_43.png -share/pixmaps/gaim/buddy_icons/qq/qq_44.png -share/pixmaps/gaim/buddy_icons/qq/qq_45.png -share/pixmaps/gaim/buddy_icons/qq/qq_46.png -share/pixmaps/gaim/buddy_icons/qq/qq_47.png -share/pixmaps/gaim/buddy_icons/qq/qq_48.png -share/pixmaps/gaim/buddy_icons/qq/qq_49.png -share/pixmaps/gaim/buddy_icons/qq/qq_5.png -share/pixmaps/gaim/buddy_icons/qq/qq_50.png -share/pixmaps/gaim/buddy_icons/qq/qq_51.png -share/pixmaps/gaim/buddy_icons/qq/qq_52.png -share/pixmaps/gaim/buddy_icons/qq/qq_53.png -share/pixmaps/gaim/buddy_icons/qq/qq_54.png -share/pixmaps/gaim/buddy_icons/qq/qq_55.png -share/pixmaps/gaim/buddy_icons/qq/qq_56.png -share/pixmaps/gaim/buddy_icons/qq/qq_57.png -share/pixmaps/gaim/buddy_icons/qq/qq_58.png -share/pixmaps/gaim/buddy_icons/qq/qq_59.png -share/pixmaps/gaim/buddy_icons/qq/qq_6.png -share/pixmaps/gaim/buddy_icons/qq/qq_60.png -share/pixmaps/gaim/buddy_icons/qq/qq_61.png -share/pixmaps/gaim/buddy_icons/qq/qq_62.png -share/pixmaps/gaim/buddy_icons/qq/qq_63.png -share/pixmaps/gaim/buddy_icons/qq/qq_64.png -share/pixmaps/gaim/buddy_icons/qq/qq_65.png -share/pixmaps/gaim/buddy_icons/qq/qq_66.png -share/pixmaps/gaim/buddy_icons/qq/qq_67.png -share/pixmaps/gaim/buddy_icons/qq/qq_68.png -share/pixmaps/gaim/buddy_icons/qq/qq_69.png -share/pixmaps/gaim/buddy_icons/qq/qq_7.png -share/pixmaps/gaim/buddy_icons/qq/qq_70.png -share/pixmaps/gaim/buddy_icons/qq/qq_71.png -share/pixmaps/gaim/buddy_icons/qq/qq_72.png -share/pixmaps/gaim/buddy_icons/qq/qq_73.png -share/pixmaps/gaim/buddy_icons/qq/qq_74.png -share/pixmaps/gaim/buddy_icons/qq/qq_75.png -share/pixmaps/gaim/buddy_icons/qq/qq_76.png -share/pixmaps/gaim/buddy_icons/qq/qq_77.png -share/pixmaps/gaim/buddy_icons/qq/qq_78.png -share/pixmaps/gaim/buddy_icons/qq/qq_79.png -share/pixmaps/gaim/buddy_icons/qq/qq_8.png -share/pixmaps/gaim/buddy_icons/qq/qq_80.png -share/pixmaps/gaim/buddy_icons/qq/qq_81.png -share/pixmaps/gaim/buddy_icons/qq/qq_82.png -share/pixmaps/gaim/buddy_icons/qq/qq_83.png -share/pixmaps/gaim/buddy_icons/qq/qq_84.png -share/pixmaps/gaim/buddy_icons/qq/qq_85.png -share/pixmaps/gaim/buddy_icons/qq/qq_86.png -share/pixmaps/gaim/buddy_icons/qq/qq_87.png -share/pixmaps/gaim/buddy_icons/qq/qq_88.png -share/pixmaps/gaim/buddy_icons/qq/qq_89.png -share/pixmaps/gaim/buddy_icons/qq/qq_9.png -share/pixmaps/gaim/buddy_icons/qq/qq_90.png -share/pixmaps/gaim/buddy_icons/qq/qq_91.png -share/pixmaps/gaim/buddy_icons/qq/qq_92.png -share/pixmaps/gaim/buddy_icons/qq/qq_93.png -share/pixmaps/gaim/buddy_icons/qq/qq_94.png -share/pixmaps/gaim/buddy_icons/qq/qq_95.png -share/pixmaps/gaim/buddy_icons/qq/qq_96.png -share/pixmaps/gaim/buddy_icons/qq/qq_97.png -share/pixmaps/gaim/buddy_icons/qq/qq_98.png -share/pixmaps/gaim/buddy_icons/qq/qq_99.png -share/pixmaps/gaim/buttons/ -share/pixmaps/gaim/buttons/about_menu.png -share/pixmaps/gaim/buttons/accounts.png -share/pixmaps/gaim/buttons/change-bgcolor-small.png -share/pixmaps/gaim/buttons/change-fgcolor-small.png -share/pixmaps/gaim/buttons/edit.png -share/pixmaps/gaim/buttons/info.png -share/pixmaps/gaim/buttons/insert-image-small.png -share/pixmaps/gaim/buttons/insert-link-small.png -share/pixmaps/gaim/buttons/insert-smiley-small.png -share/pixmaps/gaim/buttons/music.png -share/pixmaps/gaim/buttons/pause.png -share/pixmaps/gaim/buttons/send-im.png -share/pixmaps/gaim/buttons/text_bigger.png -share/pixmaps/gaim/buttons/text_normal.png -share/pixmaps/gaim/buttons/text_smaller.png -share/pixmaps/gaim/dialogs/ -share/pixmaps/gaim/dialogs/gaim_auth.png -share/pixmaps/gaim/dialogs/gaim_cool.png -share/pixmaps/gaim/dialogs/gaim_error.png -share/pixmaps/gaim/dialogs/gaim_info.png -share/pixmaps/gaim/dialogs/gaim_question.png -share/pixmaps/gaim/dialogs/gaim_warning.png -share/pixmaps/gaim/icons/ -share/pixmaps/gaim/icons/away.png -share/pixmaps/gaim/icons/connect.png -share/pixmaps/gaim/icons/msgpend.png -share/pixmaps/gaim/icons/msgunread.png -share/pixmaps/gaim/icons/offline.png -share/pixmaps/gaim/icons/online.png -share/pixmaps/gaim/icons/stock_connect_16.png -share/pixmaps/gaim/icons/stock_disconnect_16.png -share/pixmaps/gaim/insert-image.png -share/pixmaps/gaim/logo.png -share/pixmaps/gaim/phone.png -share/pixmaps/gaim/smileys/ -share/pixmaps/gaim/smileys/default/ -share/pixmaps/gaim/smileys/default/angel.png -share/pixmaps/gaim/smileys/default/bigsmile.png -share/pixmaps/gaim/smileys/default/burp.png -share/pixmaps/gaim/smileys/default/cool.png -share/pixmaps/gaim/smileys/default/crazy.png -share/pixmaps/gaim/smileys/default/crossedlips.png -share/pixmaps/gaim/smileys/default/cry.png -share/pixmaps/gaim/smileys/default/download.png -share/pixmaps/gaim/smileys/default/embarrassed.png -share/pixmaps/gaim/smileys/default/farted.png -share/pixmaps/gaim/smileys/default/kiss.png -share/pixmaps/gaim/smileys/default/luke.png -share/pixmaps/gaim/smileys/default/moneymouth.png -share/pixmaps/gaim/smileys/default/mrt.png -share/pixmaps/gaim/smileys/default/msn_angel.png -share/pixmaps/gaim/smileys/default/msn_angry.png -share/pixmaps/gaim/smileys/default/msn_away.png -share/pixmaps/gaim/smileys/default/msn_bat.gif -share/pixmaps/gaim/smileys/default/msn_beer.png -share/pixmaps/gaim/smileys/default/msn_bowl.png -share/pixmaps/gaim/smileys/default/msn_boy.png -share/pixmaps/gaim/smileys/default/msn_brb.png -share/pixmaps/gaim/smileys/default/msn_brheart.png -share/pixmaps/gaim/smileys/default/msn_cake.gif -share/pixmaps/gaim/smileys/default/msn_car.png -share/pixmaps/gaim/smileys/default/msn_cat.png -share/pixmaps/gaim/smileys/default/msn_cellphone.png -share/pixmaps/gaim/smileys/default/msn_cigarette.gif -share/pixmaps/gaim/smileys/default/msn_clock.png -share/pixmaps/gaim/smileys/default/msn_coffee.png -share/pixmaps/gaim/smileys/default/msn_coins.png -share/pixmaps/gaim/smileys/default/msn_computer.png -share/pixmaps/gaim/smileys/default/msn_cry.gif -share/pixmaps/gaim/smileys/default/msn_deadflower.png -share/pixmaps/gaim/smileys/default/msn_devil.png -share/pixmaps/gaim/smileys/default/msn_dog.png -share/pixmaps/gaim/smileys/default/msn_dontknow.gif -share/pixmaps/gaim/smileys/default/msn_donttell.png -share/pixmaps/gaim/smileys/default/msn_drink.png -share/pixmaps/gaim/smileys/default/msn_email.png -share/pixmaps/gaim/smileys/default/msn_embarrassed.png -share/pixmaps/gaim/smileys/default/msn_eyeroll.gif -share/pixmaps/gaim/smileys/default/msn_film.png -share/pixmaps/gaim/smileys/default/msn_fingerscrossed.png -share/pixmaps/gaim/smileys/default/msn_flower.png -share/pixmaps/gaim/smileys/default/msn_gift.png -share/pixmaps/gaim/smileys/default/msn_girl.png -share/pixmaps/gaim/smileys/default/msn_handcuffs.png -share/pixmaps/gaim/smileys/default/msn_heart.png -share/pixmaps/gaim/smileys/default/msn_highfive.png -share/pixmaps/gaim/smileys/default/msn_hot.png -share/pixmaps/gaim/smileys/default/msn_icon.png -share/pixmaps/gaim/smileys/default/msn_idea.png -share/pixmaps/gaim/smileys/default/msn_island.png -share/pixmaps/gaim/smileys/default/msn_kiss.png -share/pixmaps/gaim/smileys/default/msn_laugh.png -share/pixmaps/gaim/smileys/default/msn_lightning.gif -share/pixmaps/gaim/smileys/default/msn_nerd.png -share/pixmaps/gaim/smileys/default/msn_neutral.png -share/pixmaps/gaim/smileys/default/msn_note.png -share/pixmaps/gaim/smileys/default/msn_occ.png -share/pixmaps/gaim/smileys/default/msn_online.png -share/pixmaps/gaim/smileys/default/msn_ooooh.png -share/pixmaps/gaim/smileys/default/msn_party.gif -share/pixmaps/gaim/smileys/default/msn_phone.png -share/pixmaps/gaim/smileys/default/msn_photo.png -share/pixmaps/gaim/smileys/default/msn_pizza.png -share/pixmaps/gaim/smileys/default/msn_plane.png -share/pixmaps/gaim/smileys/default/msn_plate.png -share/pixmaps/gaim/smileys/default/msn_question.png -share/pixmaps/gaim/smileys/default/msn_rainbow.png -share/pixmaps/gaim/smileys/default/msn_run.png -share/pixmaps/gaim/smileys/default/msn_runback.png -share/pixmaps/gaim/smileys/default/msn_sad.png -share/pixmaps/gaim/smileys/default/msn_sarcastic.png -share/pixmaps/gaim/smileys/default/msn_secret.png -share/pixmaps/gaim/smileys/default/msn_sheep.png -share/pixmaps/gaim/smileys/default/msn_sick.png -share/pixmaps/gaim/smileys/default/msn_sleep.png -share/pixmaps/gaim/smileys/default/msn_sleepy.gif -share/pixmaps/gaim/smileys/default/msn_smiley.png -share/pixmaps/gaim/smileys/default/msn_snail.png -share/pixmaps/gaim/smileys/default/msn_soccer.png -share/pixmaps/gaim/smileys/default/msn_star.png -share/pixmaps/gaim/smileys/default/msn_stormy.png -share/pixmaps/gaim/smileys/default/msn_sun.png -share/pixmaps/gaim/smileys/default/msn_sunglasses.png -share/pixmaps/gaim/smileys/default/msn_teeth.png -share/pixmaps/gaim/smileys/default/msn_think.gif -share/pixmaps/gaim/smileys/default/msn_thumbdown.png -share/pixmaps/gaim/smileys/default/msn_thumbup.png -share/pixmaps/gaim/smileys/default/msn_tongue.png -share/pixmaps/gaim/smileys/default/msn_turtle.png -share/pixmaps/gaim/smileys/default/msn_umbrella.png -share/pixmaps/gaim/smileys/default/msn_weird.png -share/pixmaps/gaim/smileys/default/msn_wink.gif -share/pixmaps/gaim/smileys/default/msn_xbox.png -share/pixmaps/gaim/smileys/default/oneeye.png -share/pixmaps/gaim/smileys/default/qq_smiley_0.gif -share/pixmaps/gaim/smileys/default/qq_smiley_1.gif -share/pixmaps/gaim/smileys/default/qq_smiley_10.gif -share/pixmaps/gaim/smileys/default/qq_smiley_11.gif -share/pixmaps/gaim/smileys/default/qq_smiley_12.gif -share/pixmaps/gaim/smileys/default/qq_smiley_13.gif -share/pixmaps/gaim/smileys/default/qq_smiley_14.gif -share/pixmaps/gaim/smileys/default/qq_smiley_15.gif -share/pixmaps/gaim/smileys/default/qq_smiley_16.gif -share/pixmaps/gaim/smileys/default/qq_smiley_17.gif -share/pixmaps/gaim/smileys/default/qq_smiley_18.gif -share/pixmaps/gaim/smileys/default/qq_smiley_19.gif -share/pixmaps/gaim/smileys/default/qq_smiley_2.gif -share/pixmaps/gaim/smileys/default/qq_smiley_20.gif -share/pixmaps/gaim/smileys/default/qq_smiley_21.gif -share/pixmaps/gaim/smileys/default/qq_smiley_22.gif -share/pixmaps/gaim/smileys/default/qq_smiley_23.gif -share/pixmaps/gaim/smileys/default/qq_smiley_24.gif -share/pixmaps/gaim/smileys/default/qq_smiley_25.gif -share/pixmaps/gaim/smileys/default/qq_smiley_26.gif -share/pixmaps/gaim/smileys/default/qq_smiley_27.gif -share/pixmaps/gaim/smileys/default/qq_smiley_28.gif -share/pixmaps/gaim/smileys/default/qq_smiley_29.gif -share/pixmaps/gaim/smileys/default/qq_smiley_3.gif -share/pixmaps/gaim/smileys/default/qq_smiley_30.gif -share/pixmaps/gaim/smileys/default/qq_smiley_31.gif -share/pixmaps/gaim/smileys/default/qq_smiley_32.gif -share/pixmaps/gaim/smileys/default/qq_smiley_33.gif -share/pixmaps/gaim/smileys/default/qq_smiley_34.gif -share/pixmaps/gaim/smileys/default/qq_smiley_35.gif -share/pixmaps/gaim/smileys/default/qq_smiley_36.gif -share/pixmaps/gaim/smileys/default/qq_smiley_37.gif -share/pixmaps/gaim/smileys/default/qq_smiley_38.gif -share/pixmaps/gaim/smileys/default/qq_smiley_39.gif -share/pixmaps/gaim/smileys/default/qq_smiley_4.gif -share/pixmaps/gaim/smileys/default/qq_smiley_40.gif -share/pixmaps/gaim/smileys/default/qq_smiley_41.gif -share/pixmaps/gaim/smileys/default/qq_smiley_42.gif -share/pixmaps/gaim/smileys/default/qq_smiley_43.gif -share/pixmaps/gaim/smileys/default/qq_smiley_44.gif -share/pixmaps/gaim/smileys/default/qq_smiley_45.gif -share/pixmaps/gaim/smileys/default/qq_smiley_46.gif -share/pixmaps/gaim/smileys/default/qq_smiley_47.gif -share/pixmaps/gaim/smileys/default/qq_smiley_48.gif -share/pixmaps/gaim/smileys/default/qq_smiley_49.gif -share/pixmaps/gaim/smileys/default/qq_smiley_5.gif -share/pixmaps/gaim/smileys/default/qq_smiley_50.gif -share/pixmaps/gaim/smileys/default/qq_smiley_51.gif -share/pixmaps/gaim/smileys/default/qq_smiley_52.gif -share/pixmaps/gaim/smileys/default/qq_smiley_53.gif -share/pixmaps/gaim/smileys/default/qq_smiley_54.gif -share/pixmaps/gaim/smileys/default/qq_smiley_55.gif -share/pixmaps/gaim/smileys/default/qq_smiley_56.gif -share/pixmaps/gaim/smileys/default/qq_smiley_57.gif -share/pixmaps/gaim/smileys/default/qq_smiley_58.gif -share/pixmaps/gaim/smileys/default/qq_smiley_59.gif -share/pixmaps/gaim/smileys/default/qq_smiley_6.gif -share/pixmaps/gaim/smileys/default/qq_smiley_60.gif -share/pixmaps/gaim/smileys/default/qq_smiley_61.gif -share/pixmaps/gaim/smileys/default/qq_smiley_62.gif -share/pixmaps/gaim/smileys/default/qq_smiley_63.gif -share/pixmaps/gaim/smileys/default/qq_smiley_64.gif -share/pixmaps/gaim/smileys/default/qq_smiley_65.gif -share/pixmaps/gaim/smileys/default/qq_smiley_66.gif -share/pixmaps/gaim/smileys/default/qq_smiley_67.gif -share/pixmaps/gaim/smileys/default/qq_smiley_68.gif -share/pixmaps/gaim/smileys/default/qq_smiley_69.gif -share/pixmaps/gaim/smileys/default/qq_smiley_7.gif -share/pixmaps/gaim/smileys/default/qq_smiley_70.gif -share/pixmaps/gaim/smileys/default/qq_smiley_71.gif -share/pixmaps/gaim/smileys/default/qq_smiley_72.gif -share/pixmaps/gaim/smileys/default/qq_smiley_73.gif -share/pixmaps/gaim/smileys/default/qq_smiley_74.gif -share/pixmaps/gaim/smileys/default/qq_smiley_75.gif -share/pixmaps/gaim/smileys/default/qq_smiley_76.gif -share/pixmaps/gaim/smileys/default/qq_smiley_77.gif -share/pixmaps/gaim/smileys/default/qq_smiley_78.gif -share/pixmaps/gaim/smileys/default/qq_smiley_79.gif -share/pixmaps/gaim/smileys/default/qq_smiley_8.gif -share/pixmaps/gaim/smileys/default/qq_smiley_80.gif -share/pixmaps/gaim/smileys/default/qq_smiley_81.gif -share/pixmaps/gaim/smileys/default/qq_smiley_82.gif -share/pixmaps/gaim/smileys/default/qq_smiley_83.gif -share/pixmaps/gaim/smileys/default/qq_smiley_84.gif -share/pixmaps/gaim/smileys/default/qq_smiley_85.gif -share/pixmaps/gaim/smileys/default/qq_smiley_86.gif -share/pixmaps/gaim/smileys/default/qq_smiley_87.gif -share/pixmaps/gaim/smileys/default/qq_smiley_88.gif -share/pixmaps/gaim/smileys/default/qq_smiley_89.gif -share/pixmaps/gaim/smileys/default/qq_smiley_9.gif -share/pixmaps/gaim/smileys/default/qq_smiley_90.gif -share/pixmaps/gaim/smileys/default/qq_smiley_91.gif -share/pixmaps/gaim/smileys/default/qq_smiley_92.gif -share/pixmaps/gaim/smileys/default/qq_smiley_93.gif -share/pixmaps/gaim/smileys/default/qq_smiley_94.gif -share/pixmaps/gaim/smileys/default/qq_smiley_95.gif -share/pixmaps/gaim/smileys/default/sad.png -share/pixmaps/gaim/smileys/default/scream.png -share/pixmaps/gaim/smileys/default/smile.png -share/pixmaps/gaim/smileys/default/theme -share/pixmaps/gaim/smileys/default/think.png -share/pixmaps/gaim/smileys/default/tongue.png -share/pixmaps/gaim/smileys/default/wink.png -share/pixmaps/gaim/smileys/default/yahoo_alien.gif -share/pixmaps/gaim/smileys/default/yahoo_alien2.gif -share/pixmaps/gaim/smileys/default/yahoo_angel.gif -share/pixmaps/gaim/smileys/default/yahoo_angry.gif -share/pixmaps/gaim/smileys/default/yahoo_batting.gif -share/pixmaps/gaim/smileys/default/yahoo_beatup.gif -share/pixmaps/gaim/smileys/default/yahoo_bigsmile.gif -share/pixmaps/gaim/smileys/default/yahoo_blush.gif -share/pixmaps/gaim/smileys/default/yahoo_brokenheart.gif -share/pixmaps/gaim/smileys/default/yahoo_bye.gif -share/pixmaps/gaim/smileys/default/yahoo_chicken.gif -share/pixmaps/gaim/smileys/default/yahoo_clap.gif -share/pixmaps/gaim/smileys/default/yahoo_clown.gif -share/pixmaps/gaim/smileys/default/yahoo_coffee.gif -share/pixmaps/gaim/smileys/default/yahoo_cow.gif -share/pixmaps/gaim/smileys/default/yahoo_cowboy.gif -share/pixmaps/gaim/smileys/default/yahoo_cry.gif -share/pixmaps/gaim/smileys/default/yahoo_dance.gif -share/pixmaps/gaim/smileys/default/yahoo_devil.gif -share/pixmaps/gaim/smileys/default/yahoo_doh.gif -share/pixmaps/gaim/smileys/default/yahoo_drool.gif -share/pixmaps/gaim/smileys/default/yahoo_eyebrow.gif -share/pixmaps/gaim/smileys/default/yahoo_eyeroll.gif -share/pixmaps/gaim/smileys/default/yahoo_femalefighter.gif -share/pixmaps/gaim/smileys/default/yahoo_flag.gif -share/pixmaps/gaim/smileys/default/yahoo_flower.gif -share/pixmaps/gaim/smileys/default/yahoo_frustrated.gif -share/pixmaps/gaim/smileys/default/yahoo_ghost.gif -share/pixmaps/gaim/smileys/default/yahoo_giggle.gif -share/pixmaps/gaim/smileys/default/yahoo_glasses.gif -share/pixmaps/gaim/smileys/default/yahoo_huggs.gif -share/pixmaps/gaim/smileys/default/yahoo_hypnotized.gif -share/pixmaps/gaim/smileys/default/yahoo_idea.gif -share/pixmaps/gaim/smileys/default/yahoo_kiss.gif -share/pixmaps/gaim/smileys/default/yahoo_laughloud.gif -share/pixmaps/gaim/smileys/default/yahoo_liar.gif -share/pixmaps/gaim/smileys/default/yahoo_loser.gif -share/pixmaps/gaim/smileys/default/yahoo_love.gif -share/pixmaps/gaim/smileys/default/yahoo_madtongue.gif -share/pixmaps/gaim/smileys/default/yahoo_malefighter1.gif -share/pixmaps/gaim/smileys/default/yahoo_malefighter2.gif -share/pixmaps/gaim/smileys/default/yahoo_mean.gif -share/pixmaps/gaim/smileys/default/yahoo_moneyeyes.gif -share/pixmaps/gaim/smileys/default/yahoo_monkey.gif -share/pixmaps/gaim/smileys/default/yahoo_nailbiting.gif -share/pixmaps/gaim/smileys/default/yahoo_neutral.gif -share/pixmaps/gaim/smileys/default/yahoo_ooooh.gif -share/pixmaps/gaim/smileys/default/yahoo_party.gif -share/pixmaps/gaim/smileys/default/yahoo_peace.gif -share/pixmaps/gaim/smileys/default/yahoo_pig.gif -share/pixmaps/gaim/smileys/default/yahoo_pray.gif -share/pixmaps/gaim/smileys/default/yahoo_pumpkin.gif -share/pixmaps/gaim/smileys/default/yahoo_question.gif -share/pixmaps/gaim/smileys/default/yahoo_rotfl.gif -share/pixmaps/gaim/smileys/default/yahoo_sad.gif -share/pixmaps/gaim/smileys/default/yahoo_shame.gif -share/pixmaps/gaim/smileys/default/yahoo_shamrock.gif -share/pixmaps/gaim/smileys/default/yahoo_shhhh.gif -share/pixmaps/gaim/smileys/default/yahoo_sick.gif -share/pixmaps/gaim/smileys/default/yahoo_sighing.gif -share/pixmaps/gaim/smileys/default/yahoo_silent.gif -share/pixmaps/gaim/smileys/default/yahoo_silly.gif -share/pixmaps/gaim/smileys/default/yahoo_sleep.gif -share/pixmaps/gaim/smileys/default/yahoo_smiley.gif -share/pixmaps/gaim/smileys/default/yahoo_star.gif -share/pixmaps/gaim/smileys/default/yahoo_sunglas.gif -share/pixmaps/gaim/smileys/default/yahoo_sweating.gif -share/pixmaps/gaim/smileys/default/yahoo_talktohand.gif -share/pixmaps/gaim/smileys/default/yahoo_think.gif -share/pixmaps/gaim/smileys/default/yahoo_tired.gif -share/pixmaps/gaim/smileys/default/yahoo_tongue.gif -share/pixmaps/gaim/smileys/default/yahoo_waiting.gif -share/pixmaps/gaim/smileys/default/yahoo_waving.gif -share/pixmaps/gaim/smileys/default/yahoo_whistling.gif -share/pixmaps/gaim/smileys/default/yahoo_wink.gif -share/pixmaps/gaim/smileys/default/yahoo_worried.gif -share/pixmaps/gaim/smileys/default/yahoo_worship.gif -share/pixmaps/gaim/smileys/default/yahoo_yingyang.gif -share/pixmaps/gaim/smileys/default/yahoo_youkiddingme.gif -share/pixmaps/gaim/smileys/default/yell.png -share/pixmaps/gaim/smileys/none/ -share/pixmaps/gaim/smileys/none/theme -share/pixmaps/gaim/status/ -share/pixmaps/gaim/status-away.png -share/pixmaps/gaim/status-connect0.png -share/pixmaps/gaim/status-connect1.png -share/pixmaps/gaim/status-connect2.png -share/pixmaps/gaim/status-connect3.png -share/pixmaps/gaim/status-invisible.png -share/pixmaps/gaim/status-offline.png -share/pixmaps/gaim/status-online.png -share/pixmaps/gaim/status-typing0.png -share/pixmaps/gaim/status-typing1.png -share/pixmaps/gaim/status-typing2.png -share/pixmaps/gaim/status-typing3.png -share/pixmaps/gaim/status/default/ -share/pixmaps/gaim/status/default/activebuddy.png -share/pixmaps/gaim/status/default/admin.png -share/pixmaps/gaim/status/default/aim.png -share/pixmaps/gaim/status/default/aol.png -share/pixmaps/gaim/status/default/away.png -share/pixmaps/gaim/status/default/blocked.png -share/pixmaps/gaim/status/default/bonjour.png -share/pixmaps/gaim/status/default/dnd.png -share/pixmaps/gaim/status/default/extended_away.png -share/pixmaps/gaim/status/default/external.png -share/pixmaps/gaim/status/default/female.png -share/pixmaps/gaim/status/default/founder.png -share/pixmaps/gaim/status/default/freeforchat.png -share/pixmaps/gaim/status/default/gadu-gadu.png -share/pixmaps/gaim/status/default/game.png -share/pixmaps/gaim/status/default/halfop.png -share/pixmaps/gaim/status/default/hiptop.png -share/pixmaps/gaim/status/default/icq.png -share/pixmaps/gaim/status/default/ignored.png -share/pixmaps/gaim/status/default/invisible.png -share/pixmaps/gaim/status/default/irc.png -share/pixmaps/gaim/status/default/jabber.png -share/pixmaps/gaim/status/default/login.png -share/pixmaps/gaim/status/default/logout.png -share/pixmaps/gaim/status/default/male.png -share/pixmaps/gaim/status/default/meanwhile.png -share/pixmaps/gaim/status/default/msn.png -share/pixmaps/gaim/status/default/notauthorized.png -share/pixmaps/gaim/status/default/novell.png -share/pixmaps/gaim/status/default/occupied.png -share/pixmaps/gaim/status/default/offline.png -share/pixmaps/gaim/status/default/op.png -share/pixmaps/gaim/status/default/pending.png -share/pixmaps/gaim/status/default/qq.png -share/pixmaps/gaim/status/default/secure.png -share/pixmaps/gaim/status/default/silc.png -share/pixmaps/gaim/status/default/simple.png -share/pixmaps/gaim/status/default/unavailable.png -share/pixmaps/gaim/status/default/voice.png -share/pixmaps/gaim/status/default/wireless.png -share/pixmaps/gaim/status/default/yahoo.png -share/pixmaps/gaim/status/default/zephyr.png -share/pixmaps/gaim/tb_drag_arrow_down.xpm -share/pixmaps/gaim/tb_drag_arrow_left.xpm -share/pixmaps/gaim/tb_drag_arrow_right.xpm -share/pixmaps/gaim/tb_drag_arrow_up.xpm -share/pixmaps/gaim/typed.png -share/pixmaps/gaim/typing.png -share/sounds/ -share/sounds/gaim/ -share/sounds/gaim/alert.wav -share/sounds/gaim/login.wav -share/sounds/gaim/logout.wav -share/sounds/gaim/receive.wav -share/sounds/gaim/send.wav diff --git a/security/gaim-otr/Makefile b/security/gaim-otr/Makefile deleted file mode 100644 index f6db430e491..00000000000 --- a/security/gaim-otr/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# $OpenBSD: Makefile,v 1.9 2007/01/22 20:26:23 todd Exp $ - -COMMENT= "Allows deniable private conversations using GAIM" - -DISTNAME= gaim-otr-3.0.0 -PKGNAME= ${DISTNAME}p2 -CATEGORIES= security net - -HOMEPAGE= http://www.cypherpunks.ca/otr/ \ - http://www.xelerance.com/mirror/otr/ - -MASTER_SITES= ${HOMEPAGE} - -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -RUN_DEPENDS= :gaim->=2.0.0beta5:net/gaim -BUILD_DEPENDS= ${RUN_DEPENDS} -LIB_DEPENDS= otr.>=3:libotr->=3.0.0p0:security/libotr \ - gcrypt.>=12:libgcrypt->=1.2:security/libgcrypt - -MODULES= devel/gettext -WANTLIB= gpg-error - -USE_X11= Yes -USE_LIBTOOL= Yes - -SHARED_ONLY= Yes - -CONFIGURE_STYLE= gnu -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib " - -.include diff --git a/security/gaim-otr/distinfo b/security/gaim-otr/distinfo deleted file mode 100644 index 983cac25605..00000000000 --- a/security/gaim-otr/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -MD5 (gaim-otr-3.0.0.tar.gz) = 6BnvBlvAdY9Yvq5apqc6sQ== -RMD160 (gaim-otr-3.0.0.tar.gz) = e1ULK+G9FQpIrml/3qPvsfFnd0c= -SHA1 (gaim-otr-3.0.0.tar.gz) = meueBW9RY9KdM6fWZRf1PXp0M+U= -SHA256 (gaim-otr-3.0.0.tar.gz) = 1oh/5QVLukZtFdFDbtFZgqO47x27jnPut5GVU1+IvgE= -SIZE (gaim-otr-3.0.0.tar.gz) = 326217 diff --git a/security/gaim-otr/patches/patch-gtk-dialog_c b/security/gaim-otr/patches/patch-gtk-dialog_c deleted file mode 100644 index 9409c7d646c..00000000000 --- a/security/gaim-otr/patches/patch-gtk-dialog_c +++ /dev/null @@ -1,129 +0,0 @@ -$OpenBSD: patch-gtk-dialog_c,v 1.1 2006/10/31 20:15:30 alek Exp $ ---- gtk-dialog.c.orig Fri Oct 28 05:38:21 2005 -+++ gtk-dialog.c Sat Oct 28 23:52:37 2006 -@@ -26,7 +26,12 @@ - #include - - /* gaim headers */ -+#include "version.h" -+#if GAIM_MAJOR_VERSION < 2 - #include "stock.h" -+#else -+#include "gaimstock.h" -+#endif - #include "plugin.h" - #include "notify.h" - #include "gtkconv.h" -@@ -779,7 +784,11 @@ static int otrg_gtk_dialog_display_otr_m - account = gaim_accounts_find(accountname, protocol); - if (!account) return -1; - -+#if GAIM_MAJOR_VERSION < 2 - conv = gaim_find_conversation_with_account(username, account); -+#else -+ conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, username, account); -+#endif - if (!conv) return -1; - - gaim_conversation_write(conv, NULL, msg, GAIM_MESSAGE_SYSTEM, time(NULL)); -@@ -908,7 +917,11 @@ static void dialog_update_label_conv(Gai - GtkWidget *menuquerylabel; - GtkWidget *menuview; - GtkWidget *menuverf; -+#if GAIM_MAJOR_VERSION < 2 -+ /* gaim-2.0.0 no longer has the row of buttons, so it doesn't have -+ * the button_type pref */ - GaimButtonStyle buttonstyle; -+#endif - GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv); - label = gaim_conversation_get_data(conv, "otr-label"); - icon = gaim_conversation_get_data(conv, "otr-icon"); -@@ -919,7 +932,9 @@ static void dialog_update_label_conv(Gai - menuend = gaim_conversation_get_data(conv, "otr-menuend"); - menuview = gaim_conversation_get_data(conv, "otr-menuview"); - menuverf = gaim_conversation_get_data(conv, "otr-menuverf"); -+#if GAIM_MAJOR_VERSION < 2 - buttonstyle = gaim_prefs_get_int("/gaim/gtk/conversations/button_type"); -+#endif - - /* Set the button's icon, label and tooltip. */ - otr_icon(icon, level); -@@ -948,6 +963,7 @@ static void dialog_update_label_conv(Gai - - /* Set the appropriate visibility */ - gtk_widget_show_all(button); -+#if GAIM_MAJOR_VERSION < 2 - if (buttonstyle == GAIM_BUTTON_IMAGE) { - /* Hide the text */ - gtk_widget_hide(icontext); -@@ -958,6 +974,7 @@ static void dialog_update_label_conv(Gai - gtk_widget_hide(icontext); - gtk_widget_hide(icon); - } -+#endif - } - - static void dialog_update_label(ConnContext *context) -@@ -968,7 +985,11 @@ static void dialog_update_label(ConnCont - - account = gaim_accounts_find(context->accountname, context->protocol); - if (!account) return; -+#if GAIM_MAJOR_VERSION < 2 - conv = gaim_find_conversation_with_account(context->username, account); -+#else -+ conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, context->username, account); -+#endif - if (!conv) return; - dialog_update_label_conv(conv, level); - } -@@ -1252,7 +1273,11 @@ static void otrg_gtk_dialog_finished(con - account = gaim_accounts_find(accountname, protocol); - if (!account) return; - -+#if GAIM_MAJOR_VERSION < 2 - conv = gaim_find_conversation_with_account(username, account); -+#else -+ conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, username, account); -+#endif - if (!conv) return; - - buf = g_strdup_printf("%s has ended his private conversation with you; " -@@ -1406,9 +1431,13 @@ static void otrg_gtk_dialog_new_conv(Gai - GtkWidget *whatsthis; - - /* Do nothing if this isn't an IM conversation */ -+#if GAIM_MAJOR_VERSION < 2 - if (gaim_conversation_get_type(conv) != GAIM_CONV_IM) return; -- - bbox = gtkconv->bbox; -+#else -+ if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM) return; -+ bbox = gtkconv->lower_hbox; -+#endif - - context = otrg_plugin_conv_to_context(conv); - -@@ -1515,7 +1544,11 @@ static void otrg_gtk_dialog_remove_conv( - GtkWidget *button; - - /* Do nothing if this isn't an IM conversation */ -+#if GAIM_MAJOR_VERSION < 2 - if (gaim_conversation_get_type(conv) != GAIM_CONV_IM) return; -+#else -+ if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM) return; -+#endif - - button = gaim_conversation_get_data(conv, "otr-button"); - if (button) gtk_object_destroy(GTK_OBJECT(button)); -@@ -1531,7 +1564,11 @@ static void dialog_resensitize(GaimConve - OtrlPolicy policy; - - /* Do nothing if this isn't an IM conversation */ -+#if GAIM_MAJOR_VERSION < 2 - if (gaim_conversation_get_type(conv) != GAIM_CONV_IM) return; -+#else -+ if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM) return; -+#endif - - account = gaim_conversation_get_account(conv); - name = gaim_conversation_get_name(conv); diff --git a/security/gaim-otr/patches/patch-otr-plugin_c b/security/gaim-otr/patches/patch-otr-plugin_c deleted file mode 100644 index 14244be14cb..00000000000 --- a/security/gaim-otr/patches/patch-otr-plugin_c +++ /dev/null @@ -1,239 +0,0 @@ -$OpenBSD: patch-otr-plugin_c,v 1.1 2006/10/31 20:15:30 alek Exp $ ---- otr-plugin.c.orig Thu Oct 27 18:01:59 2005 -+++ otr-plugin.c Sat Oct 28 23:01:28 2006 -@@ -32,11 +32,11 @@ - - /* gaim headers */ - #include "gaim.h" --#include "core.h" - #include "notify.h" - #include "version.h" - #include "util.h" - #include "debug.h" -+#include "core.h" - - #ifdef USING_GTK - /* gaim GTK headers */ -@@ -60,6 +60,20 @@ - #include "gtk-dialog.h" - #endif - -+/* If we're using glib on Windows, we need to use g_fopen to open files. -+ * On other platforms, it's also safe to use it. If we're not using -+ * glib, just use fopen. */ -+#ifdef USING_GTK -+/* If we're cross-compiling, this might be wrong, so fix it. */ -+#ifdef WIN32 -+#undef G_OS_UNIX -+#define G_OS_WIN32 -+#endif -+#include -+#else -+#define g_fopen fopen -+#endif -+ - GaimPlugin *otrg_plugin_handle; - - /* We'll only use the one OtrlUserState. */ -@@ -119,19 +133,26 @@ void otrg_plugin_create_privkey(const ch - const char *protocol) - { - OtrgDialogWaitHandle waithandle; -+ FILE *privf; - - gchar *privkeyfile = g_build_filename(gaim_user_dir(), PRIVKEYFNAME, NULL); - if (!privkeyfile) { - fprintf(stderr, "Out of memory building filenames!\n"); - return; - } -+ privf = g_fopen(privkeyfile, "w+b"); -+ g_free(privkeyfile); -+ if (!privf) { -+ fprintf(stderr, "Could not write private key file\n"); -+ return; -+ } - - waithandle = otrg_dialog_private_key_wait_start(accountname, protocol); - - /* Generate the key */ -- otrl_privkey_generate(otrg_plugin_userstate, privkeyfile, -+ otrl_privkey_generate_FILEp(otrg_plugin_userstate, privf, - accountname, protocol); -- g_free(privkeyfile); -+ fclose(privf); - otrg_ui_update_fingerprint(); - - /* Mark the dialog as done. */ -@@ -156,7 +177,11 @@ static int is_logged_in_cb(void *opdata, - buddy = gaim_find_buddy(account, recipient); - if (!buddy) return -1; - -+#if GAIM_MAJOR_VERSION < 2 - return (buddy->present == GAIM_BUDDY_ONLINE); -+#else -+ return (GAIM_BUDDY_IS_ONLINE(buddy)); -+#endif - } - - static void inject_message_cb(void *opdata, const char *accountname, -@@ -395,6 +420,8 @@ static void process_connection_change(Ga - otrg_dialog_resensitize_all(); - } - -+#if GAIM_MAJOR_VERSION < 2 -+/* gaim-2.0.0 no longer has the row of buttons in question */ - static void process_button_type_change(const char *name, GaimPrefType type, - gpointer value, gpointer data) - { -@@ -404,6 +431,7 @@ static void process_button_type_change(c - * buttons as well. */ - otrg_dialog_resensitize_all(); - } -+#endif - - static void otr_options_cb(GaimBlistNode *node, gpointer user_data) - { -@@ -416,7 +444,11 @@ static void otr_options_cb(GaimBlistNode - - static void supply_extended_menu(GaimBlistNode *node, GList **menu) - { -+#if GAIM_MAJOR_VERSION < 2 - GaimBlistNodeAction *act; -+#else -+ GaimMenuAction *act; -+#endif - GaimBuddy *buddy; - GaimAccount *acct; - const char *proto; -@@ -430,7 +462,12 @@ static void supply_extended_menu(GaimBli - proto = gaim_account_get_protocol_id(acct); - if (!otrg_plugin_proto_supports_otr(proto)) return; - -+#if GAIM_MAJOR_VERSION < 2 - act = gaim_blist_node_action_new("OTR Settings", otr_options_cb, NULL); -+#else -+ act = gaim_menu_action_new("OTR Settings", (GaimCallback)otr_options_cb, -+ NULL, NULL); -+#endif - *menu = g_list_append(*menu, act); - } - -@@ -445,9 +482,13 @@ void otrg_plugin_disconnect(ConnContext - /* Write the fingerprints to disk. */ - void otrg_plugin_write_fingerprints(void) - { -+ FILE *storef; - gchar *storefile = g_build_filename(gaim_user_dir(), STOREFNAME, NULL); -- otrl_privkey_write_fingerprints(otrg_plugin_userstate, storefile); -+ storef = g_fopen(storefile, "wb"); - g_free(storefile); -+ if (!storef) return; -+ otrl_privkey_write_fingerprints_FILEp(otrg_plugin_userstate, storef); -+ fclose(storef); - } - - /* Find the ConnContext appropriate to a given GaimConversation. */ -@@ -482,9 +523,17 @@ GaimConversation *otrg_plugin_context_to - account = gaim_accounts_find(context->accountname, context->protocol); - if (account == NULL) return NULL; - -+#if GAIM_MAJOR_VERSION < 2 - conv = gaim_find_conversation_with_account(context->username, account); -+#else -+ conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, context->username, account); -+#endif - if (conv == NULL && force_create) { -+#if GAIM_MAJOR_VERSION < 2 - conv = gaim_conversation_new(GAIM_CONV_IM, account, context->username); -+#else -+ conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, context->username); -+#endif - } - - return conv; -@@ -523,7 +572,10 @@ static void process_quitting(void) - } - } - -+#if GAIM_MAJOR_VERSION < 2 -+/* gaim-2.0.0 no longer has the row of buttons in question */ - static guint button_type_cbid; -+#endif - - static gboolean otr_plugin_load(GaimPlugin *handle) - { -@@ -533,6 +585,8 @@ static gboolean otr_plugin_load(GaimPlug - void *conn_handle = gaim_connections_get_handle(); - void *blist_handle = gaim_blist_get_handle(); - void *core_handle = gaim_get_core(); -+ FILE *privf; -+ FILE *storef; - - if (!privkeyfile || !storefile) { - g_free(privkeyfile); -@@ -540,16 +594,21 @@ static gboolean otr_plugin_load(GaimPlug - return 0; - } - -+ privf = g_fopen(privkeyfile, "rb"); -+ storef = g_fopen(storefile, "rb"); -+ g_free(privkeyfile); -+ g_free(storefile); -+ - otrg_plugin_handle = handle; - - /* Make our OtrlUserState; we'll only use the one. */ - otrg_plugin_userstate = otrl_userstate_create(); - -- otrl_privkey_read(otrg_plugin_userstate, privkeyfile); -- g_free(privkeyfile); -- otrl_privkey_read_fingerprints(otrg_plugin_userstate, storefile, -+ otrl_privkey_read_FILEp(otrg_plugin_userstate, privf); -+ otrl_privkey_read_fingerprints_FILEp(otrg_plugin_userstate, storef, - NULL, NULL); -- g_free(storefile); -+ if (privf) fclose(privf); -+ if (storef) fclose(storef); - - otrg_ui_update_fingerprint(); - -@@ -567,9 +626,11 @@ static gboolean otr_plugin_load(GaimPlug - GAIM_CALLBACK(process_connection_change), NULL); - gaim_signal_connect(blist_handle, "blist-node-extended-menu", - otrg_plugin_handle, GAIM_CALLBACK(supply_extended_menu), NULL); -+#if GAIM_MAJOR_VERSION < 2 - button_type_cbid = gaim_prefs_connect_callback( - "/gaim/gtk/conversations/button_type", - process_button_type_change, NULL); -+#endif - - gaim_conversation_foreach(otrg_dialog_new_conv); - -@@ -601,7 +662,9 @@ static gboolean otr_plugin_unload(GaimPl - GAIM_CALLBACK(process_connection_change)); - gaim_signal_disconnect(blist_handle, "blist-node-extended-menu", - otrg_plugin_handle, GAIM_CALLBACK(supply_extended_menu)); -+#if GAIM_MAJOR_VERSION < 2 - gaim_prefs_disconnect_callback(button_type_cbid); -+#endif - - gaim_conversation_foreach(otrg_dialog_remove_conv); - -@@ -640,10 +703,16 @@ static GaimPluginInfo info = - { - GAIM_PLUGIN_MAGIC, - -+#if GAIM_MAJOR_VERSION < 2 - /* We stick with the functions in the gaim 1.0.x API for - * compatibility. */ -- 1, /* major version */ -+ 1, /* major version */ - 0, /* minor version */ -+#else -+ /* Use the 2.0.x API */ -+ 2, /* major version */ -+ 0, /* minor version */ -+#endif - - GAIM_PLUGIN_STANDARD, /* type */ - PLUGIN_TYPE, /* ui_requirement */ diff --git a/security/gaim-otr/pkg/DESCR b/security/gaim-otr/pkg/DESCR deleted file mode 100644 index 4ac52895011..00000000000 --- a/security/gaim-otr/pkg/DESCR +++ /dev/null @@ -1,16 +0,0 @@ -Off-the-Record (OTR) Messaging allows you to have private -conversations over instant messaging by providing: - -* Encryption - No one else can read your instant messages. -* Authentication - You are assured the correspondent is who you think it is. -* Deniability - The messages you send do not have digital signatures that - are checkable by a third party. Anyone can forge messages - after a conversation to make them look like they came from - you. However, during a conversation, your correspondent is - assured the messages he sees are authentic and unmodified. -* Perfect forward secrecy - If you lose control of your private keys, no previous - conversation is compromised. diff --git a/security/gaim-otr/pkg/PLIST b/security/gaim-otr/pkg/PLIST deleted file mode 100644 index 9a645eeb96e..00000000000 --- a/security/gaim-otr/pkg/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.2 2005/06/13 21:01:59 fgsch Exp $ -@comment lib/gaim/gaim-otr.a -@comment lib/gaim/gaim-otr.la -lib/gaim/gaim-otr.so diff --git a/x11/gaim-guifications/Makefile b/x11/gaim-guifications/Makefile deleted file mode 100644 index 4e47b8b0627..00000000000 --- a/x11/gaim-guifications/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# $OpenBSD: Makefile,v 1.3 2007/02/11 00:56:58 steven Exp $ - -COMMENT= "MSN style 'toaster' popups plugin for Gaim" - -DISTNAME= gaim-guifications-2.13beta3 -PKGNAME= ${DISTNAME}p0 -CATEGORIES= x11 - -HOMEPAGE= http://guifications.sourceforge.net/Guifications/ - -MAINTAINER= Thomas Wood - -# GPL -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -WANTLIB= glib-2.0 ICE SM X11 Xext Xrender glitz atk-1.0 fontconfig \ - freetype cairo gmodule-2.0 gobject-2.0 m pango-1.0 \ - png z pangoft2-1.0 gdk-x11-2.0 pangocairo-1.0 \ - gtk-x11-2.0 gdk_pixbuf-2.0 - -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=guifications/} - -MODULES= devel/gettext -BUILD_DEPENDS= :gaim-*:net/gaim -RUN_DEPENDS= :gaim-*:net/gaim - -CONFIGURE_STYLE=gnu - -USE_X11= Yes -USE_LIBTOOL= Yes - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -.include diff --git a/x11/gaim-guifications/distinfo b/x11/gaim-guifications/distinfo deleted file mode 100644 index f8d0528d5db..00000000000 --- a/x11/gaim-guifications/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -MD5 (gaim-guifications-2.13beta3.tar.gz) = PGdKL7FyfGNuGE6Yw7LdGQ== -RMD160 (gaim-guifications-2.13beta3.tar.gz) = IkVXZQqgGfxJij2QvsSFKSPQfxM= -SHA1 (gaim-guifications-2.13beta3.tar.gz) = OxtnPK92CxjqUHMEFJpg5V+1k9c= -SHA256 (gaim-guifications-2.13beta3.tar.gz) = oq2b/lI8HT2YApeQplS5q5ZcNMVxApsCwdNlJxo5TwE= -SIZE (gaim-guifications-2.13beta3.tar.gz) = 807478 diff --git a/x11/gaim-guifications/patches/patch-configure b/x11/gaim-guifications/patches/patch-configure deleted file mode 100644 index bb350214df4..00000000000 --- a/x11/gaim-guifications/patches/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2006/11/18 16:38:17 alek Exp $ ---- configure.orig Sat Nov 18 04:36:54 2006 -+++ configure Sat Nov 18 04:37:01 2006 -@@ -25337,7 +25337,7 @@ fi - - - if test "x$GCC" = "xyes"; then -- CFLAGS="$CFLAGS -Wall -g3" -+ CFLAGS="$CFLAGS -Wall" - fi - - diff --git a/x11/gaim-guifications/patches/patch-src_gf_action_c b/x11/gaim-guifications/patches/patch-src_gf_action_c deleted file mode 100644 index a241146cb51..00000000000 --- a/x11/gaim-guifications/patches/patch-src_gf_action_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_gf_action_c,v 1.1.1.1 2006/11/18 16:38:17 alek Exp $ ---- src/gf_action.c.orig Fri Nov 17 01:45:45 2006 -+++ src/gf_action.c Fri Nov 17 01:45:47 2006 -@@ -26,7 +26,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/x11/gaim-guifications/pkg/DESCR b/x11/gaim-guifications/pkg/DESCR deleted file mode 100644 index f45d5a2e5a2..00000000000 --- a/x11/gaim-guifications/pkg/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -Guifications is a Gaim plugin that displays msn style "toaster" popups -in a user defined corner of the screen. It's highly configurable, easy -to use, and has theme support. It really is the end all, be all, -toaster popup plugin for Gaim! \ No newline at end of file diff --git a/x11/gaim-guifications/pkg/MESSAGE b/x11/gaim-guifications/pkg/MESSAGE deleted file mode 100644 index f24a8261660..00000000000 --- a/x11/gaim-guifications/pkg/MESSAGE +++ /dev/null @@ -1,2 +0,0 @@ -You should now enable Guifications via the plugin dialogue in Gaim. -If it doesn't appear there, then restart Gaim and try again. diff --git a/x11/gaim-guifications/pkg/PLIST b/x11/gaim-guifications/pkg/PLIST deleted file mode 100644 index 1a9b4705aaa..00000000000 --- a/x11/gaim-guifications/pkg/PLIST +++ /dev/null @@ -1,73 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/11/18 16:38:17 alek Exp $ -@comment lib/gaim/guifications.a -@comment lib/gaim/guifications.la -lib/gaim/guifications.so -share/locale/bn/ -share/locale/bn/LC_MESSAGES/ -share/locale/bn/LC_MESSAGES/gaim-guifications.mo -share/locale/cs/LC_MESSAGES/gaim-guifications.mo -share/locale/de/LC_MESSAGES/gaim-guifications.mo -share/locale/en_AU/LC_MESSAGES/gaim-guifications.mo -share/locale/en_GB/ -share/locale/en_GB/LC_MESSAGES/ -share/locale/en_GB/LC_MESSAGES/gaim-guifications.mo -share/locale/es/LC_MESSAGES/gaim-guifications.mo -share/locale/fr/LC_MESSAGES/gaim-guifications.mo -share/locale/gl/LC_MESSAGES/gaim-guifications.mo -share/locale/he/LC_MESSAGES/gaim-guifications.mo -share/locale/hu/LC_MESSAGES/gaim-guifications.mo -share/locale/it/LC_MESSAGES/gaim-guifications.mo -share/locale/ja/LC_MESSAGES/gaim-guifications.mo -share/locale/mk/ -share/locale/mk/LC_MESSAGES/ -share/locale/mk/LC_MESSAGES/gaim-guifications.mo -share/locale/nl/LC_MESSAGES/gaim-guifications.mo -share/locale/no/LC_MESSAGES/gaim-guifications.mo -share/locale/pt/LC_MESSAGES/gaim-guifications.mo -share/locale/pt_BR/LC_MESSAGES/gaim-guifications.mo -share/locale/ru/LC_MESSAGES/gaim-guifications.mo -share/locale/sk/LC_MESSAGES/gaim-guifications.mo -share/locale/sr/LC_MESSAGES/gaim-guifications.mo -share/locale/sr@Latn/ -share/locale/sr@Latn/LC_MESSAGES/ -share/locale/sr@Latn/LC_MESSAGES/gaim-guifications.mo -share/locale/sv/LC_MESSAGES/gaim-guifications.mo -share/locale/uk/LC_MESSAGES/gaim-guifications.mo -share/locale/zh_CN/LC_MESSAGES/gaim-guifications.mo -share/locale/zh_TW/LC_MESSAGES/gaim-guifications.mo -share/pixmaps/gaim/guifications/ -share/pixmaps/gaim/guifications/conf/ -share/pixmaps/gaim/guifications/conf/item_icon_size_big.png -share/pixmaps/gaim/guifications/conf/item_icon_size_huge.png -share/pixmaps/gaim/guifications/conf/item_icon_size_large.png -share/pixmaps/gaim/guifications/conf/item_icon_size_little.png -share/pixmaps/gaim/guifications/conf/item_icon_size_normal.png -share/pixmaps/gaim/guifications/conf/item_icon_size_small.png -share/pixmaps/gaim/guifications/conf/item_icon_size_tiny.png -share/pixmaps/gaim/guifications/conf/item_position_center.png -share/pixmaps/gaim/guifications/conf/item_position_east.png -share/pixmaps/gaim/guifications/conf/item_position_north.png -share/pixmaps/gaim/guifications/conf/item_position_north_east.png -share/pixmaps/gaim/guifications/conf/item_position_north_west.png -share/pixmaps/gaim/guifications/conf/item_position_south.png -share/pixmaps/gaim/guifications/conf/item_position_south_east.png -share/pixmaps/gaim/guifications/conf/item_position_south_west.png -share/pixmaps/gaim/guifications/conf/item_position_west.png -share/pixmaps/gaim/guifications/conf/item_text_clipping_ellipsis_end.png -share/pixmaps/gaim/guifications/conf/item_text_clipping_ellipsis_middle.png -share/pixmaps/gaim/guifications/conf/item_text_clipping_ellipsis_start.png -share/pixmaps/gaim/guifications/conf/item_text_clipping_truncate.png -share/pixmaps/gaim/guifications/conf/window_position_north_east.png -share/pixmaps/gaim/guifications/conf/window_position_north_west.png -share/pixmaps/gaim/guifications/conf/window_position_south_east.png -share/pixmaps/gaim/guifications/conf/window_position_south_west.png -share/pixmaps/gaim/guifications/themes/ -share/pixmaps/gaim/guifications/themes/Penguins/ -share/pixmaps/gaim/guifications/themes/Penguins/penguin.png -share/pixmaps/gaim/guifications/themes/Penguins/theme.xml -share/pixmaps/gaim/guifications/themes/default/ -share/pixmaps/gaim/guifications/themes/default/background.png -share/pixmaps/gaim/guifications/themes/default/theme.xml -share/pixmaps/gaim/guifications/themes/mini/ -share/pixmaps/gaim/guifications/themes/mini/background.png -share/pixmaps/gaim/guifications/themes/mini/theme.xml