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

Update to Pidgin 2.5.2.

Browse Source 
Tested by a number of users.
This commit is contained in:
brad 2008-10-23 02:55:43 +00:00
parent 0b58f2c777
commit 35218f315c
11 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/pidgin/Makefile
View File

@ -1,18 +1,17 @@
# $OpenBSD: Makefile,v 1.31 2008/10/21 21:40:39 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.32 2008/10/23 02:55:43 brad Exp $
SHARED_ONLY= Yes
COMMENT= multi-protocol instant messaging client
DISTNAME= pidgin-2.5.1
PKGNAME= ${DISTNAME}p0
DISTNAME= pidgin-2.5.2
CATEGORIES= net
SHARED_LIBS+= jabber 0.0
SHARED_LIBS+= oscar 0.0
SHARED_LIBS+= purple 4.1
SHARED_LIBS+= purple-client 4.1
SHARED_LIBS+= gnt 4.1
SHARED_LIBS+= purple 4.2
SHARED_LIBS+= purple-client 4.2
SHARED_LIBS+= gnt 4.2
HOMEPAGE= http://pidgin.im/

10
net/pidgin/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pidgin-2.5.1.tar.gz) = klfD3gqeG4VKeaKjhnJWlw==
RMD160 (pidgin-2.5.1.tar.gz) = FQOkkaErtw1s7rUYpBzmwuvmkoA=
SHA1 (pidgin-2.5.1.tar.gz) = JWcX62/vIlxUfLeK+8Nv3xEeZ8I=
SHA256 (pidgin-2.5.1.tar.gz) = xzrgB9+0466QSrLdIN9sGdmvStxdJ7armA/Z2GsW1RI=
SIZE (pidgin-2.5.1.tar.gz) = 12523934
MD5 (pidgin-2.5.2.tar.gz) = OtgxM6I4EIfL3d9Cul1uzw==
RMD160 (pidgin-2.5.2.tar.gz) = J5UAizIpRImwjwPDw2RPj8Q6d2c=
SHA1 (pidgin-2.5.2.tar.gz) = iM3jw8RdOfpsizZldKfCNDQ0iOg=
SHA256 (pidgin-2.5.2.tar.gz) = TUMn7HnQs2FjjoM46zLv/HLg4h6xkSlPqBciNITyhNY=
SIZE (pidgin-2.5.2.tar.gz) = 11642659

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.13 2008/09/13 22:04:40 brad Exp $
--- configure.ac.orig Sun Aug 31 00:36:15 2008
+++ configure.ac Sun Aug 31 18:21:24 2008
$OpenBSD: patch-configure_ac,v 1.14 2008/10/23 02:55:44 brad Exp $
--- configure.ac.orig Sat Oct 18 22:40:48 2008
+++ configure.ac Tue Oct 21 20:18:41 2008
@@ -671,6 +671,7 @@ if test "x$enable_consoleui" = "xyes"; then
# ncursesw was not found. Look for plain old ncurses
enable_consoleui=yes
@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.13 2008/09/13 22:04:40 brad Exp $
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
@@ -1599,6 +1600,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
@@ -1603,6 +1604,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.13 2008/09/13 22:04:40 brad Exp $
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support [default=yes]],
[enable_gnutls="$enableval"],
@@ -1609,11 +1615,99 @@ AC_ARG_ENABLE(nss,
@@ -1613,11 +1619,99 @@ AC_ARG_ENABLE(nss,
[enable_nss="$enableval"],
[enable_nss="yes"])
@ -132,7 +132,7 @@ $OpenBSD: patch-configure_ac,v 1.13 2008/09/13 22:04:40 brad Exp $
if test "x$enable_gnutls" != "xno"; then
enable_gnutls="no"
prefix=`eval echo $prefix`
@@ -1977,17 +2071,31 @@ fi
@@ -1981,17 +2075,31 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")

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

@ -1,9 +1,9 @@
$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.11 2008/09/13 22:04:40 brad Exp $
--- finch/libgnt/Makefile.in.orig Sun Aug 31 00:37:52 2008
+++ finch/libgnt/Makefile.in Sun Aug 31 18:21:24 2008
@@ -354,7 +354,7 @@ target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.12 2008/10/23 02:55:44 brad Exp $
--- finch/libgnt/Makefile.in.orig Sun Oct 19 10:37:54 2008
+++ finch/libgnt/Makefile.in Tue Oct 21 20:18:41 2008
@@ -460,7 +460,7 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
EXTRA_DIST = genmarshal
-SUBDIRS = . wms
+SUBDIRS = .

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

@ -1,9 +1,9 @@
$OpenBSD: patch-finch_plugins_Makefile_in,v 1.11 2008/09/13 22:04:40 brad Exp $
--- finch/plugins/Makefile.in.orig Sun Aug 31 00:37:53 2008
+++ finch/plugins/Makefile.in Sun Aug 31 18:21:24 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 $@
$OpenBSD: patch-finch_plugins_Makefile_in,v 1.12 2008/10/23 02:55:44 brad Exp $
--- finch/plugins/Makefile.in.orig Sun Oct 19 10:37:55 2008
+++ finch/plugins/Makefile.in Tue Oct 21 20:18:41 2008
@@ -76,7 +76,8 @@ am__gnthistory_la_SOURCES_DIST = gnthistory.c
@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) \
@ -11,7 +11,7 @@ $OpenBSD: patch-finch_plugins_Makefile_in,v 1.11 2008/09/13 22:04:40 brad Exp $
am__gntlastlog_la_SOURCES_DIST = lastlog.c
@PLUGINS_TRUE@am_gntlastlog_la_OBJECTS = lastlog.lo
gntlastlog_la_OBJECTS = $(am_gntlastlog_la_OBJECTS)
@@ -396,7 +397,7 @@ grouping_la_LDFLAGS = -module -avoid-version
@@ -493,7 +494,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)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.11 2008/09/13 22:04:40 brad Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Sun Aug 31 00:37:56 2008
+++ libpurple/plugins/ssl/Makefile.in Sun Aug 31 18:21:24 2008
@@ -53,6 +53,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.12 2008/10/23 02:55:44 brad Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Sun Oct 19 10:37:59 2008
+++ libpurple/plugins/ssl/Makefile.in Tue Oct 21 20:18:41 2008
@@ -57,6 +57,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
pluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(plugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
@ -14,8 +14,8 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.11 2008/09/13 22:04:40 bra
@PLUGINS_TRUE@ssl_gnutls_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@PLUGINS_TRUE@ $(am__DEPENDENCIES_1)
am__ssl_gnutls_la_SOURCES_DIST = ssl-gnutls.c
@@ -93,7 +99,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOO
$(LDFLAGS) -o $@
@@ -87,7 +93,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CF
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \
$(ssl_la_SOURCES)
-DIST_SOURCES = $(am__ssl_gnutls_la_SOURCES_DIST) \
@ -23,7 +23,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.11 2008/09/13 22:04:40 bra
$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
@@ -161,6 +167,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
@@ -206,6 +212,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.11 2008/09/13 22:04:40 bra
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GREP = @GREP@
@@ -356,17 +364,21 @@ EXTRA_DIST = \
@@ -459,17 +467,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.11 2008/09/13 22:04:40 bra
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
@@ -378,6 +390,7 @@ AM_CPPFLAGS = \
@@ -481,6 +493,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS)
@ -62,16 +62,16 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.11 2008/09/13 22:04:40 bra
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
all: all-am
@@ -440,6 +453,8 @@ clean-pluginLTLIBRARIES:
@@ -543,6 +556,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)
$(ssl_gnutls_la_LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
$(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)
@@ -454,6 +469,7 @@ distclean-compile:
@@ -557,6 +572,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.11 2008/09/13 22:04:40 brad Exp $
--- libpurple/protocols/gg/Makefile.in.orig Sun Aug 31 00:37:58 2008
+++ libpurple/protocols/gg/Makefile.in Sun Aug 31 18:21:24 2008
@@ -420,7 +420,7 @@ libgg_la_LDFLAGS = -module -avoid-version
$OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.12 2008/10/23 02:55:44 brad Exp $
--- libpurple/protocols/gg/Makefile.in.orig Sun Oct 19 10:38:01 2008
+++ libpurple/protocols/gg/Makefile.in Tue Oct 21 20:18:41 2008
@@ -529,7 +529,7 @@ libgg_la_LDFLAGS = -module -avoid-version
@STATIC_GG_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.11 2008/09/13 22:04:40 brad Exp $
--- libpurple/protocols/oscar/Makefile.in.orig Sun Aug 31 00:38:02 2008
+++ libpurple/protocols/oscar/Makefile.in Sun Aug 31 18:21:24 2008
@@ -469,9 +469,9 @@ libicq_la_LDFLAGS = -module -avoid-version
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.12 2008/10/23 02:55:44 brad Exp $
--- libpurple/protocols/oscar/Makefile.in.orig Sun Oct 19 10:38:07 2008
+++ libpurple/protocols/oscar/Makefile.in Tue Oct 21 20:18:41 2008
@@ -575,9 +575,9 @@ libicq_la_LDFLAGS = -module -avoid-version
@STATIC_OSCAR_FALSE@liboscar_la_SOURCES = $(OSCARSOURCES)
@STATIC_OSCAR_FALSE@liboscar_la_LIBADD = $(GLIB_LIBS)
@STATIC_OSCAR_FALSE@libaim_la_SOURCES = libaim.c

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

@ -1,12 +1,12 @@
$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)
$OpenBSD: patch-pidgin_Makefile_in,v 1.7 2008/10/23 02:55:44 brad Exp $
--- pidgin/Makefile.in.orig Sun Oct 19 10:38:13 2008
+++ pidgin/Makefile.in Tue Oct 21 20:19:24 2008
@@ -109,7 +109,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(pidgin_SOURCES)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.11 2008/09/13 22:04:40 brad Exp $
--- pidgin/gtkdialogs.c.orig Sun Aug 31 00:36:31 2008
+++ pidgin/gtkdialogs.c Sun Aug 31 18:21:13 2008
@@ -612,6 +612,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.12 2008/10/23 02:55:44 brad Exp $
--- pidgin/gtkdialogs.c.orig Sat Oct 18 22:40:48 2008
+++ pidgin/gtkdialogs.c Tue Oct 21 20:18:41 2008
@@ -614,6 +614,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif

3
net/pidgin/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2008/09/13 22:04:40 brad Exp $
@comment $OpenBSD: PLIST,v 1.17 2008/10/23 02:55:44 brad Exp $
@conflict gaim-*
@bin bin/finch
@bin bin/pidgin
@ -338,6 +338,7 @@ share/locale/lo/LC_MESSAGES/
share/locale/lo/LC_MESSAGES/pidgin.mo
share/locale/lt/LC_MESSAGES/pidgin.mo
share/locale/mk/LC_MESSAGES/pidgin.mo
share/locale/mn/LC_MESSAGES/pidgin.mo
share/locale/my_MM/
share/locale/my_MM/LC_MESSAGES/
share/locale/my_MM/LC_MESSAGES/pidgin.mo