Here is an update to Pidgin 2.10.10.
OK?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.121
diff -u -p -u -p -r1.121 Makefile
--- Makefile 6 Feb 2014 07:44:15 -0000 1.121
+++ Makefile 26 Oct 2014 22:03:52 -0000
@@ -6,7 +6,7 @@ COMMENT-main= multi-protocol instant mes
COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library
-VERSION= 2.10.9
+VERSION= 2.10.10
DISTNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
PKGNAME-finch= finch-${VERSION}
@@ -33,17 +33,17 @@ MAINTAINER= Brad Smith <b...@comstyle.co
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c dbus-1 dbus-glib-1 ffi gio-2.0 glib-2.0 gmodule-2.0 \
- gobject-2.0 gthread-2.0 idn m pcre pthread util xml2 z
+WANTLIB= c dbus-1 dbus-glib-1 ffi gadu gio-2.0 glib-2.0 gmodule-2.0 \
+ gobject-2.0 gthread-2.0 idn m pcre pthread xml2 z
WANTLIB-main= X11 ICE SM Xcomposite Xcursor Xdamage Xext Xfixes Xi \
Xinerama Xrandr Xrender Xss atk-1.0 cairo expat fontconfig \
freetype gdk-x11-2.0 gdk_pixbuf-2.0 graphite2 gtk-x11-2.0 \
harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
png pthread-stubs purple stdc++ xcb-render xcb-shm xcb \
${WANTLIB}
-WANTLIB-libpurple= crypto gadu>=5 meanwhile ssl silc>=7 silcclient>=5 \
- ${WANTLIB}
-WANTLIB-finch= X11 ncursesw panelw purple xcb ${WANTLIB} ${MODPY_WANTLIB}
+WANTLIB-libpurple= crypto meanwhile ssl silc silcclient ${WANTLIB}
+WANTLIB-finch= X11 ncursesw panelw purple util xcb ${WANTLIB} \
+ ${MODPY_WANTLIB}
MODULES= devel/gettext \
textproc/intltool \
@@ -66,7 +66,7 @@ LIB_DEPENDS-libpurple= ${LIB_DEPENDS} \
devel/libidn \
devel/silc-toolkit \
net/meanwhile \
- net/libgadu>=1.11.0
+ net/libgadu>=1.12.0
MODGCONF2_SCHEMAS_DIR= pidgin
MODGCONF2_LIBDEP= No
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/pidgin/distinfo,v
retrieving revision 1.46
diff -u -p -u -p -r1.46 distinfo
--- distinfo 6 Feb 2014 07:44:15 -0000 1.46
+++ distinfo 23 Oct 2014 08:26:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (pidgin-2.10.9.tar.bz2) = 3DYu2Fd/Yj7qRVSnnpFwc6pyaCUHT+pALy5RXw9R8xk=
-SIZE (pidgin-2.10.9.tar.bz2) = 10093423
+SHA256 (pidgin-2.10.10.tar.bz2) = 3GuVUS6ux1rvFwqrzkcUkfxwWEkyWZ3+rSDx8cRcgi0=
+SIZE (pidgin-2.10.10.tar.bz2) = 9409485
Index: files/ssl-openssl.c
===================================================================
RCS file: /home/cvs/ports/net/pidgin/files/ssl-openssl.c,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 ssl-openssl.c
--- files/ssl-openssl.c 13 Dec 2011 14:42:55 -0000 1.7
+++ files/ssl-openssl.c 26 Oct 2014 20:53:29 -0000
@@ -150,7 +150,7 @@ ssl_openssl_connect(PurpleSslConnection
/*
* allocate a new SSL_CTX object
- */
+ */
openssl_data->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
if (openssl_data->ssl_ctx == NULL) {
purple_debug_error("openssl", "SSL_CTX_new failed\n");
@@ -164,8 +164,13 @@ ssl_openssl_connect(PurpleSslConnection
/*
* disable SSLv2
- */
+ */
SSL_CTX_set_options(openssl_data->ssl_ctx, SSL_OP_NO_SSLv2);
+
+ /*
+ * disable SSLv3
+ */
+ SSL_CTX_set_options(openssl_data->ssl_ctx, SSL_OP_NO_SSLv3);
/*
* allocate a new SSL object
Index: patches/patch-configure_ac
===================================================================
RCS file: /home/cvs/ports/net/pidgin/patches/patch-configure_ac,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 patch-configure_ac
--- patches/patch-configure_ac 6 Feb 2014 07:44:15 -0000 1.33
+++ patches/patch-configure_ac 26 Oct 2014 20:29:42 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.33 2014/02/06 07:44:15 brad Exp $
---- configure.ac.orig Wed Jan 22 02:39:49 2014
-+++ configure.ac Sat Feb 1 02:56:17 2014
-@@ -1334,7 +1334,6 @@ if test "x$GCC" = "xyes"; then
+--- configure.ac.orig Thu Oct 16 20:19:33 2014
++++ configure.ac Thu Oct 23 04:31:11 2014
+@@ -1298,7 +1298,6 @@ if test "x$GCC" = "xyes"; then
fi
DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
@@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.33 2014
fi
if test "x$SUNCC" = "xyes"; then
-@@ -1723,6 +1722,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
+@@ -1686,6 +1685,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
dnl These two are inverses of each other <-- stolen from evolution!
@@ -21,7 +21,7 @@ $OpenBSD: patch-configure_ac,v 1.33 2014
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support
[default=yes]],
[enable_gnutls="$enableval"],
-@@ -1733,10 +1737,98 @@ AC_ARG_ENABLE(nss,
+@@ -1696,10 +1700,98 @@ AC_ARG_ENABLE(nss,
[enable_nss="$enableval"],
[enable_nss="yes"])
@@ -122,7 +122,7 @@ $OpenBSD: patch-configure_ac,v 1.33 2014
dnl #
if test "x$enable_gnutls" != "xno"; then
enable_gnutls="no"
-@@ -2134,17 +2226,32 @@ fi
+@@ -2097,17 +2189,32 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")
Index: patches/patch-libpurple_plugins_ssl_Makefile_in
===================================================================
RCS file:
/home/cvs/ports/net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 patch-libpurple_plugins_ssl_Makefile_in
--- patches/patch-libpurple_plugins_ssl_Makefile_in 6 Feb 2014 07:44:15
-0000 1.29
+++ patches/patch-libpurple_plugins_ssl_Makefile_in 26 Oct 2014 20:44:26
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.29 2014/02/06 07:44:15
brad Exp $
---- libpurple/plugins/ssl/Makefile.in.orig Wed Jan 22 02:40:34 2014
-+++ libpurple/plugins/ssl/Makefile.in Sat Feb 1 02:56:17 2014
-@@ -92,6 +92,20 @@ am__uninstall_files_from_dir = { \
+--- libpurple/plugins/ssl/Makefile.in.orig Thu Oct 16 20:20:19 2014
++++ libpurple/plugins/ssl/Makefile.in Sun Oct 26 16:44:07 2014
+@@ -120,6 +120,20 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(plugindir)"
LTLIBRARIES = $(plugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
@@ -22,8 +22,8 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
@PLUGINS_TRUE@ssl_gnutls_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@PLUGINS_TRUE@ $(am__DEPENDENCIES_1)
am__ssl_gnutls_la_SOURCES_DIST = ssl-gnutls.c
-@@ -169,7 +183,7 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
- am__v_GEN_0 = @echo " GEN " $@;
+@@ -206,7 +220,7 @@ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \
$(ssl_la_SOURCES)
-DIST_SOURCES = $(am__ssl_gnutls_la_SOURCES_DIST) \
@@ -31,16 +31,16 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
-@@ -243,6 +257,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
- GNT_MICRO_VERSION = @GNT_MICRO_VERSION@
- GNT_MINOR_VERSION = @GNT_MINOR_VERSION@
- GNT_VERSION = @GNT_VERSION@
+@@ -361,6 +375,8 @@ NSS_CFLAGS = @NSS_CFLAGS@
+ NSS_LIBS = @NSS_LIBS@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
- GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
- GNUTLS_LIBS = @GNUTLS_LIBS@
- GREP = @GREP@
-@@ -437,6 +453,7 @@ EXTRA_DIST = \
+ OTOOL = @OTOOL@
+ OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+@@ -493,6 +509,7 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
ssl_la_LDFLAGS = -module -avoid-version
@@ -48,7 +48,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
ssl_gnutls_la_LDFLAGS = -module -avoid-version
ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_FALSE@@USE_NSS_FALSE@plugin_LTLIBRARIES = \
-@@ -450,19 +467,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
+@@ -506,19 +523,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl.la \
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl-gnutls.la
@@ -74,7 +74,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
-@@ -474,6 +497,7 @@ AM_CPPFLAGS = \
+@@ -530,6 +553,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS)
@@ -82,16 +82,17 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
all: all-am
-@@ -542,6 +566,8 @@ clean-pluginLTLIBRARIES:
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+@@ -602,6 +626,9 @@ clean-pluginLTLIBRARIES:
+ rm -f $${locs}; \
+ }
+
+ssl-openssl.la: $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_DEPENDENCIES)
$(EXTRA_ssl_openssl_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(ssl_openssl_la_LINK) $(am_ssl_openssl_la_rpath)
$(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_LIBADD) $(LIBS)
++
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES)
$(EXTRA_ssl_gnutls_la_DEPENDENCIES)
$(AM_V_CCLD)$(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)
$(EXTRA_ssl_nss_la_DEPENDENCIES)
-@@ -556,6 +582,7 @@ distclean-compile:
+
+@@ -618,6 +645,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@
@@ -99,7 +100,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/ssl_gnutls_la-ssl-gnutls.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/ssl_nss_la-ssl-nss.Plo@am__quote@
-@@ -579,6 +606,13 @@ distclean-compile:
+@@ -641,6 +669,13 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@'
libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
Index: patches/patch-libpurple_protocols_jabber_Makefile_in
===================================================================
RCS file:
/home/cvs/ports/net/pidgin/patches/patch-libpurple_protocols_jabber_Makefile_in,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-libpurple_protocols_jabber_Makefile_in
--- patches/patch-libpurple_protocols_jabber_Makefile_in 8 Mar 2013
01:03:09 -0000 1.4
+++ patches/patch-libpurple_protocols_jabber_Makefile_in 26 Oct 2014
20:45:57 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-libpurple_protocols_jabber_Makefile_in,v 1.4 2013/03/08
01:03:09 brad Exp $
---- libpurple/protocols/jabber/Makefile.in.orig Mon Feb 11 04:17:20 2013
-+++ libpurple/protocols/jabber/Makefile.in Wed Feb 13 14:55:46 2013
-@@ -160,7 +160,7 @@ libxmpp_la_OBJECTS = $(am_libxmpp_la_OBJECTS)
+--- libpurple/protocols/jabber/Makefile.in.orig Thu Oct 16 20:20:19 2014
++++ libpurple/protocols/jabber/Makefile.in Sun Oct 26 16:45:40 2014
+@@ -191,7 +191,7 @@ libxmpp_la_OBJECTS = $(am_libxmpp_la_OBJECTS)
libxmpp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libxmpp_la_LDFLAGS) $(LDFLAGS) -o $@
-@STATIC_JABBER_FALSE@am_libxmpp_la_rpath = -rpath $(pkgdir)
+@STATIC_JABBER_FALSE@am_libxmpp_la_rpath = -rpath $(pkgdir)
-Wl,-rpath,$(pkgdir)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+ am__v_P_0 = false
Index: patches/patch-libpurple_protocols_oscar_Makefile_in
===================================================================
RCS file:
/home/cvs/ports/net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_in,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 patch-libpurple_protocols_oscar_Makefile_in
--- patches/patch-libpurple_protocols_oscar_Makefile_in 8 Mar 2013 01:03:09
-0000 1.21
+++ patches/patch-libpurple_protocols_oscar_Makefile_in 26 Oct 2014 20:29:42
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.21 2013/03/08
01:03:09 brad Exp $
---- libpurple/protocols/oscar/Makefile.in.orig Mon Feb 11 04:17:21 2013
-+++ libpurple/protocols/oscar/Makefile.in Wed Feb 13 14:55:46 2013
-@@ -102,7 +102,7 @@ am__v_lt_0 = --silent
+--- libpurple/protocols/oscar/Makefile.in.orig Thu Oct 16 20:20:20 2014
++++ libpurple/protocols/oscar/Makefile.in Thu Oct 23 04:31:11 2014
+@@ -130,7 +130,7 @@ am__v_lt_1 =
libaim_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libaim_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -10,7 +10,7 @@ $OpenBSD: patch-libpurple_protocols_osca
@STATIC_OSCAR_FALSE@libicq_la_DEPENDENCIES = liboscar.la
am__libicq_la_SOURCES_DIST = libicq.c
@STATIC_OSCAR_FALSE@am_libicq_la_OBJECTS = libicq.lo
-@@ -110,7 +110,7 @@ libicq_la_OBJECTS = $(am_libicq_la_OBJECTS)
+@@ -138,7 +138,7 @@ libicq_la_OBJECTS = $(am_libicq_la_OBJECTS)
libicq_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libicq_la_LDFLAGS) $(LDFLAGS) -o $@
Index: patches/patch-libpurple_protocols_yahoo_Makefile_in
===================================================================
RCS file:
/home/cvs/ports/net/pidgin/patches/patch-libpurple_protocols_yahoo_Makefile_in,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-libpurple_protocols_yahoo_Makefile_in
--- patches/patch-libpurple_protocols_yahoo_Makefile_in 8 Mar 2013 01:03:09
-0000 1.8
+++ patches/patch-libpurple_protocols_yahoo_Makefile_in 26 Oct 2014 20:29:53
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_yahoo_Makefile_in,v 1.8 2013/03/08
01:03:09 brad Exp $
---- libpurple/protocols/yahoo/Makefile.in.orig Mon Feb 11 04:17:22 2013
-+++ libpurple/protocols/yahoo/Makefile.in Wed Feb 13 14:55:46 2013
-@@ -101,7 +101,7 @@ am__v_lt_0 = --silent
+--- libpurple/protocols/yahoo/Makefile.in.orig Thu Oct 16 20:20:20 2014
++++ libpurple/protocols/yahoo/Makefile.in Thu Oct 23 04:31:11 2014
+@@ -130,7 +130,7 @@ am__v_lt_1 =
libyahoo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libyahoo_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -10,7 +10,7 @@ $OpenBSD: patch-libpurple_protocols_yaho
@STATIC_YAHOO_FALSE@libyahoojp_la_DEPENDENCIES = libymsg.la
am__libyahoojp_la_SOURCES_DIST = libyahoojp.c
@STATIC_YAHOO_FALSE@am_libyahoojp_la_OBJECTS = libyahoojp.lo
-@@ -109,7 +109,7 @@ libyahoojp_la_OBJECTS = $(am_libyahoojp_la_OBJECTS)
+@@ -138,7 +138,7 @@ libyahoojp_la_OBJECTS = $(am_libyahoojp_la_OBJECTS)
libyahoojp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libyahoojp_la_LDFLAGS) $(LDFLAGS) -o $@
Index: patches/patch-pidgin_Makefile_in
===================================================================
RCS file: /home/cvs/ports/net/pidgin/patches/patch-pidgin_Makefile_in,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 patch-pidgin_Makefile_in
--- patches/patch-pidgin_Makefile_in 8 Mar 2013 01:03:09 -0000 1.16
+++ patches/patch-pidgin_Makefile_in 26 Oct 2014 20:29:42 -0000
@@ -1,10 +1,10 @@
$OpenBSD: patch-pidgin_Makefile_in,v 1.16 2013/03/08 01:03:09 brad Exp $
---- pidgin/Makefile.in.orig Mon Feb 11 04:17:23 2013
-+++ pidgin/Makefile.in Wed Feb 13 14:55:46 2013
-@@ -139,7 +139,7 @@ am__v_CC_0 = @echo " CC " $@;
- AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
+--- pidgin/Makefile.in.orig Thu Oct 16 20:20:20 2014
++++ pidgin/Makefile.in Thu Oct 23 04:38:23 2014
+@@ -178,7 +178,7 @@ AM_V_CC = $(am__v_CC_@AM_V@)
+ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
-CCLD = $(CC)
+CCLD = $(CXX)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
Index: patches/patch-pidgin_gtkdialogs_c
===================================================================
RCS file: /home/cvs/ports/net/pidgin/patches/patch-pidgin_gtkdialogs_c,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 patch-pidgin_gtkdialogs_c
--- patches/patch-pidgin_gtkdialogs_c 6 Feb 2014 07:44:15 -0000 1.28
+++ patches/patch-pidgin_gtkdialogs_c 26 Oct 2014 20:29:42 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.28 2014/02/06 07:44:15 brad Exp $
---- pidgin/gtkdialogs.c.orig Wed Jan 22 02:39:51 2014
-+++ pidgin/gtkdialogs.c Sat Feb 1 02:56:15 2014
-@@ -637,6 +637,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
+--- pidgin/gtkdialogs.c.orig Thu Oct 16 20:19:33 2014
++++ pidgin/gtkdialogs.c Thu Oct 23 04:31:11 2014
+@@ -645,6 +645,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif
Index: pkg/PLIST-libpurple
===================================================================
RCS file: /home/cvs/ports/net/pidgin/pkg/PLIST-libpurple,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 PLIST-libpurple
--- pkg/PLIST-libpurple 6 Feb 2014 07:44:15 -0000 1.21
+++ pkg/PLIST-libpurple 26 Oct 2014 21:05:30 -0000
@@ -145,9 +145,9 @@ share/purple/ca-certs/Thawte_Premium_Ser
share/purple/ca-certs/Thawte_Primary_Root_CA.pem
share/purple/ca-certs/ValiCert_Class_2_VA.pem
share/purple/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
-share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
-share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
-share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
+share/purple/ca-certs/VeriSign_Class_3_Primary_CA-G2.pem
+share/purple/ca-certs/VeriSign_Class_3_Primary_CA-G5-2.pem
+share/purple/ca-certs/VeriSign_Class_3_Primary_CA-G5.pem
share/purple/ca-certs/VeriSign_International_Server_Class_3_CA.pem
share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas
>/dev/null 2>&1
Index: pkg/PLIST-main
===================================================================
RCS file: /home/cvs/ports/net/pidgin/pkg/PLIST-main,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 PLIST-main
--- pkg/PLIST-main 6 Feb 2014 07:44:15 -0000 1.18
+++ pkg/PLIST-main 26 Oct 2014 21:06:44 -0000
@@ -118,19 +118,17 @@ share/locale/he/LC_MESSAGES/pidgin.mo
share/locale/hi/LC_MESSAGES/pidgin.mo
share/locale/hr/LC_MESSAGES/pidgin.mo
share/locale/hu/LC_MESSAGES/pidgin.mo
-share/locale/hy/LC_MESSAGES/pidgin.mo
share/locale/id/LC_MESSAGES/pidgin.mo
share/locale/it/LC_MESSAGES/pidgin.mo
share/locale/ja/LC_MESSAGES/pidgin.mo
share/locale/ka/LC_MESSAGES/pidgin.mo
+share/locale/kk/LC_MESSAGES/pidgin.mo
share/locale/km/LC_MESSAGES/pidgin.mo
share/locale/kn/LC_MESSAGES/pidgin.mo
share/locale/ko/LC_MESSAGES/pidgin.mo
share/locale/ku/LC_MESSAGES/pidgin.mo
-share/locale/lo/
-share/locale/lo/LC_MESSAGES/
-share/locale/lo/LC_MESSAGES/pidgin.mo
share/locale/lt/LC_MESSAGES/pidgin.mo
+share/locale/lv/LC_MESSAGES/pidgin.mo
share/locale/mai/LC_MESSAGES/pidgin.mo
share/locale/mhr/
share/locale/mhr/LC_MESSAGES/
@@ -138,9 +136,6 @@ share/locale/mhr/LC_MESSAGES/pidgin.mo
share/locale/mk/LC_MESSAGES/pidgin.mo
share/locale/mn/LC_MESSAGES/pidgin.mo
share/locale/mr/LC_MESSAGES/pidgin.mo
-share/locale/ms_MY/
-share/locale/ms_MY/LC_MESSAGES/
-share/locale/ms_MY/LC_MESSAGES/pidgin.mo
share/locale/my_MM/
share/locale/my_MM/LC_MESSAGES/
share/locale/my_MM/LC_MESSAGES/pidgin.mo
@@ -171,6 +166,7 @@ share/locale/ta/LC_MESSAGES/pidgin.mo
share/locale/te/LC_MESSAGES/pidgin.mo
share/locale/th/LC_MESSAGES/pidgin.mo
share/locale/tr/LC_MESSAGES/pidgin.mo
+share/locale/tt/LC_MESSAGES/pidgin.mo
share/locale/uk/LC_MESSAGES/pidgin.mo
share/locale/ur/LC_MESSAGES/pidgin.mo
share/locale/vi/LC_MESSAGES/pidgin.mo
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
