cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Pidgin 2.5.0.

Browse Source 
"no worse than before" ckuethe@
This commit is contained in:
brad 2008-08-21 05:59:01 +00:00
parent 0dfc488e5e
commit 8bd6e8e1ac
19 changed files with 165 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
net/pidgin/Makefile
View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.25 2008/07/11 14:20:55 brad Exp $
# $OpenBSD: Makefile,v 1.26 2008/08/21 05:59:01 brad Exp $
SHARED_ONLY= Yes
COMMENT= multi-protocol instant messaging client
DISTNAME= pidgin-2.4.3
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += jabber 0.0 # .0.0
SHARED_LIBS += oscar 0.0 # .0.0
SHARED_LIBS += purple 3.2 # .4.2
SHARED_LIBS += purple-client 3.2 # .4.2
SHARED_LIBS += gnt 3.1 # .0.0
DISTNAME= pidgin-2.5.0
SHARED_LIBS += jabber 0.0
SHARED_LIBS += oscar 0.0
SHARED_LIBS += purple 4.0
SHARED_LIBS += purple-client 4.0
SHARED_LIBS += gnt 4.0
CATEGORIES= net
HOMEPAGE= http://pidgin.im/
@ -46,6 +45,8 @@ LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
xml2::textproc/libxml \
dbus-glib-1::x11/dbus-glib
SUBST_VARS= MODPY_BIN TRUEPREFIX
USE_X11= Yes
USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
@ -65,13 +66,12 @@ CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/pidgin
--disable-cap \
--disable-schemas-install \
--with-python=${MODPY_BIN}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_FLAGS+= CFLAGS="${CFLAGS}"
FLAVORS= audio debug gtkspell msnp14
FLAVORS= audio debug gtkspell
FLAVOR?=
.if ${FLAVOR:L:Maudio}
@ -95,26 +95,21 @@ WANTLIB+= aspell
CONFIGURE_ARGS+=--disable-gtkspell
.endif
.if ${FLAVOR:L:Mmsnp14}
CONFIGURE_ARGS+=--enable-msnp14
.endif
PYTHON_SCRIPTS= purple-remote purple-url-handler
post-extract:
cp -f ${FILESDIR}/ssl-openssl.c ${WRKSRC}/libpurple/plugins/ssl
@cp ${FILESDIR}/ssl-openssl.c ${WRKSRC}/libpurple/plugins/ssl
post-build:
cp ${FILESDIR}/purple.service ${WRKSRC}
${SUBST_CMD} ${WRKSRC}/libpurple/purple-remote \
${WRKSRC}/libpurple/purple-url-handler \
${WRKSRC}/purple.service
post-install:
perl -pi -e 's,/bin/bash,/bin/sh,g' ${PREFIX}/bin/purple-send*
.for f in ${PYTHON_SCRIPTS}
perl -pi -e 's#%python%#${MODPY_BIN}#g' ${PREFIX}/bin/${f}
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/dbus-1/services/
sed -e "s,!!PREFIX!!,${TRUEPREFIX}," \
< ${FILESDIR}/purple.service \
> ${PREFIX}/share/dbus-1/services/purple.service
${INSTALL_DATA_DIR} ${PREFIX}/share/dbus-1/services
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pidgin
${INSTALL_DATA} ${WRKSRC}/purple.service \
${PREFIX}/share/dbus-1/services
mv ${PREFIX}/lib/purple-2/libjabber.* ${PREFIX}/lib
mv ${PREFIX}/lib/purple-2/liboscar.* ${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pidgin/
.include <bsd.port.mk>

10
net/pidgin/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pidgin-2.4.3.tar.gz) = 0OC9IY+8Z9+LLsovIfzUJw==
RMD160 (pidgin-2.4.3.tar.gz) = yt7DH/vpwy2gbLCSGhFBCLRDFeQ=
SHA1 (pidgin-2.4.3.tar.gz) = pOSEqgdI9M4N7Xka1lrZaUDveyc=
SHA256 (pidgin-2.4.3.tar.gz) = dLhcQECL2t5nJ++ygXp8ta++seMR16dP50fdPJsD/28=
SIZE (pidgin-2.4.3.tar.gz) = 13123610
MD5 (pidgin-2.5.0.tar.gz) = sZwP8YWb2zUzCljALcs9/w==
RMD160 (pidgin-2.5.0.tar.gz) = 9266MQGScU0hmX7kWu/rmeVgJaY=
SHA1 (pidgin-2.5.0.tar.gz) = l6QP5FkEOCcxk0zCqr2BOshUE9o=
SHA256 (pidgin-2.5.0.tar.gz) = ikZJOncIIwJR+nw1CTyWjvGgL3Br4TvBsJaXa90kfKI=
SIZE (pidgin-2.5.0.tar.gz) = 12934716

2
net/pidgin/files/purple.service
View File

@ -1,3 +1,3 @@
[D-BUS Service]
Name=im.pidgin.purple.PurpleService
Exec=!!PREFIX!!/bin/pidgin
Exec=${TRUEPREFIX}/bin/pidgin

8
net/pidgin/patches/patch-config_h_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_h_in,v 1.8 2008/04/04 22:39:09 steven Exp $
--- config.h.in.orig Mon Mar 31 13:21:59 2008
+++ config.h.in Mon Mar 31 21:48:49 2008
@@ -172,6 +172,12 @@
$OpenBSD: patch-config_h_in,v 1.9 2008/08/21 05:59:01 brad Exp $
--- config.h.in.orig Mon Aug 18 21:55:29 2008
+++ config.h.in Wed Aug 20 00:48:34 2008
@@ -190,6 +190,12 @@
/* Define to 1 if you have the <nss.h> header file. */
#undef HAVE_NSS_H

24
net/pidgin/patches/patch-configure_ac
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.11 2008/06/05 10:24:15 ajacoutot Exp $
--- configure.ac.orig Fri May 16 14:36:44 2008
+++ configure.ac Sat May 31 21:49:59 2008
@@ -647,6 +647,7 @@ if test "x$enable_consoleui" = "xyes"; then
$OpenBSD: patch-configure_ac,v 1.12 2008/08/21 05:59:01 brad Exp $
--- configure.ac.orig Mon Aug 18 21:53:21 2008
+++ configure.ac Wed Aug 20 01:16:43 2008
@@ -672,6 +672,7 @@ if test "x$enable_consoleui" = "xyes"; then
# ncursesw was not found. Look for plain old ncurses
enable_consoleui=yes
AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no])
@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.11 2008/06/05 10:24:15 ajacoutot Exp $
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
@@ -838,7 +839,7 @@ else
@@ -867,7 +868,7 @@ else
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.11 2008/06/05 10:24:15 ajacoutot Exp $
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
@@ -1556,6 +1557,11 @@ dnl ##################################################
@@ -1600,6 +1601,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
dnl These two are inverses of each other <-- stolen from evolution!
@ -30,7 +30,7 @@ $OpenBSD: patch-configure_ac,v 1.11 2008/06/05 10:24:15 ajacoutot Exp $
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support [default=yes]],
[enable_gnutls="$enableval"],
@@ -1566,11 +1572,99 @@ AC_ARG_ENABLE(nss,
@@ -1610,11 +1616,99 @@ AC_ARG_ENABLE(nss,
[enable_nss="$enableval"],
[enable_nss="yes"])
@ -132,7 +132,7 @@ $OpenBSD: patch-configure_ac,v 1.11 2008/06/05 10:24:15 ajacoutot Exp $
if test "x$enable_gnutls" != "xno"; then
enable_gnutls="no"
prefix=`eval echo $prefix`
@@ -1934,17 +2028,31 @@ fi
@@ -1978,17 +2072,31 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")
@ -149,10 +149,10 @@ $OpenBSD: patch-configure_ac,v 1.11 2008/06/05 10:24:15 ajacoutot Exp $
msg_ssl=$msg_nss
elif test "x$msg_gnutls" != "x"; then
msg_ssl=$msg_gnutls
-elif test "x$looked_for_gnutls" = "xyes" -a "x$looked_for_nss" = "xyes"; then
-elif test "x$looked_for_gnutls" = "xyes" -a "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+elif test "x$msg_openssl" != "x"; then
+ msg_ssl=$msg_openssl
+elif test "x$looked_for_openssl" = "xyes" -a "x$looked_for_gnutls" = "xyes" -a "x$looked_for_nss" = "xyes"; then
+elif test "x$looked_for_openssl" = "xyes" -a "x$looked_for_gnutls" = "xyes" -a "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
AC_MSG_ERROR([
-Neither GnuTLS or NSS SSL development headers found.
-Use --disable-nss --disable-gnutls if you do not need SSL support.
@ -161,11 +161,11 @@ $OpenBSD: patch-configure_ac,v 1.11 2008/06/05 10:24:15 ajacoutot Exp $
+Use --disable-openssl --disable-nss --disable-gnutls if you do not need SSL support.
+MSN, Novell Groupwise and Google Talk will not work without OpenSSL, GnuTLS or NSS.
+])
+elif test "x$looked_for_openssl" = "xyes"; then
+elif test "x$looked_for_openssl" = "xyes" -a "$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
+OpenSSL SSL development headers not found.
+Use --disable-openssl if you do not need SSL support.
+MSN, Novell Groupwise and Google Talk will not work without SSL support.
])
elif test "x$looked_for_gnutls" = "xyes"; then
elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
AC_MSG_ERROR([

8
net/pidgin/patches/patch-finch_libgnt_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.9 2008/07/04 07:35:40 bernd Exp $
--- finch/libgnt/Makefile.in.orig Wed Jul 2 02:46:54 2008
+++ finch/libgnt/Makefile.in Wed Jul 2 10:00:26 2008
@@ -353,7 +353,7 @@ target_vendor = @target_vendor@
$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.10 2008/08/21 05:59:01 brad Exp $
--- finch/libgnt/Makefile.in.orig Mon Aug 18 21:55:32 2008
+++ finch/libgnt/Makefile.in Wed Aug 20 00:48:34 2008
@@ -355,7 +355,7 @@ target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = genmarshal

8
net/pidgin/patches/patch-finch_plugins_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-finch_plugins_Makefile_in,v 1.9 2008/07/04 07:35:40 bernd Exp $
--- finch/plugins/Makefile.in.orig Wed Jul 2 02:46:54 2008
+++ finch/plugins/Makefile.in Wed Jul 2 10:00:26 2008
$OpenBSD: patch-finch_plugins_Makefile_in,v 1.10 2008/08/21 05:59:01 brad Exp $
--- finch/plugins/Makefile.in.orig Mon Aug 18 21:55:32 2008
+++ finch/plugins/Makefile.in Wed Aug 20 00:48:35 2008
@@ -81,7 +81,8 @@ gnthistory_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(gnthistory_la_LDFLAGS) $(LDFLAGS) -o $@
@ -11,7 +11,7 @@ $OpenBSD: patch-finch_plugins_Makefile_in,v 1.9 2008/07/04 07:35:40 bernd Exp $
am__gntlastlog_la_SOURCES_DIST = lastlog.c
@PLUGINS_TRUE@am_gntlastlog_la_OBJECTS = lastlog.lo
gntlastlog_la_OBJECTS = $(am_gntlastlog_la_OBJECTS)
@@ -395,7 +396,7 @@ grouping_la_LDFLAGS = -module -avoid-version
@@ -397,7 +398,7 @@ grouping_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@gntclipboard_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
@PLUGINS_TRUE@gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
@PLUGINS_TRUE@gnthistory_la_LIBADD = $(GLIB_LIBS)

8
net/pidgin/patches/patch-libpurple_nat-pmp_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_nat-pmp_c,v 1.3 2007/10/01 22:03:29 merdely Exp $
--- libpurple/nat-pmp.c.orig Sat Sep 29 12:39:04 2007
+++ libpurple/nat-pmp.c Sat Sep 29 20:18:28 2007
@@ -43,6 +43,8 @@
$OpenBSD: patch-libpurple_nat-pmp_c,v 1.4 2008/08/21 05:59:01 brad Exp $
--- libpurple/nat-pmp.c.orig Mon Aug 18 21:53:31 2008
+++ libpurple/nat-pmp.c Wed Aug 20 00:48:35 2008
@@ -47,6 +47,8 @@
#include <sys/socket.h>
#endif

16
net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.9 2008/07/04 07:35:40 bernd Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Wed Jul 2 02:46:56 2008
+++ libpurple/plugins/ssl/Makefile.in Wed Jul 2 10:00:26 2008
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.10 2008/08/21 05:59:01 brad Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Mon Aug 18 21:55:34 2008
+++ libpurple/plugins/ssl/Makefile.in Wed Aug 20 00:48:35 2008
@@ -53,6 +53,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
pluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(plugin_LTLIBRARIES)
@ -23,7 +23,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.9 2008/07/04 07:35:40 bern
$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
@@ -160,6 +166,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
@@ -161,6 +167,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
GNT_MICRO_VERSION = @GNT_MICRO_VERSION@
GNT_MINOR_VERSION = @GNT_MINOR_VERSION@
GNT_VERSION = @GNT_VERSION@
@ -32,7 +32,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.9 2008/07/04 07:35:40 bern
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GREP = @GREP@
@@ -355,17 +363,21 @@ EXTRA_DIST = \
@@ -357,17 +365,21 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
ssl_la_LDFLAGS = -module -avoid-version
@ -54,7 +54,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.9 2008/07/04 07:35:40 bern
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
@@ -377,6 +389,7 @@ AM_CPPFLAGS = \
@@ -379,6 +391,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS)
@ -62,7 +62,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.9 2008/07/04 07:35:40 bern
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
all: all-am
@@ -439,6 +452,8 @@ clean-pluginLTLIBRARIES:
@@ -441,6 +454,8 @@ clean-pluginLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@ -71,7 +71,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.9 2008/07/04 07:35:40 bern
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES)
$(ssl_gnutls_la_LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES)
@@ -453,6 +468,7 @@ distclean-compile:
@@ -455,6 +470,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@

8
net/pidgin/patches/patch-libpurple_protocols_gg_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.9 2008/07/04 07:35:40 bernd Exp $
--- libpurple/protocols/gg/Makefile.in.orig Wed Jul 2 02:46:57 2008
+++ libpurple/protocols/gg/Makefile.in Wed Jul 2 10:00:26 2008
@@ -419,7 +419,7 @@ libgg_la_LDFLAGS = -module -avoid-version
$OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.10 2008/08/21 05:59:01 brad Exp $
--- libpurple/protocols/gg/Makefile.in.orig Mon Aug 18 21:55:36 2008
+++ libpurple/protocols/gg/Makefile.in Wed Aug 20 00:48:35 2008
@@ -421,7 +421,7 @@ libgg_la_LDFLAGS = -module -avoid-version
@STATIC_GG_TRUE@libgg_a_CFLAGS = $(AM_CFLAGS)
@STATIC_GG_TRUE@libgg_a_LIBADD = $(GADU_LIBS)
@STATIC_GG_FALSE@libgg_la_SOURCES = $(GGSOURCES)

8
net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.9 2008/07/04 07:35:40 bernd Exp $
--- libpurple/protocols/oscar/Makefile.in.orig Wed Jul 2 02:46:59 2008
+++ libpurple/protocols/oscar/Makefile.in Wed Jul 2 10:00:26 2008
@@ -468,9 +468,9 @@ libicq_la_LDFLAGS = -module -avoid-version
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.10 2008/08/21 05:59:01 brad Exp $
--- libpurple/protocols/oscar/Makefile.in.orig Mon Aug 18 21:55:39 2008
+++ libpurple/protocols/oscar/Makefile.in Wed Aug 20 00:48:35 2008
@@ -470,9 +470,9 @@ libicq_la_LDFLAGS = -module -avoid-version
@STATIC_OSCAR_FALSE@liboscar_la_SOURCES = $(OSCARSOURCES)
@STATIC_OSCAR_FALSE@liboscar_la_LIBADD = $(GLIB_LIBS)
@STATIC_OSCAR_FALSE@libaim_la_SOURCES = libaim.c

70
net/pidgin/patches/patch-libpurple_protocols_silc_silc_c
View File

@ -1,13 +1,71 @@
$OpenBSD: patch-libpurple_protocols_silc_silc_c,v 1.2 2008/06/05 10:24:15 ajacoutot Exp $
--- libpurple/protocols/silc/silc.c.orig Tue May 6 08:04:01 2008
+++ libpurple/protocols/silc/silc.c Mon May 19 00:40:56 2008
@@ -674,8 +674,7 @@ silcpurple_close(PurpleConnection *gc)
$OpenBSD: patch-libpurple_protocols_silc_silc_c,v 1.3 2008/08/21 05:59:01 brad Exp $
--- libpurple/protocols/silc/silc.c.orig Wed Aug 20 00:48:35 2008
+++ libpurple/protocols/silc/silc.c Wed Aug 20 00:56:04 2008
@@ -671,31 +671,12 @@ silcpurple_close(PurpleConnection *gc)
SilcPurpleTask task;
#endif /* __SILC_TOOLKIT_VERSION */
GHashTable *ui_info;
- const char *ui_name = NULL, *ui_website = NULL;
- char *quit_msg;
g_return_if_fail(sg != NULL);
- ui_info = purple_core_get_ui_info();
-
- if(ui_info) {
- ui_name = g_hash_table_lookup(ui_info, "name");
- ui_website = g_hash_table_lookup(ui_info, "website");
- }
-
- if(!ui_name || !ui_website) {
- ui_name = "Pidgin";
- ui_website = PURPLE_WEBSITE;
- }
- quit_msg = g_strdup_printf(_("Download %s: %s"),
- ui_name, ui_website);
-
/* Send QUIT */
silc_client_command_call(sg->client, sg->conn, NULL,
- "QUIT", "Download Pidgin: " PURPLE_WEBSITE,
- "QUIT", quit_msg,
- NULL);
- g_free(quit_msg);
-
+ "QUIT", NULL);
if (sg->conn)
silc_client_close_connection(sg->client, sg->conn);
@@ -1835,9 +1816,6 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversa
{
PurpleConnection *gc;
SilcPurple sg;
- GHashTable *ui_info;
- const char *ui_name = NULL, *ui_website = NULL;
- char *quit_msg;
gc = purple_conversation_get_gc(conv);
@@ -1849,23 +1827,8 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversa
if (sg == NULL)
return PURPLE_CMD_RET_FAILED;
- ui_info = purple_core_get_ui_info();
-
- if(ui_info) {
- ui_name = g_hash_table_lookup(ui_info, "name");
- ui_website = g_hash_table_lookup(ui_info, "website");
- }
-
- if(!ui_name || !ui_website) {
- ui_name = "Pidgin";
- ui_website = PURPLE_WEBSITE;
- }
- quit_msg = g_strdup_printf(_("Download %s: %s"),
- ui_name, ui_website);
-
silc_client_command_call(sg->client, sg->conn, NULL,
- "QUIT", (args && args[0]) ? args[0] : quit_msg, NULL);
- g_free(quit_msg);
+ "QUIT", NULL);
return PURPLE_CMD_RET_OK;
}

8
net/pidgin/patches/patch-libpurple_purple-remote
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-libpurple_purple-remote,v 1.2 2008/03/24 08:23:22 steven Exp $
--- libpurple/purple-remote.orig Fri Feb 29 13:09:28 2008
+++ libpurple/purple-remote Sat Mar 22 10:28:40 2008
$OpenBSD: patch-libpurple_purple-remote,v 1.3 2008/08/21 05:59:01 brad Exp $
--- libpurple/purple-remote.orig Mon Aug 18 21:53:50 2008
+++ libpurple/purple-remote Wed Aug 20 01:55:58 2008
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!%python%
+#!${MODPY_BIN}
import dbus
import re

8
net/pidgin/patches/patch-libpurple_purple-url-handler
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-libpurple_purple-url-handler,v 1.2 2008/03/24 08:23:22 steven Exp $
--- libpurple/purple-url-handler.orig Fri Feb 29 13:09:28 2008
+++ libpurple/purple-url-handler Sat Mar 22 10:28:40 2008
$OpenBSD: patch-libpurple_purple-url-handler,v 1.3 2008/08/21 05:59:01 brad Exp $
--- libpurple/purple-url-handler.orig Mon Aug 18 21:53:50 2008
+++ libpurple/purple-url-handler Wed Aug 20 01:56:15 2008
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!%python%
+#!${MODPY_BIN}
import dbus
import re

8
net/pidgin/patches/patch-pidgin_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_Makefile_in,v 1.5 2007/11/28 08:48:32 steven Exp $
--- pidgin/Makefile.in.orig Sat Nov 24 14:07:17 2007
+++ pidgin/Makefile.in Mon Nov 26 16:06:45 2007
@@ -107,7 +107,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
$OpenBSD: patch-pidgin_Makefile_in,v 1.6 2008/08/21 05:59:01 brad Exp $
--- pidgin/Makefile.in.orig Mon Aug 18 21:55:46 2008
+++ pidgin/Makefile.in Wed Aug 20 00:48:35 2008
@@ -108,7 +108,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

8
net/pidgin/patches/patch-pidgin_gtkdialogs_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.9 2008/06/05 10:24:15 ajacoutot Exp $
--- pidgin/gtkdialogs.c.orig Fri May 16 11:48:01 2008
+++ pidgin/gtkdialogs.c Mon May 19 00:40:56 2008
@@ -609,6 +609,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.10 2008/08/21 05:59:01 brad Exp $
--- pidgin/gtkdialogs.c.orig Mon Aug 18 21:53:52 2008
+++ pidgin/gtkdialogs.c Wed Aug 20 00:48:35 2008
@@ -611,6 +611,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif

10
net/pidgin/patches/patch-pidgin_gtkmain_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkmain_c,v 1.7 2008/06/05 10:24:15 ajacoutot Exp $
--- pidgin/gtkmain.c.orig Tue May 6 08:04:02 2008
+++ pidgin/gtkmain.c Mon May 19 00:40:56 2008
@@ -88,6 +88,7 @@ static SnDisplay *sn_display = NULL;
$OpenBSD: patch-pidgin_gtkmain_c,v 1.8 2008/08/21 05:59:01 brad Exp $
--- pidgin/gtkmain.c.orig Mon Aug 18 21:53:52 2008
+++ pidgin/gtkmain.c Wed Aug 20 00:48:35 2008
@@ -89,6 +89,7 @@ static SnDisplay *sn_display = NULL;
#endif
#ifdef HAVE_SIGNAL_H
@ -9,7 +9,7 @@ $OpenBSD: patch-pidgin_gtkmain_c,v 1.7 2008/06/05 10:24:15 ajacoutot Exp $
/*
* Lists of signals we wish to catch and those we wish to ignore.
@@ -158,6 +159,8 @@ clean_pid(void)
@@ -159,6 +160,8 @@ clean_pid(void)
do {
pid = waitpid(-1, &status, WNOHANG);
} while (pid != 0 && pid != (pid_t)-1);

1
net/pidgin/pkg/DESCR
View File

@ -21,4 +21,3 @@ Flavors:
audio - Build with gstreamer support
debug - Enable debugging
gtkspell - Build with spell checking support
msnp14 - Build with MSN protocol 14 support (experimental)

12
net/pidgin/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2008/07/11 14:20:55 brad Exp $
@comment $OpenBSD: PLIST,v 1.15 2008/08/21 05:59:01 brad Exp $
@conflict gaim-*
@bin bin/finch
@bin bin/pidgin
@ -101,6 +101,7 @@ include/libpurple/roomlist.h
include/libpurple/savedstatuses.h
include/libpurple/server.h
include/libpurple/signals.h
include/libpurple/smiley.h
include/libpurple/sound.h
include/libpurple/sslconn.h
include/libpurple/status.h
@ -150,6 +151,7 @@ include/pidgin/gtkroomlist.h
include/pidgin/gtksavedstatuses.h
include/pidgin/gtkscrollbook.h
include/pidgin/gtksession.h
include/pidgin/gtksmiley.h
include/pidgin/gtksound.h
include/pidgin/gtksourceiter.h
include/pidgin/gtksourceundomanager.h
@ -459,6 +461,7 @@ share/pixmaps/pidgin/emotes/default/bowl.png
share/pixmaps/pidgin/emotes/default/boy.png
share/pixmaps/pidgin/emotes/default/brb.png
share/pixmaps/pidgin/emotes/default/bulgy-eyes.png
share/pixmaps/pidgin/emotes/default/bunny.png
share/pixmaps/pidgin/emotes/default/bye.png
share/pixmaps/pidgin/emotes/default/cake.png
share/pixmaps/pidgin/emotes/default/call-me.png
@ -467,6 +470,7 @@ share/pixmaps/pidgin/emotes/default/can.png
share/pixmaps/pidgin/emotes/default/car.png
share/pixmaps/pidgin/emotes/default/cat.png
share/pixmaps/pidgin/emotes/default/chicken.png
share/pixmaps/pidgin/emotes/default/cigarette.png
share/pixmaps/pidgin/emotes/default/clap.png
share/pixmaps/pidgin/emotes/default/clock.png
share/pixmaps/pidgin/emotes/default/cloudy.png
@ -488,7 +492,7 @@ share/pixmaps/pidgin/emotes/default/dance.png
share/pixmaps/pidgin/emotes/default/dazed.png
share/pixmaps/pidgin/emotes/default/desire.png
share/pixmaps/pidgin/emotes/default/devil.png
share/pixmaps/pidgin/emotes/default/disapointed.png
share/pixmaps/pidgin/emotes/default/disappointed.png
share/pixmaps/pidgin/emotes/default/disdain.png
share/pixmaps/pidgin/emotes/default/doctor.png
share/pixmaps/pidgin/emotes/default/dog.png
@ -589,7 +593,6 @@ share/pixmaps/pidgin/emotes/default/shout.png
share/pixmaps/pidgin/emotes/default/shut-mouth.png
share/pixmaps/pidgin/emotes/default/sick.png
share/pixmaps/pidgin/emotes/default/sidefrown.png
share/pixmaps/pidgin/emotes/default/sigarette.png
share/pixmaps/pidgin/emotes/default/silly.png
share/pixmaps/pidgin/emotes/default/sinister.png
share/pixmaps/pidgin/emotes/default/skeleton.png
@ -773,6 +776,7 @@ share/pixmaps/pidgin/toolbar/16/insert.png
share/pixmaps/pidgin/toolbar/16/message-new.png
share/pixmaps/pidgin/toolbar/16/plugins.png
share/pixmaps/pidgin/toolbar/16/send-file.png
share/pixmaps/pidgin/toolbar/16/transfer.png
share/pixmaps/pidgin/toolbar/16/unblock.png
share/pixmaps/pidgin/toolbar/22/
share/pixmaps/pidgin/toolbar/22/select-avatar.png
@ -920,6 +924,8 @@ share/pixmaps/purple/buddy_icons/qq/qq_98.png
share/pixmaps/purple/buddy_icons/qq/qq_99.png
share/purple/
share/purple/ca-certs/
share/purple/ca-certs/CAcert_Class3.pem
share/purple/ca-certs/CAcert_Root.pem
share/purple/ca-certs/Equifax_Secure_CA.pem
share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem